Merge pull request 'payments' (#4) from payments into master

Reviewed-on: #4

.drone.yml

@@ -82,9 +82,9 @@ steps:
     commands:      
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
-      - kubectl apply -f midrandbooks-uat.yml
+      - kubectl apply -f midrandbooksapi-uat.yml
       - sleep 10
-      - kubectl rollout restart deployment/midrandbooks -n midrandbooks-uat
+      - kubectl rollout restart deployment/midrandbooks-api -n midrandbooksapi-uat
 
 depends_on:
   - package
@@ -105,7 +105,7 @@ steps:
     commands:      
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
-      - kubectl apply -f midrandbooks.yml
+      - kubectl apply -f midrandbooks-api.yml
 
 depends_on:
   - uat

MidrandBooksApi/MidrandBooksApi.csproj

@@ -53,13 +53,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.61.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.64.0" />
   </ItemGroup>
 
   <!-- UI -->
   <ItemGroup>
     <PackageReference Include="ANM.Blazored.Toast" Version="0.1.1" />
-    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.61.0" />
+    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.64.0" />
 
     <!-- Global Usings -->
     <Using Include="Blazored.Toast.Services" />
@@ -85,6 +85,7 @@
 
   <!-- Shared Global Usings -->
   <ItemGroup>
+    <Using Include="System.Diagnostics" />
     <Using Include="System.Reflection" />
     <Using Include="Microsoft.Extensions.DependencyInjection.Extensions" />
   </ItemGroup>

MidrandBooksApi/Payments/Endpoints/ConfirmationEndpoint.cs

@@ -1,17 +1,24 @@
-using LiteCharms.Features.Extensions;
+using LiteCharms.Features.Hasher;
-using LiteCharms.Features.Hasher;
+using LiteCharms.Features.MidrandBooks.Payments.Events;
 using LiteCharms.Features.Models;
+using LiteCharms.Features.Quartz.Abstractions;
 
 namespace MidrandBooksApi.Payments.Endpoints;
 
 [ApiVersionTarget(1)]
 public sealed class ConfirmationEndpoint : IEndpoint
 {
+    private static readonly ActivitySource PaymentActivitySource = new("MidrandBooksApi.Payments");
+
     public void Map(IEndpointRouteBuilder builder)
     {
         builder.MapPost("payments/confirm", async (HttpRequest request, HashService hashService,
-            CancellationToken cancellationToken) =>
+            IJobOrchestrator jobOrchestrator, CancellationToken cancellationToken) =>
         {
+            using Activity? activity = PaymentActivitySource.StartActivity("ReceivePayfastWebhook", ActivityKind.Server);
+            activity?.SetTag("messaging.system", "payfast");
+            activity?.SetTag("messaging.destination.name", "payments/confirm");
+
             var formCollection = await request.ReadFormAsync(cancellationToken);
 
             if (!formCollection.TryGetValue("signature", out var signatureValues) || string.IsNullOrWhiteSpace(signatureValues.ToString())) 
@@ -28,9 +35,13 @@ public sealed class ConfirmationEndpoint : IEndpoint
 
             var validationResult = hashService.VerifyPayfastWebhookSignature(payload, incomingSignature);
 
-            return validationResult.IsFailed || !validationResult.Value
+            if (validationResult.IsFailed || !validationResult.Value) return Results.Unauthorized();
-                ? Results.Unauthorized()
+
-                : Results.Ok();
+            await jobOrchestrator.SendAsync(PayfastPaymentConfirmationReceivedEvent.Create(payload, payload.MPaymentId!), cancellationToken);
+
+            activity?.SetStatus(ActivityStatusCode.Ok);
+
+            return Results.Ok();
         })
         .WithDescription("Securely confirm and process an incoming Payfast merchant payment callback.")
         .WithName(typeof(ConfirmationEndpoint).ToEndpointName())

MidrandBooksApi/Program.cs

@@ -1,4 +1,5 @@
 using Asp.Versioning.Builder;
+using k8s.Models;
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Mediator;
 using LiteCharms.Features.MidrandBooks.Extensions;
@@ -74,6 +75,10 @@ app.UseHealthChecks("/ready");
 
 app.MapOpenApi();
 
+var apiVersions = app.DescribeApiVersions()
+    .OrderByDescending(o => o.ApiVersion.MajorVersion)
+    .ToList();
+
 foreach (var description in app.DescribeApiVersions().OrderByDescending(o => o.ApiVersion.MajorVersion))
     app.MapScalarApiReference($"/openapi/{description.GroupName}", (options, context) =>
     {
@@ -84,6 +89,10 @@ foreach (var description in app.DescribeApiVersions().OrderByDescending(o => o.A
         options.Authentication = new ScalarAuthenticationOptions { PreferredSecuritySchemes = ["Bearer"] };
     });
 
+var latestVersionGroup = apiVersions.FirstOrDefault()?.GroupName ?? "v1";
+
+app.MapGet("/", () => Results.Redirect($"/openapi/{latestVersionGroup}"))
+   .ExcludeFromDescription();
 
 if (!app.Environment.IsDevelopment())
     app.UseExceptionHandler("/Error", createScopeForErrors: true);