Merge pull request 'Updated scheduler events' (#30) from payments into master

Reviewed-on: #30

.drone.yml

@@ -83,6 +83,8 @@ 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
@@ -104,6 +106,7 @@ 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,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Abstractions" Version="1.14.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
+    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.120.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.9" />
     <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -18,13 +18,12 @@
 
   <!-- Lite Charms Libraries -->
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Extensions" Version="1.14.0" />
-    <PackageReference Include="LiteCharms.Features" Version="1.14.0" />
-    <PackageReference Include="LiteCharms.Models" Version="1.14.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.120.0" />
   </ItemGroup>
 
   <!-- Shared Global Usings -->
   <ItemGroup>
     <Using Include="Quartz" />
+    <Using Include="Mediator" />
   </ItemGroup>
 </Project>

LiteCharmsScheduler/Program.cs

@@ -1,23 +1,33 @@
-using LiteCharms.Extensions;
+using LiteCharms.Features.Extensions;
+using LiteCharms.Features.Mediator;
+using LiteCharms.Features.MidrandBooks.Extensions;
 using LiteCharmsScheduler.Workers;
-using static LiteCharms.Abstractions.Constants;
+using static LiteCharms.Features.Extensions.Quartz;
 
 var builder = Host.CreateApplicationBuilder(args);
 
 builder.Services.AddMediator();
-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.AddHostedService<Worker>();
+builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>));
+builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>));
+
+builder.Services.AddEmailServices(builder.Configuration);
+builder.Services.AddEmailServiceBus();
+
+builder.Services.AddHttpClient();
+builder.Services.AddShopServices();
+builder.Services.AddPayfastServices(builder.Configuration);
+builder.Services.AddHashServices(builder.Configuration);
+builder.Services.AddMidrandShopDatabase(builder.Configuration);
+
+builder.Services.AddQuartzScheduler(MidrandShopSchedulerName, builder.Configuration);
+
+builder.Services.AddHostedService<JobWorker>();
 
 var host = builder.Build();
 
 var schedulerFactory = host.Services.GetRequiredService<ISchedulerFactory>();
-var scheduler = await schedulerFactory.GetScheduler(ShopSchedulerName);
+var scheduler = await schedulerFactory.GetScheduler(MidrandShopSchedulerName);
 
 if (!scheduler!.IsStarted)
     await scheduler.Start();

LiteCharmsScheduler/Workers/JobWorker.cs

@@ -0,0 +1,8 @@
+namespace LiteCharmsScheduler.Workers
+{
+    public class JobWorker(ILogger<JobWorker> logger) : BackgroundService
+    {
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken) => 
+            logger.LogInformation("Midrand Books jobs initialized");
+    }
+}

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

@@ -1,21 +1,36 @@
 {
-  "Email": {
-    "Credentials": {
-      "Username": "shop@litecharms.co.za"
-    },
-    "Port": 465,
-    "Host": "mail.litecharms.co.za",
-    "UseSsl": true
+  "PayfastSettings": {
+    "CheckoutUrl": "https://sandbox.payfast.co.za/eng/process",
+    "ValidHosts": [
+      "www.payfast.co.za",
+      "sandbox.payfast.co.za",
+      "w1w.payfast.co.za",
+      "w2w.payfast.co.za",
+      "ips.payfast.co.za",
+      "api.payfast.co.za",
+      "payment.payfast.io"
+    ]
+  },
+  "HasherSettings": {
+    "MinHashLength": 11
+  },
+  "BookshopS3Settings": {
+    "ServiceUrl": "http://192.168.1.177:30900",
+    "Region": "garage",
+    "BucketName": "bookshop",
+    "CdnBaseUrl": "https://bookshop.cdn.khongisa.co.za"
   },
   "Monitoring": {
     "ApiKey": "",
     "Address": "http://aspire-dashboard-service.aspire.svc.cluster.local:18889",
-    "ServiceName": "LiteCharms.LeadGenerator"
+    "ServiceName": "MidrandBooks.DEV"
   },
+  "EmailProcessorCron": "0 */5 * * * ?",
   "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,18 @@ data:
   Email__Host: "mail.litecharms.co.za"
   Email__Port: "465"
   Email__UseSsl: "true"
+  EmailProcessorCron: "0 */5 * * * ?"
+  HasherSettings__MinHashLength: "11"
+  BookshopS3Settings__ServiceUrl: "http://garage.garage.svc.cluster.local:3900"
+  BookshopS3Settings__Region: "garage"
+  BookshopS3Settings__BucketName: "bookshop"
+  BookshopS3Settings__CdnBaseUrl: "https://bookshop.cdn.khongisa.co.za"
+  PayfastSettings__CheckoutUrl: "https://sandbox.payfast.co.za/eng/process"
+  PayfastSettings__ValidHosts__0: "www.payfast.co.za"
+  PayfastSettings__ValidHosts__1: "sandbox.payfast.co.za"
+  PayfastSettings__ValidHosts__2: "ips.payfast.co.za"
+  PayfastSettings__ValidHosts__3: "api.payfast.co.za"
+  PayfastSettings__ValidHosts__4: "payment.payfast.io"
 ---
 apiVersion: v1
 kind: Secret
@@ -26,10 +38,16 @@ metadata:
 type: Opaque
 data:  
   connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
-  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPWxlYWRnZW5lcmF0b3ItZGV2O1VzZXJuYW1lPWxlYWRnZW5lcmF0b3I7UGFzc3dvcmQ9S2VLNDRsczRQWHBuYms7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=
+  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPW1pZHJhbmRzaG9wLWRldjtVc2VybmFtZT1taWRyYW5kc2hvcC1kZXYtdXNlcjtQYXNzd29yZD1hUFh5a0tnM3RTOWNtRDtQZXJzaXN0IFNlY3VyaXR5IEluZm89VHJ1ZQ==
   discord-webhook: aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTUwMDIzMzEyOTYwNzAzNjk3MC9KYzc5endwMjlxYWpLbmoyYkR3cm5GR0RJci11ZGIyV2JIUDZTYjdpT0hCTWpQSUY3Vkw5eUVHTkJUSXpSOVVWVzI0bQ==
   aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
   email-password: JFpTLWVJQGlYbTVNUCRhfg==
+  hasher-salt: VEdsbmFIUWdRMmhoY20xekxDQk5hV1J5WVc1a1FtOXZhM01nYldGclpTQnNiM1J6SUc5bUlHMXZibVY1SUdGdVpDQmhjbVVnWVNCemRXTmpaWE56Wm5Wc0lIWnBjbUZzSUhOMGIzSjVJR2x1SUZOdmRYUm9JRUZtY21sallRPT0=
+  bookshop-s3-accesskey: R0s1MTRkMmNlOGRjNjkyMzdhMDVjMDFlZWY=
+  bookshop-s3-secretkey: ZWFhZmVkYTFhZWQ0MDllY2ZlNjA3MTRlY2RhNTQ5YjgyYmRmNWEzZGFmOWYxOGRkNjFmNjZiNDk3M2E2NDgyZQ==
+  payfast-passphrase: OUdBSVIwdFdwaFgwcU8=
+  payfast-merchantid: MTAwNDkzMDc=
+  payfast-merchantkey: anU2bmF2bjBqY2JmMA==
 ---
 apiVersion: v1
 kind: Service
@@ -51,7 +69,7 @@ metadata:
   namespace: litecharms-scheduler-uat
 spec:
   serviceName: "scheduler-worker-service"
-  replicas: 3
+  replicas: 1
   selector:
     matchLabels:
       app: scheduler
@@ -75,6 +93,46 @@ spec:
             - configMapRef:
                 name: scheduler-config
           env:
+            - name: BookshopS3Settings__AccessKey
+              valueFrom:
+                secretKeyRef:
+                  name: scheduler-secrets
+                  key: bookshop-s3-accesskey
+            - name: BookshopS3Settings__SecretKey
+              valueFrom:
+                secretKeyRef:
+                  name: scheduler-secrets
+                  key: bookshop-s3-secretkey
+            - name: HasherSettings__Salt
+              valueFrom:
+                secretKeyRef:
+                  name: scheduler-secrets
+                  key: hasher-salt
+            - name: PayfastSettings__Passphrase
+              valueFrom:
+                secretKeyRef:
+                  name: scheduler-secrets
+                  key: payfast-passphrase
+            - name: PayfastSettings__MerchantId
+              valueFrom:
+                secretKeyRef:
+                  name: scheduler-secrets
+                  key: payfast-merchantid
+            - name: PayfastSettings__MerchantKey
+              valueFrom:
+                secretKeyRef:
+                  name: scheduler-secrets
+                  key: payfast-merchantkey
+            - name: ConnectionStrings__PostgresMidrandBooks
+              valueFrom:
+                secretKeyRef:
+                  name: scheduler-secrets
+                  key: connection-string
+            - name: Monitoring__ApiKey
+              valueFrom:
+                secretKeyRef:
+                  name: scheduler-secrets
+                  key: aspire-apikey
             - name: Email__Credentials__Password
               valueFrom:
                 secretKeyRef:
@@ -84,12 +142,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: scheduler-secrets
-                  key: connection-string-quartz
-            - name: ConnectionStrings__PostgresShop
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: connection-string
+                  key: connection-string-quartz            
             - name: ConnectionStrings__DiscordShop
               valueFrom:
                 secretKeyRef: