Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /App
 # Copy everything
 COPY . ./
 
-RUN apt update && apt install libldap-2.5-0 -y
+RUN apt upgrade && apt install libldap -y
 
 # Restore as distinct layers
 RUN dotnet restore ./song_of_the_day/song_of_the_day.csproj
@@ -14,6 +14,5 @@ RUN dotnet publish ./song_of_the_day/song_of_the_day.csproj -o out
 # Build runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:9.0
 WORKDIR /App
-RUN apt update && apt install libldap-2.5-0 -y
 COPY --from=build /App/out .
 ENTRYPOINT ["dotnet", "song_of_the_day.dll"]

HISTORY.md

@@ -4,60 +4,6 @@ Changelog
 
 (unreleased)
 ------------
-
-Fix
-~~~
-- Install dependencies in runtime container not only build container,
-  refs NOISSUE. [Simon Diesenreiter]
-
-
-0.2.4 (2025-05-18)
-------------------
-
-Fix
-~~~
-- Build errors, refs NOISSUE. [Simon Diesenreiter]
-
-Other
-~~~~~
-
-
-0.2.3 (2025-05-18)
-------------------
-
-Fix
-~~~
-- Resolve linting errors, refs NOISSUE. [Simon Diesenreiter]
-
-Other
-~~~~~
-
-
-0.2.2 (2025-05-18)
-------------------
-
-Fix
-~~~
-- Also send pick suggestion to the group, refs NOISSUE. [Simon
-  Diesenreiter]
-
-Other
-~~~~~
-
-
-0.2.1 (2025-05-17)
-------------------
-
-Fix
-~~~
-- Fix Docker build, refs NOISSUE. [Simon Diesenreiter]
-
-Other
-~~~~~
-
-
-0.2.0 (2025-05-17)
-------------------
 - Feat: add user management, refs NOISSUE. [Simon Diesenreiter]
 - Feat(auth): initial auth added part 2, refs NOISSUE. [Simon
   Diesenreiter]

song_of_the_day/Auth/IAuthenticationService.cs

@@ -1,4 +1,4 @@
-public interface IAuthenticationService
+public interface IAuthenticationService  
-{
+{  
-    bool Authenticate(string userName, string password);
+    bool Authenticate(string userName, string password);  
 }

song_of_the_day/Auth/PhoneClaimCodeProviderService.cs

@@ -34,7 +34,7 @@ public class PhoneClaimCodeProviderService
 
         SignalIntegration.Instance.SendMessageToUserAsync("Your phone number validation code is: " + generatedCode, phoneNumber);
     }
-
+    
     public string ValidateClaimCodeForUser(string code, string username)
     {
         var result = false;
@@ -50,7 +50,7 @@ public class PhoneClaimCodeProviderService
 
         return string.Empty;
     }
-
+    
     public bool IsCodeGeneratedForUser(string username)
     {
         return _phoneClaimCodes.ContainsKey(username);

song_of_the_day/Config/AppConfiguration.cs

@@ -19,8 +19,7 @@ public class AppConfiguration
         this.AverageDaysBetweenRequests = int.Parse(Environment.GetEnvironmentVariable("AVERAGE_DAYS_BETWEEN_REQUESTS") ?? "2");
         var managersGroupName = Environment.GetEnvironmentVariable("LDAP_ADMINGROUP") ?? "admins";
         var userGroupName = Environment.GetEnvironmentVariable("LDAP_USERGROUP") ?? "everybody";
-        this.LDAPConfig = new ConfigurationAD()
+        this.LDAPConfig = new ConfigurationAD() {
-        {
             Username = Environment.GetEnvironmentVariable("LDAP_BIND") ?? "cn=admin,dc=disi,dc=dev",
             Password = Environment.GetEnvironmentVariable("LDAP_PASS") ?? "adminPass2022!",
             Port = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("LDAP_BIND")) ? int.Parse(Environment.GetEnvironmentVariable("LDAP_BIND")) : 389,
@@ -92,8 +91,7 @@ public class AppConfiguration
         get; private set;
     }
 
-    public ConfigurationAD LDAPConfig
+    public ConfigurationAD LDAPConfig {
-    {
         get; private set;
     }
 }

song_of_the_day/LDAPIntegration/LdapIntegration.cs

@@ -107,10 +107,9 @@ public class LdapIntegration
 
         var userList = new List<LdapUser>();
 
-        foreach (SearchResultEntry result in response.Entries)
+        foreach(SearchResultEntry result in response.Entries)
         {
-            userList.Add(new LdapUser()
+            userList.Add(new LdapUser() {
-            {
                 UserId = result.Attributes["uid"][0].ToString(),
                 FirstName = result.Attributes["givenName"][0].ToString(),
                 LastName = result.Attributes["sn"][0].ToString(),

song_of_the_day/Program.cs

@@ -91,16 +91,15 @@ pickOfTheDayTimer.OnOccurence += async (s, ea) =>
     if (mod > 0)
     {
         Console.WriteLine("Skipping pick of the day today!");
-        return;
+        return;   
     }
 
     var dci = DataContext.Instance;
     var luckyUser = await dci.Users.ElementAtAsync((new Random()).Next(await dci.Users.CountAsync()));
     var userName = string.IsNullOrEmpty(luckyUser.NickName) ? luckyUser.Name : luckyUser.NickName;
-    var suggestion = await dci.SuggestionHelpers.ElementAtAsync((new Random()).Next(await dci.SuggestionHelpers.CountAsync()));
     SignalIntegration.Instance.SendMessageToGroupAsync($"Today's chosen person to share a song is: **{userName}**");
-    SignalIntegration.Instance.SendMessageToGroupAsync($"Today's (optional) suggestion helper to help you pick a song is:\n\n**{suggestion.Title}**\n\n*{suggestion.Description}*");
     SignalIntegration.Instance.SendMessageToUserAsync($"Congratulations, you have been chosen to share a song today!", luckyUser.SignalMemberId);
+    var suggestion = await dci.SuggestionHelpers.ElementAtAsync((new Random()).Next(await dci.SuggestionHelpers.CountAsync()));
     SignalIntegration.Instance.SendMessageToUserAsync($"Today's (optional) suggestion helper to help you pick a song is:\n\n**{suggestion.Title}**\n\n*{suggestion.Description}*", luckyUser.SignalMemberId);
     SignalIntegration.Instance.SendMessageToUserAsync($"For now please just share your suggestion with the group - in the future I might ask you to share directly with me or via the website to help me keep track of past suggestions!", luckyUser.SignalMemberId);
 };
@@ -124,7 +123,7 @@ ldapAssociationTimer.OnOccurence += async (s, ea) =>
     foreach (var user in nonAssociatedUsers)
     {
         user.AssociationInProgress = true;
-
+        
         startUserAssociationProcess(user);
         user.IsIntroduced = true;
         needsSaving = true;

song_of_the_day/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.0