Merge pull request 'Updates core system' (#25) from payments into master

Reviewed-on: #25

LiteCharmsScheduler/LiteCharmsScheduler.csproj

@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.69.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
     <PackageReference Include="Mediator.SourceGenerator" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
@@ -17,11 +18,12 @@
 
   <!-- Lite Charms Libraries -->
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.26.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.69.0" />
   </ItemGroup>
 
   <!-- Shared Global Usings -->
   <ItemGroup>
     <Using Include="Quartz" />
+    <Using Include="Mediator" />
   </ItemGroup>
 </Project>

LiteCharmsScheduler/Program.cs

@@ -1,8 +1,8 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Mediator;
+using LiteCharms.Features.MidrandBooks.Extensions;
 using LiteCharmsScheduler.Workers;
-using Mediator;
+using static LiteCharms.Features.Extensions.Quartz;
-using static LiteCharms.Features.Email.Extensions.Constants;
 
 var builder = Host.CreateApplicationBuilder(args);
 
@@ -14,19 +14,18 @@ builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineB
 builder.Services.AddEmailServices(builder.Configuration);
 builder.Services.AddEmailServiceBus();
 
-builder.Services.AddSalesServiceBus();
-builder.Services.AddGeneralServiceBus();
-builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, builder.Configuration);
-
 builder.Services.AddShopServices();
-builder.Services.AddShopDatabase(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.Features.Quartz.Abstractions;
-using LiteCharms.Features.Shop.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 */5 * * * ?", stoppingToken);
-
-            logger.LogInformation("Startup jobs scheduled");
-        }
     }
 }

LiteCharmsScheduler/appsettings.json

@@ -1,21 +1,24 @@
 {
-  "Email": {
+  "HasherSettings": {
-    "Credentials": {
+    "MinHashLength": 11
-      "Username": "shop@litecharms.co.za"
+  },
-    },
+  "BookshopS3Settings": {
-    "Port": 465,
+    "ServiceUrl": "http://192.168.1.177:30900",
-    "Host": "mail.litecharms.co.za",
+    "Region": "garage",
-    "UseSsl": true
+    "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,6 +17,19 @@ 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"
+  ValidPayfastHosts__0: "www.payfast.co.za"
+  ValidPayfastHosts__1: "sandbox.payfast.co.za"
+  ValidPayfastHosts__2: "w1w.payfast.co.za"
+  ValidPayfastHosts__3: "w2w.payfast.co.za"
+  ValidPayfastHosts__4: "ips.payfast.co.za"
+  ValidPayfastHosts__5: "api.payfast.co.za"
+  ValidPayfastHosts__6: "payment.payfast.io"
 ---
 apiVersion: v1
 kind: Secret
@@ -26,10 +39,14 @@ metadata:
 type: Opaque
 data:  
   connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
-  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNob3AtZGV2O1VzZXJuYW1lPXNob3AtZGV2LXVzZXI7UGFzc3dvcmQ9a1ZWbW9XS0ozeHpnUVg7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=
+  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPW1pZHJhbmRzaG9wLWRldjtVc2VybmFtZT1taWRyYW5kc2hvcC1kZXYtdXNlcjtQYXNzd29yZD1hUFh5a0tnM3RTOWNtRDtQZXJzaXN0IFNlY3VyaXR5IEluZm89VHJ1ZQ==
   discord-webhook: aHR0cHM6Ly9kaXNjb3JkLmNvbS9hcGkvd2ViaG9va3MvMTUwMDIzMzEyOTYwNzAzNjk3MC9KYzc5endwMjlxYWpLbmoyYkR3cm5GR0RJci11ZGIyV2JIUDZTYjdpT0hCTWpQSUY3Vkw5eUVHTkJUSXpSOVVWVzI0bQ==
   aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
   email-password: JFpTLWVJQGlYbTVNUCRhfg==
+  hasher-salt: VEdsbmFIUWdRMmhoY20xekxDQk5hV1J5WVc1a1FtOXZhM01nYldGclpTQnNiM1J6SUc5bUlHMXZibVY1SUdGdVpDQmhjbVVnWVNCemRXTmpaWE56Wm5Wc0lIWnBjbUZzSUhOMGIzSjVJR2x1SUZOdmRYUm9JRUZtY21sallRPT0=
+  hasher-payfastpassphrase: OUdBSVIwdFdwaFgwcU8=
+  bookshop-s3-accesskey: R0s1MTRkMmNlOGRjNjkyMzdhMDVjMDFlZWY=
+  bookshop-s3-secretkey: ZWFhZmVkYTFhZWQ0MDllY2ZlNjA3MTRlY2RhNTQ5YjgyYmRmNWEzZGFmOWYxOGRkNjFmNjZiNDk3M2E2NDgyZQ==
 ---
 apiVersion: v1
 kind: Service
@@ -51,7 +68,7 @@ metadata:
   namespace: litecharms-scheduler-uat
 spec:
   serviceName: "scheduler-worker-service"
-  replicas: 3
+  replicas: 1
   selector:
     matchLabels:
       app: scheduler
@@ -75,6 +92,36 @@ 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: HasherSettings__PayfastPassphrase
+              valueFrom:
+                secretKeyRef:
+                  name: scheduler-secrets
+                  key: hasher-payfastpassphrase            
+            - 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 +131,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: scheduler-secrets
-                  key: connection-string-quartz
+                  key: connection-string-quartz            
-            - name: ConnectionStrings__PostgresShop
-              valueFrom:
-                secretKeyRef:
-                  name: scheduler-secrets
-                  key: connection-string
             - name: ConnectionStrings__DiscordShop
               valueFrom:
                 secretKeyRef: