Merge pull request 'Updated notification service' (#22) from migration into master

Reviewed-on: #22

.drone.yml

@@ -31,20 +31,37 @@ steps:
       registry: nexus.khongisa.co.za
       repo: nexus.khongisa.co.za/litecharms-scheduler
       tags: [ latest, "1.${DRONE_BUILD_NUMBER}" ]
+      custom_labels:
+        - org.opencontainers.image.source=https://gitea.khongisa.co.za/litecharms/scheduler
+        - org.opencontainers.image.version=1.${DRONE_BUILD_NUMBER}
+        - org.opencontainers.image.revision=${DRONE_COMMIT_SHA}
       username: { from_secret: docker_username }
       password: { from_secret: docker_password }
   
-  - name: gitea-tag
+  - name: gitea-tag-release
     image: alpine/git
     environment:
+      GITEA_TOKEN: { from_secret: git_token }
       GITEA_USER: { from_secret: git_username }
       GITEA_PASS: { from_secret: git_password }    
     commands:
-      - git config --global user.email "drone@litecharms.co.za"
+      - echo "169.255.58.144 gitea.khongisa.co.za" >> /etc/hosts
-      - git config --global user.name "Drone CI"      
+      - apk add --no-cache curl
       - git remote set-url origin https://$${GITEA_USER}:$${GITEA_PASS}@gitea.khongisa.co.za/litecharms/scheduler.git
       - git tag 1.${DRONE_BUILD_NUMBER}
       - git push origin 1.${DRONE_BUILD_NUMBER}
+      - |
+        curl -X POST "https://gitea.khongisa.co.za/api/v1/repos/litecharms/scheduler/releases" \
+             -H "Authorization: token $${GITEA_TOKEN}" \
+             -H "Content-Type: application/json" \
+             -d "{
+               \"tag_name\": \"1.${DRONE_BUILD_NUMBER}\",
+               \"target_commitish\": \"${DRONE_COMMIT_SHA}\",
+               \"name\": \"Release 1.${DRONE_BUILD_NUMBER}\",
+               \"body\": \"### Artifacts\n* **Docker Image:** nexus.khongisa.co.za/litecharms-scheduler:1.${DRONE_BUILD_NUMBER}\n* **NuGet:** [View on Nexus](https://nexus.khongisa.co.za/repository/nuget-group/)\",
+               \"draft\": false,
+               \"prerelease\": false
+             }"
 
 depends_on:
   - build
@@ -65,8 +82,9 @@ steps:
     commands:      
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
-      - kubectl apply -f shop/litecharms-scheduler-uat.yml
+      - kubectl apply -f litecharms-scheduler-uat.yml
-      - kubectl rollout restart deployment/litecharms-scheduler -n litecharms-scheduler-uat
+      - sleep 10
+      - kubectl rollout restart statefulset/litecharms-scheduler-uat -n litecharms-scheduler-uat
 
 depends_on:
   - package
@@ -87,8 +105,9 @@ steps:
     commands:      
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
-      - kubectl apply -f litecharms-shop.yml
+      - kubectl apply -f litecharms-scheduler.yml
-      - kubectl rollout restart shop/deployment/litecharms-scheduler -n litecharms-scheduler
+      - sleep 10
+      - kubectl rollout restart statefulset/litecharms-scheduler -n litecharms-scheduler
 
 depends_on:
   - uat

LiteCharmsScheduler/LiteCharmsScheduler.csproj

@@ -8,8 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Abstractions" Version="1.13.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
-    <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>
@@ -18,13 +17,12 @@
 
   <!-- Lite Charms Libraries -->
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Extensions" Version="1.13.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.34.0" />
-    <PackageReference Include="LiteCharms.Features" Version="1.13.0" />
-    <PackageReference Include="LiteCharms.Models" Version="1.13.0" />
   </ItemGroup>
 
   <!-- Shared Global Usings -->
   <ItemGroup>
     <Using Include="Quartz" />
+    <Using Include="Mediator" />
   </ItemGroup>
 </Project>

LiteCharmsScheduler/Program.cs

@@ -1,18 +1,30 @@
-using LiteCharms.Extensions;
+using LiteCharms.Features.Extensions;
+using LiteCharms.Features.Mediator;
 using LiteCharmsScheduler.Workers;
-using static LiteCharms.Abstractions.Constants;
+using static LiteCharms.Features.Email.Extensions.Constants;
 
 var builder = Host.CreateApplicationBuilder(args);
 
-builder.Services.AddMediator();
+builder.Services.AddMediator(options => options.Assemblies = new List<AssemblyReference>
+    {
+        typeof(Program).Assembly,
+        typeof(LiteCharms.Features.Shop.Notifications.Events.ProcessEmailNotificationsEvent).Assembly
+    }.AsReadOnly());
+
+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.AddQuartzScheduler(ShopSchedulerName, builder.Configuration);
-builder.Services.AddShopDatabase(builder.Configuration);
-builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, ShopSchedulerInstanceId, builder.Configuration);
 
-builder.Services.AddHostedService<Worker>();
+builder.Services.AddShopServices();
+builder.Services.AddShopDatabase(builder.Configuration);
+
+builder.Services.AddHostedService<JobWorker>();
 
 var host = builder.Build();
 

LiteCharmsScheduler/Workers/JobWorker.cs

@@ -0,0 +1,21 @@
+using LiteCharms.Features.Quartz.Abstractions;
+using LiteCharms.Features.Shop.Notifications.Events;
+
+namespace LiteCharmsScheduler.Workers
+{
+    public class JobWorker(IJobOrchestrator jobOrchestrator, ILogger<JobWorker> logger, IConfiguration configuration) : BackgroundService
+    {
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            string? emailProcessorCron = !string.IsNullOrWhiteSpace(configuration.GetSection("EmailProcessorCron").Value)
+                ? configuration.GetSection("EmailProcessorCron").Value
+                : "0 */4 * * * ?";
+
+            var emailProcessorJob = ProcessEmailNotificationsEvent.Create();
+
+            await jobOrchestrator.ScheduleAsync(emailProcessorJob, emailProcessorCron!, stoppingToken);
+
+            logger.LogInformation("Startup jobs scheduled");
+        }
+    }
+}

LiteCharmsScheduler/Workers/Worker.cs

@@ -1,17 +0,0 @@
-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);
-            }
-        }
-    }
-}

LiteCharmsScheduler/appsettings.json

@@ -7,6 +7,7 @@
     "Host": "mail.litecharms.co.za",
     "UseSsl": true
   },
+  "EmailProcessorCron": "0 */5 * * * ?",
   "Monitoring": {
     "ApiKey": "",
     "Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
@@ -15,7 +16,8 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Warning"
     }
   },
   "AllowedHosts": "*"

README.md

@@ -1 +1,18 @@
-# LiteCharms
+# LiteCharms.Scheduler
+
+The background processing engine responsible for automated tasks and scheduled jobs.
+
+## 🏗 Architecture
+* **Type:** Kubernetes **StatefulSet**
+* **Persistence:** Uses Postgres at `192.168.1.170`.
+* **Clustering:** Configured for Quartz.NET/Hangfire clustering to support multiple replicas without task duplication.
+
+## 🚀 CI/CD Workflow
+* **Trigger:** Pull Request to `master`.
+* **Versioning:** Automated Gitea Releases with links to Docker and NuGet artifacts.
+* **Identity:** Uses stable network identifiers (`litecharms-scheduler-0`, etc.) to maintain lock integrity in the database.
+
+## ⚙️ Scaling
+To scale the scheduler:
+`kubectl scale statefulset litecharms-scheduler --replicas=3`
+*Note: Ensure Database Job Store is enabled in appsettings before scaling.*

litecharms-scheduler-uat.yml

@@ -17,6 +17,7 @@ data:
   Email__Host: "mail.litecharms.co.za"
   Email__Port: "465"
   Email__UseSsl: "true"
+  EmailProcessorCron: "0 */5 * * * ?"
 ---
 apiVersion: v1
 kind: Secret
@@ -25,31 +26,32 @@ metadata:
   namespace: litecharms-scheduler-uat
 type: Opaque
 data:  
-  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPWxlYWRnZW5lcmF0b3ItZGV2O1VzZXJuYW1lPWxlYWRnZW5lcmF0b3I7UGFzc3dvcmQ9S2VLNDRsczRQWHBuYms7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=
+  connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
+  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNob3AtZGV2O1VzZXJuYW1lPXNob3AtZGV2LXVzZXI7UGFzc3dvcmQ9a1ZWbW9XS0ozeHpnUVg7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=
   discord-webhook: aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTUwMDIzMzEyOTYwNzAzNjk3MC9KYzc5endwMjlxYWpLbmoyYkR3cm5GR0RJci11ZGIyV2JIUDZTYjdpT0hCTWpQSUY3Vkw5eUVHTkJUSXpSOVVWVzI0bQ==
   aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
   email-password: JFpTLWVJQGlYbTVNUCRhfg==
-  quartz-store: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QpU2VjdXJpdHkgSW5mbz1UcnVl
 ---
 apiVersion: v1
-kind: PersistentVolumeClaim
+kind: Service
 metadata:
-  name: scheduler-data-pvc
+  name: scheduler-worker-service
   namespace: litecharms-scheduler-uat
 spec:
-  accessModes: ["ReadWriteMany"]
+  clusterIP: None
-  storageClassName: nfs-storage
+  selector:
-  resources:
+    app: scheduler
-    requests:
+  ports:
-      storage: 2Gi
+    - port: 80
+      name: dummy-port
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: litecharms-scheduler
+  name: litecharms-scheduler-uat
   namespace: litecharms-scheduler-uat
 spec:
-  serviceName: "scheduler-worker"
+  serviceName: "scheduler-worker-service"
   replicas: 1
   selector:
     matchLabels:
@@ -62,6 +64,7 @@ spec:
       containers:
         - name: scheduler
           image: nexus.khongisa.co.za/litecharms-scheduler:latest
+          imagePullPolicy: Always
           resources:
             limits:
               memory: "2Gi"
@@ -82,7 +85,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: scheduler-secrets
-                  key: quartz-store
+                  key: connection-string-quartz
             - name: ConnectionStrings__PostgresShop
               valueFrom:
                 secretKeyRef:
@@ -98,22 +101,3 @@ spec:
                 secretKeyRef:
                   name: scheduler-secrets
                   key: aspire-apikey
-          volumeMounts:
-            - name: storage
-              mountPath: /app/wwwroot/content
-              subPath: content
-            - name: storage
-              mountPath: /app/keys
-              subPath: dataprotection-keys
-          livenessProbe:
-            exec:
-              command:
-                - /bin/sh
-                - -c
-                - ps aux | grep LiteCharmsScheduler.dll | grep -v grep
-            initialDelaySeconds: 30
-            periodSeconds: 60
-      volumes:
-        - name: storage
-          persistentVolumeClaim:
-            claimName: scheduler-data-pvc