Merge pull request 'Updated to use new shop database' (#12) from migration into master

Reviewed-on: #12

.drone.yml

@@ -83,8 +83,6 @@ steps:
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
       - kubectl apply -f litecharms-scheduler-uat.yml
-      - sleep 10
-      - kubectl rollout restart statefulset/litecharms-scheduler-uat -n litecharms-scheduler-uat
 
 depends_on:
   - package
@@ -106,7 +104,6 @@ steps:
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
       - kubectl apply -f litecharms-scheduler.yml
-      - sleep 10
       - kubectl rollout restart statefulset/litecharms-scheduler -n litecharms-scheduler
 
 depends_on:

LiteCharmsScheduler/LiteCharmsScheduler.csproj

@@ -8,7 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
+    <PackageReference Include="LiteCharms.Abstractions" Version="1.14.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
     <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -17,7 +18,9 @@
 
   <!-- Lite Charms Libraries -->
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.26.0" />
+    <PackageReference Include="LiteCharms.Extensions" Version="1.14.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.14.0" />
+    <PackageReference Include="LiteCharms.Models" Version="1.14.0" />
   </ItemGroup>
 
   <!-- Shared Global Usings -->

LiteCharmsScheduler/Program.cs

@@ -1,27 +1,18 @@
-using LiteCharms.Features.Extensions;
-using LiteCharms.Features.Mediator;
+using LiteCharms.Extensions;
 using LiteCharmsScheduler.Workers;
-using Mediator;
-using static LiteCharms.Features.Email.Extensions.Constants;
+using static LiteCharms.Abstractions.Constants;
 
 var builder = Host.CreateApplicationBuilder(args);
 
 builder.Services.AddMediator();
-
-builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>));
-builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>));
-
-builder.Services.AddEmailServices(builder.Configuration);
 builder.Services.AddEmailServiceBus();
-
 builder.Services.AddSalesServiceBus();
 builder.Services.AddGeneralServiceBus();
+builder.Services.AddEmailServices(builder.Configuration);
+builder.Services.AddShopDatabase(builder.Configuration);
 builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, builder.Configuration);
 
-builder.Services.AddShopServices();
-builder.Services.AddShopDatabase(builder.Configuration);
-
-builder.Services.AddHostedService<JobWorker>();
+builder.Services.AddHostedService<Worker>();
 
 var host = builder.Build();
 

LiteCharmsScheduler/Workers/JobWorker.cs

@@ -1,15 +0,0 @@
-using LiteCharms.Features.Quartz.Abstractions;
-using LiteCharms.Features.Shop.Notifications.Events;
-
-namespace LiteCharmsScheduler.Workers
-{
-    public class JobWorker(IJobOrchestrator jobOrchestrator, ILogger<JobWorker> logger) : BackgroundService
-    {
-        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-        {
-            await jobOrchestrator.ScheduleAsync(ProcessEmailNotificationsEvent.Create(), "0 */5 * * * ?", stoppingToken);
-
-            logger.LogInformation("Startup jobs scheduled");
-        }
-    }
-}

LiteCharmsScheduler/Workers/Worker.cs

@@ -0,0 +1,17 @@
+namespace LiteCharmsScheduler.Workers
+{
+    public class Worker(ILogger<Worker> logger) : BackgroundService
+    {
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            while (!stoppingToken.IsCancellationRequested)
+            {
+                if (logger.IsEnabled(LogLevel.Information))
+                {
+                    logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
+                }
+                await Task.Delay(1000, stoppingToken);
+            }
+        }
+    }
+}