Merge pull request 'refactored docker build to use image caching' (#38) from update into master

Reviewed-on: #38

.drone.yml

@@ -31,6 +31,8 @@ steps:
       registry: nexus.khongisa.co.za
       repo: nexus.khongisa.co.za/litecharms-scheduler
       tags: [ latest, "1.${DRONE_BUILD_NUMBER}" ]
+      use_cache: true
+      cache_from: nexus.khongisa.co.za/litecharms-scheduler:latest
       custom_labels:
         - org.opencontainers.image.source=https://gitea.khongisa.co.za/litecharms/scheduler
         - org.opencontainers.image.version=1.${DRONE_BUILD_NUMBER}
@@ -83,6 +85,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 +108,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.19.0" />
+    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.137.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
+    <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.19.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.137.0" />
-    <PackageReference Include="LiteCharms.Features" Version="1.19.0" />
-    <PackageReference Include="LiteCharms.Models" Version="1.19.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.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>));
-builder.Services.AddGeneralServiceBus();
+builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>));
+
 builder.Services.AddEmailServices(builder.Configuration);
-builder.Services.AddShopDatabase(builder.Configuration);
+builder.Services.AddEmailServiceBus();
-builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, builder.Configuration);
+
+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

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

LiteCharmsScheduler/appsettings.json

@@ -1,21 +1,36 @@
 {
-  "Email": {
+  "PayfastSettings": {
-    "Credentials": {
+    "CheckoutUrl": "https://sandbox.payfast.co.za/eng/process",
-      "Username": "shop@litecharms.co.za"
+    "ValidHosts": [
-    },
+      "www.payfast.co.za",
-    "Port": 465,
+      "sandbox.payfast.co.za",
-    "Host": "mail.litecharms.co.za",
+      "w1w.payfast.co.za",
-    "UseSsl": true
+      "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": "*"

litecharms-scheduler-uat.yml

@@ -17,19 +17,18 @@ data:
   Email__Host: "mail.litecharms.co.za"
   Email__Port: "465"
   Email__UseSsl: "true"
----
+  EmailProcessorCron: "0 */5 * * * ?"
-apiVersion: v1
+  HasherSettings__MinHashLength: "11"
-kind: Secret
+  BookshopS3Settings__ServiceUrl: "http://garage.garage.svc.cluster.local:3900"
-metadata:
+  BookshopS3Settings__Region: "garage"
-  name: scheduler-secrets
+  BookshopS3Settings__BucketName: "bookshop"
-  namespace: litecharms-scheduler-uat
+  BookshopS3Settings__CdnBaseUrl: "https://bookshop.cdn.khongisa.co.za"
-type: Opaque
+  PayfastSettings__CheckoutUrl: "https://sandbox.payfast.co.za/eng/process"
-data:  
+  PayfastSettings__ValidHosts__0: "www.payfast.co.za"
-  connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
+  PayfastSettings__ValidHosts__1: "sandbox.payfast.co.za"
-  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNob3AtZGV2O1VzZXJuYW1lPXNob3AtZGV2LXVzZXI7UGFzc3dvcmQ9a1ZWbW9XS0ozeHpnUVg7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=
+  PayfastSettings__ValidHosts__2: "ips.payfast.co.za"
-  discord-webhook: aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTUwMDIzMzEyOTYwNzAzNjk3MC9KYzc5endwMjlxYWpLbmoyYkR3cm5GR0RJci11ZGIyV2JIUDZTYjdpT0hCTWpQSUY3Vkw5eUVHTkJUSXpSOVVWVzI0bQ==
+  PayfastSettings__ValidHosts__3: "api.payfast.co.za"
-  aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
+  PayfastSettings__ValidHosts__4: "payment.payfast.io"
-  email-password: JFpTLWVJQGlYbTVNUCRhfg==
 ---
 apiVersion: v1
 kind: Service
@@ -51,7 +50,8 @@ metadata:
   namespace: litecharms-scheduler-uat
 spec:
   serviceName: "scheduler-worker-service"
-  replicas: 3
+  replicas: 2
+  revisionHistoryLimit: 1
   selector:
     matchLabels:
       app: scheduler
@@ -74,29 +74,6 @@ spec:
           envFrom:
             - configMapRef:
                 name: scheduler-config
-          env:
+            - secretRef:
-            - name: Email__Credentials__Password
+                name: scheduler-secrets
-              valueFrom:
+ 
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: email-password
-            - name: ConnectionStrings__PostgresScheduler
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: connection-string-quartz
-            - name: ConnectionStrings__PostgresShop
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: connection-string
-            - name: ConnectionStrings__DiscordShop
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: discord-webhook
-            - name: Monitoring__ApiKey
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: aspire-apikey