Merge pull request 'Updated Feature package to fix quartz job misfire' (#16) from migration into master

Reviewed-on: #16

.drone.yml

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

Shop/Components/Pages/Contact.razor.cs

@@ -1,9 +1,11 @@
-using LiteCharms.Features.Utilities.Commands;
-using LiteCharms.Models;
+using LiteCharms.Features.Email.Events;
+using LiteCharms.Features.Email.Models;
+using LiteCharms.Features.ServiceBus.Abstractions;
+using static LiteCharms.Features.ServiceBus.Constants;
 
 namespace Shop.Components.Pages;
 
-public partial class Contact(ISender mediator, IToastService toastService) : IDisposable
+public partial class Contact([FromKeyedServices(EmailServiceBus)] IEventBus emailBus, IToastService toastService) : IDisposable
 {
     public CancellationTokenSource TokenSource { get; set; } = new();
 
@@ -13,10 +15,9 @@ public partial class Contact(ISender mediator, IToastService toastService) : IDi
     {
         try
         {
-            var request = SendEmailCommand.Create(Input.EmailAddress!, Input.FullName!, "shop@litecharms.co.za",
-                "Khongisa Shop", Input.EmailSubject!, Input.Message!);
+            var notification = SendShopEmailEnquiryEvent.Create(Input.FullName!, Input.EmailAddress!, Input.EmailSubject!, Input.Message!);
 
-            var result = await mediator.Send(request, TokenSource.Token);
+            var result = await emailBus.PublishAsync(notification, TokenSource.Token);
 
             if (result.IsFailed)
             {

Shop/Program.cs

@@ -1,6 +1,7 @@
-using LiteCharms.Extensions;
+using LiteCharms.Features.Extensions;
+using LiteCharms.Features.Mediator;
 using Shop.Components;
-using static LiteCharms.Abstractions.Constants;
+using static LiteCharms.Features.Email.Extensions.Constants;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -14,11 +15,20 @@ builder.Services.AddBlazoredToast();
 builder.Services.AddEndpointsApiExplorer();
 
 builder.Services.AddMediator();
+
+builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>));
+builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>));
+
 builder.Services.AddSalesServiceBus();
 builder.Services.AddGeneralServiceBus();
-builder.Services.AddShopDatabase(builder.Configuration);
 builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, builder.Configuration);
 
+builder.Services.AddEmailServices(builder.Configuration);
+builder.Services.AddEmailServiceBus();
+
+builder.Services.AddShopServices();
+builder.Services.AddShopDatabase(builder.Configuration);
+
 builder.Services.AddPostgresHealtchCheck();
 builder.Services.AddQuartzHealtchCheck();
 builder.Services.AddHealthChecksSupport(builder.Configuration);

Shop/Shop.csproj

@@ -17,9 +17,7 @@
   </ItemGroup>
 
   <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.26.0" />
     <PackageReference Include="Polly" Version="8.6.6" />
   </ItemGroup>
 

Shop/appsettings.json

@@ -15,7 +15,8 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Error"
     }
   },
   "AllowedHosts": "*"

litecharms-shop-uat.yml

@@ -22,8 +22,8 @@ metadata:
   namespace: litecharms-shop-uat
 type: Opaque
 data:  
-  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPWxlYWRnZW5lcmF0b3ItZGV2O1VzZXJuYW1lPWxlYWRnZW5lcmF0b3I7UGFzc3dvcmQ9S2VLNDRsczRQWHBuYms7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=  
-  quartz-store: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
+  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNob3AtZGV2O1VzZXJuYW1lPXNob3AtZGV2LXVzZXI7UGFzc3dvcmQ9a1ZWbW9XS0ozeHpnUVg7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=
+  connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
   aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
 ---
 apiVersion: v1
@@ -81,7 +81,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: shop-secrets
-                  key: quartz-store
+                  key: connection-string-quartz
             - name: ConnectionStrings__PostgresShop
               valueFrom:
                 secretKeyRef: