workflows updated, Iinitializer setup fixed for dynamic additions using scutor

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

@@ -2,26 +2,51 @@ name: "CodeQL PR Analysis"
 
 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@v2
+        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@v2
+      # 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@v2
+        uses: github/codeql-action/analyze@v3

src/RandomAPI/Program.cs

@@ -16,6 +16,7 @@
     DBInitialization.CONNECTIONSTRING
 ));
 
+#region Add Services
 //webhook
 builder.Services.AddSingleton<IWebhookService, WebhookService>();
 
@@ -24,18 +25,33 @@
 
 //db
 builder.Services.AddScoped<IEventRepository, EventRepository>();
+builder.Services.AddScoped<IWebhookRepository, WebhookRepository>();
 
+#endregion
+
+#region Initialization
+//scanner for initializations
+builder.Services.Scan(scan => scan
+    .FromAssemblyOf<IInitializer>()
+    .AddClasses(c => c.AssignableTo<IInitializer>())
+        .As<IInitializer>()
+        .WithScopedLifetime()
+);
 
 var app = builder.Build();
-await DBInitialization.EnsureDb(app.Services);
 //the the end, init the dbs
 using (var scope = app.Services.CreateScope())
 {
     IServiceProvider? serviceProvider = scope.ServiceProvider;
     IEnumerable<IInitializer>? initializers = serviceProvider.GetServices<IInitializer>();
+    if (!initializers.Any())
+    {
+        Console.WriteLine("Warning: No services implementing IInitializer were found.");
+    }
     IEnumerable<Task>? initializationTasks = initializers.Select(i => i.InitializeAsync());
     await Task.WhenAll(initializationTasks);
 }
+#endregion
 
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())

src/RandomAPI/RandomAPI.csproj

@@ -11,11 +11,9 @@
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.66" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.0" />
-    <PackageReference
-      Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets"
-      Version="1.22.1"
-    />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageReference Include="Scrutor" Version="7.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
   </ItemGroup>
 </Project>

src/RandomAPI/Repository/EventRepository.cs

@@ -5,7 +5,7 @@
 
 namespace RandomAPI.Repository
 {
-    public class EventRepository : IEventRepository
+    public class EventRepository : IEventRepository, IInitializer
     {
         private readonly IDbConnection _db;
         private readonly ILogger<EventRepository> _logger;

src/RandomAPI/Repository/IEventRepository.cs

@@ -5,7 +5,7 @@ namespace RandomAPI.Repository
     /// <summary>
     /// Defines the contract for persistence operations related to the Event model.
     /// </summary>
-    public interface IEventRepository : IInitializer
+    public interface IEventRepository
     {
         /// <summary>
         /// Attempts to add a new Event record to the database.

src/RandomAPI/Repository/IWebhookRepository.cs

@@ -5,7 +5,7 @@ namespace RandomAPI.Repository
     /// <summary>
     /// Defines the contract for persistence operations related to WebhookUrl models.
     /// </summary>
-    public interface IWebhookRepository : IInitializer
+    public interface IWebhookRepository
     {
         Task<IEnumerable<WebhookUrl>> GetAllUrlsAsync();
         Task AddUrlAsync(string url);

src/RandomAPI/Repository/WebhookRepository.cs

@@ -1,18 +1,20 @@
-using RandomAPI.Models;
+using Dapper;
+using RandomAPI.Models;
+using System.Data;
 
 namespace RandomAPI.Repository
 {
 
     /// <summary>
     /// Implements CRUD operations for Webhook URLs using Dapper and the provided DatabaseService.
     /// </summary>
-    public class WebhookRepository : IWebhookRepository
+    public class WebhookRepository : IWebhookRepository, IInitializer
     {
-        private readonly DatabaseService _dbService;
+        private readonly IDbConnection _db;
 
-        public WebhookRepository(DatabaseService dbService)
+        public WebhookRepository(IDbConnection dbService)
         {
-            _dbService = dbService;
+            _db = dbService;
         }
 
         /// <summary>
@@ -27,7 +29,7 @@ CREATE TABLE IF NOT EXISTS WebhookUrls (
                 Url TEXT NOT NULL UNIQUE
             );";
 
-            await _dbService.ExecuteAsync(sql);
+            await _db.ExecuteAsync(sql);
         }
 
         /// <summary>
@@ -38,7 +40,7 @@ public async Task<IEnumerable<WebhookUrl>> GetAllUrlsAsync()
         {
             const string sql = "SELECT Id, Url FROM WebhookUrls ORDER BY Id;";
             // Dapper maps the columns to the WebhookUrl model properties
-            return await _dbService.QueryAsync<WebhookUrl>(sql);
+            return await _db.QueryAsync<WebhookUrl>(sql);
         }
 
         /// <summary>
@@ -49,7 +51,7 @@ public async Task AddUrlAsync(string url)
         {
             // SQLITE specific command to ignore unique constraint errors if URL already exists
             const string sql = "INSERT OR IGNORE INTO WebhookUrls (Url) VALUES (@Url);";
-            await _dbService.ExecuteAsync(sql, new { Url = url });
+            await _db.ExecuteAsync(sql, new { Url = url });
         }
 
         /// <summary>
@@ -60,7 +62,7 @@ public async Task AddUrlAsync(string url)
         public async Task<int> DeleteUrlAsync(string url)
         {
             const string sql = "DELETE FROM WebhookUrls WHERE Url = @Url;";
-            return await _dbService.ExecuteAsync(sql, new { Url = url });
+            return await _db.ExecuteAsync(sql, new { Url = url });
         }
     }
 }