Update Settings class & Docker setup, add TwitchWorker tests

Renamed `OpenAI` and `Twitch` classes to `OpenAISettings` and `TwitchSettings` respectively, and updated the `Settings` class and all related code as needed. The Docker setup has been adjusted to use a two-staged build and run process to better separate build and runtime environments. Added a new empty test class `TwitchWorkerTests` for future use.

Dockerfile

@@ -1,21 +1,18 @@
-FROM mcr.microsoft.com/dotnet/runtime:8.0-bookworm-slim AS base
-USER $APP_UID
+# Stage 1: Build the application
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
-ARG BUILD_CONFIGURATION=Release
-WORKDIR /src
-COPY ["GolfClapBot/GolfClapBot.Runner.csproj", "GolfClapBot/"]
-RUN dotnet restore "GolfClapBot/GolfClapBot.Runner.csproj"
-COPY . .
-WORKDIR "/src/Volvox.Twitch.Responder"
-RUN dotnet build "GolfClapBot.Runner.csproj" -c $BUILD_CONFIGURATION -o /app/build
+# Copy csproj and restore as distinct layers
+COPY src/GolfClapBot.Runner/*.csproj ./src/GolfClapBot.Runner/
+RUN dotnet restore src/GolfClapBot.Runner/GolfClapBot.Runner.csproj
 
-FROM build AS publish
-ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "GolfClapBot.Runner.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+# Copy everything else and build
+COPY src/GolfClapBot.Runner/ ./src/GolfClapBot.Runner/
+WORKDIR /app/src/GolfClapBot.Runner
+RUN dotnet build -c Release -o out
 
-FROM base AS final
+# Stage 2: Run the application
+FROM mcr.microsoft.com/dotnet/runtime:8.0
 WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "GolfClapBot.dll"]
+COPY --from=build-env /app/src/GolfClapBot.Runner/out .
+ENTRYPOINT ["dotnet", "GolfClapBot.Runner.dll"]

build-and-run.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Define the image name
+IMAGE_NAME=GolfClapBot
+
+# Build the Docker image
+docker build -t $IMAGE_NAME .
+
+# Run the Docker container
+docker run -d -p 8080:80 --name GolfClapBot $IMAGE_NAME

src/GolfClapBot.Bot/Bot.cs

@@ -13,7 +13,7 @@ public class Bot : IBot
     public Bot(IOptions<Data> data, IOptions<Settings> settings)
     {
         _data = data.Value;
-        _openAiClient = new OpenAIAPI(settings.Value.OpenAi.ApiKey);
+        _openAiClient = new OpenAIAPI(settings.Value.OpenAiSettings.ApiKey);
     }
 
     /// <summary>

src/GolfClapBot.Domain/Configuration/OpenAI.cs → src/GolfClapBot.Domain/Configuration/OpenAISettings.cs

@@ -1,6 +1,6 @@
 namespace GolfClapBot.Domain.Configuration;
 
-public class OpenAI
+public class OpenAISettings
 {
     public required string ApiKey { get; set; }
 

src/GolfClapBot.Domain/Configuration/Settings.cs

@@ -2,7 +2,7 @@
 
 public class Settings
 {
-    public required Twitch Twitch { get; set; }
+    public required TwitchSettings TwitchSettings { get; set; }
 
-    public required OpenAI OpenAi { get; set; }
+    public required OpenAISettings OpenAiSettings { get; set; }
 }

src/GolfClapBot.Domain/Configuration/Twitch.cs → src/GolfClapBot.Domain/Configuration/TwitchSettings.cs

@@ -1,6 +1,6 @@
 namespace GolfClapBot.Domain.Configuration;
 
-public class Twitch
+public class TwitchSettings
 {
     public required string Channel { get; set; }
 

src/GolfClapBot.Runner/TwitchWorker.cs

@@ -38,9 +38,10 @@ public TwitchWorker(ILogger<TwitchWorker> logger, ILoggerFactory loggerFactory,
         _client.OnMessageReceived += TwitchClientOnMessageReceived;
         _client.OnJoinedChannel += TwitchClientOnJoinedChannel;
 
-        var credentials = new ConnectionCredentials(_settings.Value.Twitch.BotUser, _settings.Value.Twitch.OAuthToken);
+        var credentials = new ConnectionCredentials(_settings.Value.TwitchSettings.BotUser,
+            _settings.Value.TwitchSettings.OAuthToken);
 
-        _client.Initialize(credentials, _settings.Value.Twitch.Channel);
+        _client.Initialize(credentials, _settings.Value.TwitchSettings.Channel);
         _client.ConnectAsync();
     }
 
@@ -184,14 +185,14 @@ private static string RemoveEmotes(ChatMessage message)
     /// </summary>
     /// <param name="message">The chat message to be deleted.</param>
     /// <returns>A task that represents the asynchronous operation.</returns>
-    private async Task DeleteMessage(ChatMessage message)
+    public async Task DeleteMessage(ChatMessage message)
     {
         try
         {
             _logger.LogWarning("Bot is deleting message: {MessageId}", message.Id);
 
             await _twitchApi.Helix.Moderation.DeleteChatMessagesAsync(message.RoomId, "425816290", message.Id,
-                _settings.Value.Twitch.OAuthToken);
+                _settings.Value.TwitchSettings.OAuthToken);
         }
         catch (Exception exception)
         {

test/GolfClapBot.Test/BotTests.cs

@@ -17,11 +17,11 @@ public void Constructor_InitializesWithValidSettings_ShouldSetProperties()
         };
         var expectedSettings = new Settings
         {
-            OpenAi = new OpenAI
+            OpenAiSettings = new OpenAISettings
             {
                 ApiKey = "test-key", Model = null
             },
-            Twitch = null
+            TwitchSettings = null
         };
         mockData.Setup(m => m.Value).Returns(expectedData);
         mockSettings.Setup(m => m.Value).Returns(expectedSettings);

test/GolfClapBot.Test/TwitchWorkerTests.cs

@@ -0,0 +1,5 @@
+namespace GolfClapBot.Test;
+
+public class TwitchWorkerTests
+{
+}