Merge branch 'main' into alert-autofix-1

Author: Skyfall1235

.github/dependabot.yml

@@ -5,15 +5,17 @@
 
 version: 2
 updates:
-      # Enable version updates for Docker
+  - package-ecosystem: "nuget"
+    directory: "/src/RandomAPI" 
+    schedule:
+      interval: "weekly"
+
   - package-ecosystem: "docker"
-    # Look for a `Dockerfile` in the src/randomdapi directory
-    directory: "src/RandomAPI/"
-    # Check for updates once a week
+    directory: "/src/RandomAPI"
     schedule:
       interval: "weekly"
 
-  # Enable version updates for GitHub Actions
   - package-ecosystem: "github-actions"
-    # Workflow files stored in the default location of `.github/workflows`
-    # You don't need to specify `/.github/workflows` for `directory`. You can use 
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/CodeQL_PR_Analysis.yml

@@ -5,26 +5,51 @@ permissions:
 
 on:
   pull_request:
+    # Triggers analysis on pull requests targeting the main branch
     branches: [ main ]
-
+  push:
+    # Also good practice to run on pushes to main for full analysis
+    branches: [ main ]
+  
 jobs:
   analyze:
     name: Analyze code with CodeQL
+    # Use newer, stable runner
     runs-on: ubuntu-latest
+    
+    # Permission setup is highly recommended for security analysis
+    permissions:
+      security-events: write
+      actions: read
+      contents: read
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        # Use the latest stable version
+        uses: actions/checkout@v4
+        with:
+          # Important for CodeQL to fetch history
+          fetch-depth: 0 
+
+      # NEW: Setup the .NET SDK environment
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          # Assuming you are targeting .NET 8, adjust if needed
+          dotnet-version: '8.0.x' 
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:
           languages: csharp
           # Using default queries (security + quality)
-          # You can also specify custom queries if needed
 
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+      # FIX: Removed 'github/codeql-action/autobuild'. 
+      # C# projects must be built explicitly so CodeQL can monitor the compiler output.
+      - name: Build Project
+        # Run dotnet build on your project directory to compile the code
+        # Based on your Dependabot config, the project is in 'src/RandomAPI'
+        run: dotnet build src/RandomAPI/RandomAPI.csproj
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3

src/RandomAPI/APIServices/ServiceInterfaces/IHoursService.cs

@@ -1,10 +1,6 @@
-using RandomAPI.Controllers;
 using RandomAPI.DTOs;
 
 public interface IHoursService
 {
     HoursResponseDto Calculate(HoursRequestDto request);
 }
-
-
-

…/APIServices/Services/IWebhookService.cs …ces/ServiceInterfaces/IWebhookService.cssrc/RandomAPI/APIServices/Services/IWebhookService.cs renamed to src/RandomAPI/APIServices/ServiceInterfaces/IWebhookService.cs src/RandomAPI/APIServices/Services/IWebhookService.cs renamed to src/RandomAPI/APIServices/ServiceInterfaces/IWebhookService.cs

@@ -3,7 +3,7 @@ public interface IWebhookService
     /// <summary>
     /// Sends a webhook notification to all registered listeners.
     /// </summary>
-    Task BroadcastAsync<T>(T payload);
+    Task BroadcastAsync<T>(T payload) where T : class;
 
     /// <summary>
     /// Registers a new webhook listener URL.

src/RandomAPI/APIServices/Services/DatabaseService.cs

@@ -1,5 +1,6 @@
 using Dapper;
 using Microsoft.Data.Sqlite;
+
 public class DatabaseService
 {
     private readonly string _connectionString;

src/RandomAPI/APIServices/Services/ICustomWebhookPayload.cs

@@ -0,0 +1,12 @@
+namespace RandomAPI.Services.Webhooks
+{
+    public interface ICustomWebhookPayload : IWebHookPayload
+    {
+        DateTime Timestamp { get; set; }
+    }
+
+    public interface IWebHookPayload
+    {
+        string content { get; set; }
+    }
+}

…API/APIServices/Services/HoursService.cs …I/APIServices/Services/TimeOutService.cssrc/RandomAPI/APIServices/Services/HoursService.cs renamed to src/RandomAPI/APIServices/Services/TimeOutService.cs src/RandomAPI/APIServices/Services/HoursService.cs renamed to src/RandomAPI/APIServices/Services/TimeOutService.cs

@@ -1,17 +1,10 @@
-using Microsoft.Extensions.Logging;
-using RandomAPI.DTOs;
 using System.Globalization;
 using System.Text.RegularExpressions;
+using Microsoft.Extensions.Logging;
+using RandomAPI.DTOs;
 
-public class HoursService : IHoursService
+public class TimeOutService(ILogger<IHoursService> logger) : IHoursService
 {
-    private readonly ILogger<IHoursService> _logger;
-
-    public HoursService(ILogger<IHoursService> logger)
-    {
-        _logger = logger;
-    }
-
     public HoursResponseDto Calculate(HoursRequestDto request)
     {
         var rounded = request.Hours.Select(RoundToQuarter).ToList();
@@ -42,7 +35,7 @@ public HoursResponseDto Calculate(HoursRequestDto request)
             HoursWorkedRounded = hoursWorkedRounded,
             RemainingHours = remaining,
             MinTimeOut = min.ToString("hh:mm tt"),
-            MaxTimeOut = max.ToString("hh:mm tt")
+            MaxTimeOut = max.ToString("hh:mm tt"),
         };
     }
 
@@ -57,23 +50,23 @@ private DateTime ParseTimeInput(string input)
         if (Regex.IsMatch(input, @"^\d{1,2}(am|pm)$"))
             input = input.Replace("am", ":00am").Replace("pm", ":00pm");
 
-        string[] formats =
-        {
-            "h:mmtt", "hh:mmtt",
-            "htt", "hhtt",
-            "h tt", "hh tt"
-        };
-
-        if (DateTime.TryParseExact(input, formats,
-            CultureInfo.InvariantCulture,
-            DateTimeStyles.None,
-            out DateTime parsed))
+        string[] formats = { "h:mmtt", "hh:mmtt", "htt", "hhtt", "h tt", "hh tt" };
+
+        if (
+            DateTime.TryParseExact(
+                input,
+                formats,
+                CultureInfo.InvariantCulture,
+                DateTimeStyles.None,
+                out DateTime parsed
+            )
+        )
         {
             return parsed;
         }
         //if fail, throw and log
         Exception e = new FormatException("Invalid time format.");
-        _logger.LogWarning(e, "Invalid time format.");
+        logger.LogWarning(e, "Invalid time format.");
         throw e;
     }
 
@@ -82,6 +75,3 @@ private double RoundToQuarter(double hours)
         return Math.Round(hours * 4) / 4.0;
     }
 }
-
-
-

src/RandomAPI/APIServices/Services/WebhookPayload.cs

@@ -0,0 +1,13 @@
+namespace RandomAPI.Services.Webhooks
+{
+    public class WebhookPayload : ICustomWebhookPayload
+    {
+        public string content { get; set; } = "";
+        public DateTime Timestamp { get; set; } = DateTime.UtcNow;
+    }
+
+    public class DiscordWebhookPayload : IWebHookPayload
+    {
+        public string content { get; set; } = "";
+    }
+}

src/RandomAPI/APIServices/Services/WebhookService.cs

@@ -1,53 +1,41 @@
 using System.Collections.Concurrent;
 
-public class WebhookService : IWebhookService
+namespace RandomAPI.Services.Webhooks
 {
-    private readonly ConcurrentDictionary<string, byte> _webhookUrls = new();
-    private readonly HttpClient _client = new();
-    private readonly ILogger<IWebhookService> _logger;
-
-    public WebhookService(ILogger<IWebhookService> logger)
+    public class WebhookService : IWebhookService
     {
-        _logger = logger;
-    }
-    
-    public IEnumerable<string> GetListeners() => _webhookUrls.Keys;
+        private readonly ConcurrentDictionary<string, byte> _webhookUrls = new();
+        private readonly HttpClient _client = new();
+        private readonly ILogger<IWebhookService> _logger;
 
-    public bool AddListener(string url)
-        => _webhookUrls.TryAdd(url, 0);
+        public WebhookService(ILogger<IWebhookService> logger)
+        {
+            _logger = logger;
+        }
 
-    public bool RemoveListener(string url)
-        => _webhookUrls.TryRemove(url, out _);
+        public IEnumerable<string> GetListeners() => _webhookUrls.Keys;
 
-    public async Task BroadcastAsync<T>(T payload)
-    {
-        // Snapshot-safe enumeration
-        var tasks = _webhookUrls.Keys.Select(async url =>
+        public bool AddListener(string url) => _webhookUrls.TryAdd(url, 0);
+
+        public bool RemoveListener(string url) => _webhookUrls.TryRemove(url, out _);
+
+        public async Task BroadcastAsync<T>(T payload) where T : class
         {
-            try
-            {
-                await _client.PostAsJsonAsync(url, payload);
-            }
-            catch (Exception ex)
+            // Snapshot-safe enumeration
+            var tasks = _webhookUrls.Keys.Select(async url =>
             {
+                try
                 {
-                    _logger.LogWarning(ex, "WebhookPayload failed to Post");
+                    await _client.PostAsJsonAsync(url, payload);
                 }
-            }
-        });
-        await Task.WhenAll(tasks);
+                catch (Exception ex)
+                {
+                    {
+                        _logger.LogWarning(ex, "WebhookPayload failed to Post");
+                    }
+                }
+            });
+            await Task.WhenAll(tasks);
+        }
     }
 }
-
-public interface IWebhookPayload
-{
-    DateTime Timestamp { get; set; }
-    string Message { get; set; }
-    
-}
-
-public class WebhookPayload : IWebhookPayload
-{
-    public string Message { get; set; } = "";
-    public DateTime Timestamp { get; set; } = DateTime.UtcNow;
-}

src/RandomAPI/Controllers/TimeOutController.cs

@@ -31,4 +31,3 @@ public ActionResult<HoursResponseDto> Calculate(HoursRequestDto dto)
         }
     }
 }
-