fix #13

code/Executable/DependencyInjection/QuartzDI.cs

@@ -1,16 +1,5 @@
-using Common.Configuration;
-using Common.Configuration.ContentBlocker;
-using Common.Configuration.DownloadCleaner;
-using Common.Configuration.QueueCleaner;
-using Common.Helpers;
 using Executable.Jobs;
-using Infrastructure.Configuration;
-using Infrastructure.Verticals.ContentBlocker;
-using Infrastructure.Verticals.DownloadCleaner;
-using Infrastructure.Verticals.Jobs;
-using Infrastructure.Verticals.QueueCleaner;
 using Quartz;
-using Quartz.Spi;
 
 namespace Executable.DependencyInjection;
 
@@ -18,125 +7,14 @@ public static class QuartzDI
 {
     public static IServiceCollection AddQuartzServices(this IServiceCollection services, IConfiguration configuration) =>
         services
-            .AddQuartz(q =>
-            {
-                // Configure quartz to use job-specific config files
-                var serviceProvider = services.BuildServiceProvider();
-                q.AddJobs(serviceProvider);
-            })
+            .AddQuartz()
             .AddQuartzHostedService(opt =>
             {
                 opt.WaitForJobsToComplete = true;
-            });
+            })
+            // Register BackgroundJobManager as a hosted service
+            .AddSingleton<BackgroundJobManager>()
+            .AddHostedService(provider => provider.GetRequiredService<BackgroundJobManager>());
 
-    private static void AddJobs(
-        this IServiceCollectionQuartzConfigurator q,
-        IServiceProvider serviceProvider
-    )
-    {
-        var configManager = serviceProvider.GetRequiredService<IConfigManager>();
-        
-        // Get configurations from JSON files
-        ContentBlockerConfig? contentBlockerConfig = configManager.GetContentBlockerConfig();
-        
-        if (contentBlockerConfig != null)
-        {
-            q.AddJob<ContentBlocker>(contentBlockerConfig, contentBlockerConfig.CronExpression);
-        }
-        
-        QueueCleanerConfig? queueCleanerConfig = configManager.GetQueueCleanerConfig();
-
-        if (queueCleanerConfig != null)
-        {
-            if (contentBlockerConfig?.Enabled is true && queueCleanerConfig is { Enabled: true, RunSequentially: true })
-            {
-                q.AddJob<QueueCleaner>(queueCleanerConfig, string.Empty);
-                q.AddJobListener(new JobChainingListener(nameof(ContentBlocker), nameof(QueueCleaner)));
-            }
-            else
-            {
-                q.AddJob<QueueCleaner>(queueCleanerConfig, queueCleanerConfig.CronExpression);
-            }
-        }
-        
-        DownloadCleanerConfig? downloadCleanerConfig = configManager.GetDownloadCleanerConfig();
-
-        if (downloadCleanerConfig != null)
-        {
-            q.AddJob<DownloadCleaner>(downloadCleanerConfig, downloadCleanerConfig.CronExpression);
-        }
-    }
-    
-    private static void AddJob<T>(
-        this IServiceCollectionQuartzConfigurator q,
-        IJobConfig? config,
-        string trigger
-    ) where T: GenericHandler
-    {
-        string typeName = typeof(T).Name;
-        
-        if (config is null)
-        {
-            throw new NullReferenceException($"{typeName} configuration is null");
-        }
-
-        if (!config.Enabled)
-        {
-            return;
-        }
-
-        bool hasTrigger = trigger.Length > 0;
-
-        q.AddJob<GenericJob<T>>(opts =>
-        {
-            opts.WithIdentity(typeName);
-
-            if (!hasTrigger)
-            {
-                // jobs with no triggers need to be stored durably
-                opts.StoreDurably();
-            }
-        });
-
-        // skip empty triggers
-        if (!hasTrigger)
-        {
-            return;
-        }
-        
-        IOperableTrigger triggerObj = (IOperableTrigger)TriggerBuilder.Create()
-            .WithIdentity("ExampleTrigger")
-            .StartNow()
-            .WithCronSchedule(trigger)
-            .Build();
-
-        IReadOnlyList<DateTimeOffset> nextFireTimes = TriggerUtils.ComputeFireTimes(triggerObj, null, 2);
-        TimeSpan triggerValue = nextFireTimes[1] - nextFireTimes[0];
-        
-        if (triggerValue > Constants.TriggerMaxLimit)
-        {
-            throw new Exception($"{trigger} should have a fire time of maximum {Constants.TriggerMaxLimit.TotalHours} hours");
-        }
-
-        if (triggerValue > StaticConfiguration.TriggerValue)
-        {
-            StaticConfiguration.TriggerValue = triggerValue;
-        }
-        
-        q.AddTrigger(opts =>
-        {
-            opts.ForJob(typeName)
-                .WithIdentity($"{typeName}-trigger")
-                .WithCronSchedule(trigger, x =>x.WithMisfireHandlingInstructionDoNothing())
-                .StartNow();
-        });
-        
-        // Startup trigger
-        q.AddTrigger(opts =>
-        {
-            opts.ForJob(typeName)
-                .WithIdentity($"{typeName}-startup-trigger")
-                .StartNow();
-        });
-    }
+    // Jobs are now managed by BackgroundJobManager
 }