refactor: inject IScheduler via DI instead of using StdSchedulerFactory directly

feat(quartz): integrate Quartzmon dashboard and CommandDotNet
- Added `Quartzmon` package and configured its middleware for job monitoring. - Integrated `CommandDotNet.Execution` for command-line execution support. - Updated using directives and service registrations accordingly. - Preserved existing Serilog logging, DB context, and EnvelopeGenerator setup.
2025-11-04 17:34:36 +01:00 · 2025-11-04 17:29:07 +01:00 · 2025-11-04 17:18:29 +01:00 · 2025-11-04 17:06:00 +01:00 · 2025-11-04 16:12:21 +01:00 · 2025-11-04 15:37:20 +01:00
9 changed files with 145 additions and 66 deletions
--- a/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj
+++ b/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Worker">
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
@ -8,8 +8,14 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="Quartz.AspNetCore" Version="3.15.1" />
+    <PackageReference Include="Quartzmon" Version="1.0.5" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.10" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Quartz" Version="3.15.1" />
+    <PackageReference Include="Quartz.Extensions.Hosting" Version="3.15.1" />
    <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
    <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
@ -22,6 +28,10 @@
    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
  </ItemGroup>
 	
+  <ItemGroup>
+    <Folder Include="Controllers\" />
+  </ItemGroup>
+	
  <ItemGroup>
    <Content Update="appsettings.Database.json">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
--- a/EnvelopeGenerator.Finalizer/Models/WorkerOptions.cs
+++ b/EnvelopeGenerator.Finalizer/Models/WorkerOptions.cs
@ -1,19 +0,0 @@
-namespace EnvelopeGenerator.Finalizer.Models;
-
-public class WorkerOptions
-{
-    private double _intervalInMin = 1.0;
-
-    public double IntervalInMin { 
-        get => _intervalInMin; 
-        set 
-        {
-            _intervalInMin = value;
-            IntervalInMillisecond = Min2Millisecond(value);
-        } 
-    }
-
-    public int IntervalInMillisecond { get; private set; } = Min2Millisecond(1.0);
-
-    private static int Min2Millisecond(double min) => Convert.ToInt32(Math.Round(min * 60 * 1000));
-}
--- a/EnvelopeGenerator.Finalizer/Program.cs
+++ b/EnvelopeGenerator.Finalizer/Program.cs
@ -1,3 +1,4 @@
+using CommandDotNet.Execution;
 using EnvelopeGenerator.Application.ThirdPartyModules.Queries;
 using EnvelopeGenerator.DependencyInjection;
 using EnvelopeGenerator.Finalizer;
@ -5,7 +6,10 @@ using EnvelopeGenerator.Finalizer.Models;
 using EnvelopeGenerator.Infrastructure;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
+using Quartz;
+using Quartz.AspNetCore;
+using Quartz.Impl;
+using Quartzmon;
 using Serilog;

 // Load Serilog from appsettings.json
@ -19,24 +23,59 @@ try
 {
    Log.Information("Application is starting...");

-    var builder = Host.CreateApplicationBuilder(args);
+    var builder = WebApplication.CreateBuilder(args);

-    // add serilog
+    #region Logging
    builder.Logging.ClearProviders();
    builder.Logging.AddSerilog();
+    #endregion

+    #region Configuration
    var config = builder.Configuration;
-
    Directory
        .GetFiles(builder.Environment.ContentRootPath, "appsettings.*.json", SearchOption.TopDirectoryOnly)
        .Where(file => Path.GetFileName(file) != $"appsettings.Development.json")
        .Where(file => Path.GetFileName(file) != $"appsettings.migration.json")
        .ToList()
        .ForEach(file => config.AddJsonFile(file, true, true));
+    #endregion

-    #region Worker
-    builder.Services.AddHostedService<Worker>();
-    builder.Services.Configure<WorkerOptions>(config.GetSection("Worker"));
+    #region Web API Services
+    builder.Services.AddControllers();
+    builder.Services.AddEndpointsApiExplorer();
+    builder.Services.AddSwaggerGen();
+    #endregion
+
+    #region AQuartz
+    builder.Services.AddQuartz(q =>
+    {
+        var name = $"{typeof(Worker).FullName}";
+        var jobKey = new JobKey(name);
+        q.AddJob<Worker>(opts => opts.WithIdentity(jobKey));
+
+        var expression = config[nameof(Worker) + ":CronExpression"];
+        if (string.IsNullOrWhiteSpace(expression))
+            throw new InvalidOperationException(
+             "Cron expression for the Worker job is not configured. " +
+             "Please provide a valid cron schedule in the configuration under " +
+             $"'{nameof(Worker)}:CronExpression'.");
+
+        q.AddTrigger(opts => opts
+            .ForJob(jobKey)
+            .WithIdentity(name + "-trigger")
+            .WithCronSchedule(expression));
+    });
+
+    builder.Services.AddQuartzServer(options =>
+    {
+        options.WaitForJobsToComplete = true;
+    });
+
+    builder.Services.AddQuartzmon();
+
+    builder.Services.AddSingleton(provider =>
+        provider.GetRequiredService<ISchedulerFactory>().GetScheduler().Result
+    );
    #endregion

    #region Add DB Context, EG Inf. and Services
@ -58,8 +97,9 @@ try
            opt.AddDbContext((provider, options) =>
            {
                var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
-                options.UseSqlServer(connStr)
-                        .LogTo(log => logger.LogInformation("{log}", log), LogLevel.Trace)
+                var useInMemoryDb = config.GetValue<bool>("UseInMemoryDb");
+                var dbCtxOpt = useInMemoryDb ? options.UseInMemoryDatabase("EGInMemoryDb") : options.UseSqlServer(connStr);
+                dbCtxOpt.LogTo(log => logger.LogInformation("{log}", log), LogLevel.Trace)
                        .EnableSensitiveDataLogging()
                        .EnableDetailedErrors();
            });
@ -69,24 +109,45 @@ try
    #endregion  Add DB Context, EG Inf. and Services

    builder.Services.AddOptions<GdPictureOptions>()
-        .Configure((GdPictureOptions opt, IServiceProvider sp) =>
-        {
-            var licenseKey = "GDPICTURE";
-            using var scope = sp.CreateScope();
-            var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-            opt.License = mediator.ReadThirdPartyModuleLicenseAsync(licenseKey).GetAwaiter().GetResult()
+    .Configure((GdPictureOptions opt, IServiceProvider sp) =>
+    {
+        var licenseKey = "GDPICTURE";
+        using var scope = sp.CreateScope();
+        var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
+        opt.License = config["GdPictureLicenseKey"]
+            ?? mediator.ReadThirdPartyModuleLicenseAsync(licenseKey).GetAwaiter().GetResult()
            ?? throw new InvalidOperationException($"License record not found for key: {licenseKey}");
-        });
+    });

-    var host = builder.Build();
+    var app = builder.Build();

-    var licence = host.Services.GetRequiredService<IOptions<GdPictureOptions>>().Value;
+    #region Web API Middleware
+    if (app.Environment.IsDevelopment())
+    {
+        app.UseSwagger();
+        app.UseSwaggerUI();
+    }

-    host.Run();
+    app.UseHttpsRedirection();
+
+    app.UseRouting();
+
+    app.UseAuthorization();
+
+    app.UseQuartzmon(new QuartzmonOptions()
+    {
+        Scheduler = app.Services.GetRequiredService<IScheduler>(),
+        VirtualPathRoot = "/quartz"
+    });
+
+    app.MapControllers();
+    #endregion
+
+    app.Run();

    Log.Information("The worker was stopped.");
 }
-catch(Exception ex)
+catch (Exception ex)
 {
    Log.Fatal(ex, "Worker could not be started!");
 }
--- a/EnvelopeGenerator.Finalizer/Properties/launchSettings.json
+++ b/EnvelopeGenerator.Finalizer/Properties/launchSettings.json
@ -1,11 +1,40 @@
 {
  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:17119",
+      "sslPort": 44321
+    }
+  },
  "profiles": {
-    "EnvelopeGenerator.Finalizer": {
+    "http": {
      "commandName": "Project",
      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5010",
      "environmentVariables": {
-        "DOTNET_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "quartz",
+      "applicationUrl": "https://localhost:7141;http://localhost:5010",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": false,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
      }
    }
  }
--- a/EnvelopeGenerator.Finalizer/Worker.cs
+++ b/EnvelopeGenerator.Finalizer/Worker.cs
@ -1,30 +1,26 @@
 using EnvelopeGenerator.Finalizer.Models;
 using Microsoft.Extensions.Options;
+using Quartz;

 namespace EnvelopeGenerator.Finalizer
 {
-    public class Worker : BackgroundService
+    public class Worker : IJob
    {
        private readonly ILogger<Worker> _logger;

-        private readonly WorkerOptions _options;
-
-        public Worker(ILogger<Worker> logger, IOptions<WorkerOptions> workerOptions)
+        public Worker(ILogger<Worker> logger)
        {
            _logger = logger;
-            _options = workerOptions.Value;
        }

-        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        public Task Execute(IJobExecutionContext context)
        {
-            while (!stoppingToken.IsCancellationRequested)
+            if (_logger.IsEnabled(LogLevel.Information))
            {
-                if (_logger.IsEnabled(LogLevel.Information))
-                {
-                    _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
-                }
-                await Task.Delay(_options.IntervalInMillisecond, stoppingToken);
+                _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
            }
+
+            return Task.CompletedTask;
        }
    }
 }
--- a/EnvelopeGenerator.Finalizer/appsettings.Database.json
+++ b/EnvelopeGenerator.Finalizer/appsettings.Database.json
@ -17,5 +17,6 @@
    "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ],
    "Receiver": [],
    "EmailTemplate": [ "TBSIG_EMAIL_TEMPLATE_AFT_UPD" ]
-  }
+  },
+  "UseInMemoryDb": true
 }
--- a/EnvelopeGenerator.Finalizer/appsettings.Worker.json
+++ b/EnvelopeGenerator.Finalizer/appsettings.Worker.json
@ -1,5 +1,5 @@
 {
  "Worker": {
-    "IntervalInMin": 0.01666666666
+    "CronExpression": "* * * * * ?"
  }
 }
--- a/EnvelopeGenerator.Finalizer/appsettings.json
+++ b/EnvelopeGenerator.Finalizer/appsettings.json
@ -1,2 +1,3 @@
 {
+  "GdPictureLicenseKey": "kG1Qf9PwmqgR8aDmIW2zI_ebj48RzqAJegRxcystEmkbTGQqfkNBdFOXIb6C_A00Ra8zZkrHdfjqzOPXK7kgkF2YDhvrqKfqh4WDug2vOt0qO31IommzkANSuLjZ4zmraoubyEVd25rE3veQ2h_j7tGIoH_LyIHmy24GaXsxdG0yCzIBMdiLbMMMDwcPY-809KeZ83Grv76OVhFvcbBWyYc251vou1N-kGg5_ZlHDgfWoY85gTLRxafjD3KS_i9ARW4BMiy36y8n7UP2jN8kGRnW_04ubpFtfjJqvtsrP_J9D0x7bqV8xtVtT5JI6dpKsVTiMgDCrIcoFSo5gCC1fw9oUopX4TDCkBQttO4-WHBlOeq9dG5Yb0otonVmJKaQA2tP6sMR-lZDs3ql_WI9t91yPWgpssrJUxSHDd27_LMTH_owJIqkF3NOJd9mYQuAv22oNKFYbH8e41pVKb8cT33Y9CgcQ_sy6YDA5PTuIRi67mjKge_nD9rd0IN213Ir9M_EFWqg9e4haWzIdHXQUo0md70kVhPX4UIH_BKJnxEEnFfoFRNMh77bB0N4jkcBEHPl-ghOERv8dOztf4vCnNpzzWvcLD2cqWIm6THy8XGGq9h4hp8aEreRleSMwv9QQAC7mjLwhQ1rBYkpUHlpTjhTLnMwHknl6HH0Z6zzmsgkRKVyfquv94Pd7QbQfZrRka0ss_48pf9p8hAywEn81Q=="
 }
--- a/EnvelopeGenerator.sln
+++ b/EnvelopeGenerator.sln
@ -37,10 +37,10 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EnvelopeGenerator.Form", "E
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.PdfEditor", "EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj", "{211619F5-AE25-4BA5-A552-BACAFE0632D3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Finalizer", "EnvelopeGenerator.Finalizer\EnvelopeGenerator.Finalizer.csproj", "{49E6A4C0-C2FC-4A34-9821-245AF050CA26}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.DependencyInjection", "EnvelopeGenerator.DependencyInjection\EnvelopeGenerator.DependencyInjection.csproj", "{B97DE7DD-3190-4A84-85E9-E57AD735BE61}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvelopeGenerator.Finalizer", "EnvelopeGenerator.Finalizer\EnvelopeGenerator.Finalizer.csproj", "{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -95,14 +95,14 @@ Global
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49E6A4C0-C2FC-4A34-9821-245AF050CA26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49E6A4C0-C2FC-4A34-9821-245AF050CA26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49E6A4C0-C2FC-4A34-9821-245AF050CA26}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49E6A4C0-C2FC-4A34-9821-245AF050CA26}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B97DE7DD-3190-4A84-85E9-E57AD735BE61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B97DE7DD-3190-4A84-85E9-E57AD735BE61}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B97DE7DD-3190-4A84-85E9-E57AD735BE61}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B97DE7DD-3190-4A84-85E9-E57AD735BE61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -123,8 +123,8 @@ Global
 		{A9F9B431-BB9B-49B8-9E2C-0703634A653A} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{211619F5-AE25-4BA5-A552-BACAFE0632D3} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB}
-		{49E6A4C0-C2FC-4A34-9821-245AF050CA26} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 		{B97DE7DD-3190-4A84-85E9-E57AD735BE61} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
+		{C4970E6C-DB2E-48C5-B3C5-2AF589405ED9} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {73E60370-756D-45AD-A19A-C40A02DACCC7}
Author	SHA1	Message	Date
Developer 02	86c9fdfcd7	refactor: inject IScheduler via DI instead of using StdSchedulerFactory directly	2025-11-04 17:34:36 +01:00
Developer 02	89ec887510	feat(quartz): integrate Quartzmon dashboard and CommandDotNet - Added `Quartzmon` package and configured its middleware for job monitoring. - Integrated `CommandDotNet.Execution` for command-line execution support. - Updated using directives and service registrations accordingly. - Preserved existing Serilog logging, DB context, and EnvelopeGenerator setup.	2025-11-04 17:29:07 +01:00
Developer 02	7d5b988842	fix(middleware): add UseRouting before UseAuthorization Added `app.UseRouting()` in the middleware pipeline to ensure proper endpoint routing before authorization and controller mapping.	2025-11-04 17:18:29 +01:00
Developer 02	3c456562cc	refactor: replace QuartzHostedService with QuartzServer and remove unnecessary using - Replaced `AddQuartzHostedService` with `AddQuartzServer` for better Quartz integration. - Removed `Microsoft.Extensions.Options` using as it was unused. - Updated Quartz job naming to remove GUID and simplify identity. - Minor code cleanup in using statements and regions.	2025-11-04 17:06:00 +01:00
Developer 02	4d6b01030c	refactor(startup): migrate from generic Host to WebApplication and integrate Web API support - Replaced Host.CreateApplicationBuilder with WebApplication.CreateBuilder - Added Web API service registrations (Controllers, Swagger) - Organized startup into clear regions: Logging, Configuration, Worker, Services, Middleware - Introduced Swagger and HTTPS middleware for API - Improved structure and readability of Program.cs	2025-11-04 16:12:21 +01:00
Developer 02	75e7e9925b	feat(Program): make Quartz cron schedule configurable via appsettings - Replaced hardcoded cron expression with configuration-based `Worker:CronExpression`. - Throws descriptive exception if cron expression is missing. - Keeps previous worker and DB context setup unchanged.	2025-11-04 15:37:20 +01:00
Developer 02	0a175b9e9d	refactor: remove unnecessary while loop in Worker.Execute	2025-11-04 15:18:38 +01:00
Developer 02	f611e74de1	refactor(config): allow GdPicture license key from configuration - Updated GdPictureOptions setup to read license key from `GdPictureLicenseKey` config value. - Falls back to reading from third-party module if config key is not set.	2025-11-04 14:56:44 +01:00
Developer 02	08ca116628	refactor(worker): replace BackgroundService with Quartz IJob for scheduled execution - Removed inheritance from BackgroundService - Implemented Quartz IJob interface for better scheduling control - Replaced ExecuteAsync with Execute(IJobExecutionContext) - Updated cancellation handling to use context.CancellationToken	2025-11-04 14:49:56 +01:00
Developer 02	4997f7d75c	feat: add in-memory database support via appsettings UseInMemoryDb flag - Introduced conditional EF Core configuration to support InMemoryDatabase for testing or lightweight runs. - Added `UseInMemoryDb` config flag read from appsettings. - Retained SQL Server as the default when the flag is false. - Added missing Quartz namespace import.	2025-11-04 13:44:39 +01:00