Merge pull request 'migration' (#9) from migration into master

Reviewed-on: #9

.drone.yml

@@ -8,13 +8,13 @@ steps:
     image: mcr.microsoft.com/dotnet/sdk:10.0
     commands:
       - dotnet restore LiteCharmsShop.slnx
-      - dotnet build LiteCharms.slnx -c Release
+      - dotnet build LiteCharmsShop.slnx -c Release
 
   - name: dotnet-test
     image: mcr.microsoft.com/dotnet/sdk:10.0
     commands:
       - dotnet restore LiteCharmsShop.slnx
-      - dotnet test LiteCharms.slnx -c Release --no-restore
+      - dotnet test LiteCharmsShop.slnx -c Release --no-restore
 
 trigger:
   event: [ pull_request ]
@@ -66,7 +66,7 @@ steps:
       - mkdir -p $HOME/.kube
       - echo "$KUBE_CONFIG" > $HOME/.kube/config
       - kubectl apply -f litecharms-shop-uat.yml
-      - kubectl rollout restart deployment/litecharms-shop -n litecharms-shop-uat
+      - kubectl rollout restart deployment/litecharms-shop-uat -n litecharms-shop-uat
 
 depends_on:
   - package

Dockerfile

@@ -2,24 +2,19 @@
 FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 WORKDIR /app
 
-COPY ["../nuget.config", "./"]
-COPY ["../Shop/Shop.csproj", "Shop/"]
+COPY ["nuget.config", "./"]
+COPY ["Shop/Shop.csproj", "Shop/"]
 RUN dotnet restore "Shop/Shop.csproj" --configfile nuget.config
 COPY . .
-RUN dotnet publish "../Shop/Shop.csproj" -c Release -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "Shop/Shop.csproj" -c Release -o /app/publish /p:UseAppHost=false
 
 # Stage 2: Final Image
 FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS final
 WORKDIR /app
-RUN addgroup --system --gid 1000 appgroup && \
-    adduser --system --uid 1000 --ingroup appgroup appuser
 
 EXPOSE 8080
 EXPOSE 8081
 
 COPY --from=build /app/publish .
 
-RUN chown -R appuser:appgroup /app
-USER appuser
-
 ENTRYPOINT ["dotnet", "Shop.dll"]

Shop/Program.cs

@@ -14,12 +14,10 @@ builder.Services.AddBlazoredToast();
 builder.Services.AddEndpointsApiExplorer();
 
 builder.Services.AddMediator();
-builder.Services.AddEmailServiceBus();
 builder.Services.AddSalesServiceBus();
 builder.Services.AddGeneralServiceBus();
-builder.Services.AddEmailServices(builder.Configuration);
-builder.Services.AddLeadGeneratorDatabase(builder.Configuration);
-builder.Services.AddQuartzSchedulerClient(LeadGeneratorSchedulerName, LeadGeneratorSchedulerInstanceId, builder.Configuration);
+builder.Services.AddShopDatabase(builder.Configuration);
+builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, builder.Configuration);
 
 builder.Services.AddPostgresHealtchCheck();
 builder.Services.AddQuartzHealtchCheck();
@@ -28,7 +26,7 @@ builder.Services.AddHealthChecksSupport(builder.Configuration);
 var app = builder.Build();
 
 var schedulerFactory = app.Services.GetRequiredService<ISchedulerFactory>();
-var scheduler = await schedulerFactory.GetScheduler(LeadGeneratorSchedulerName);
+var scheduler = await schedulerFactory.GetScheduler(ShopSchedulerName);
 
 if (!scheduler!.IsStarted)
     await scheduler.Start();

Shop/Shop.csproj

@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Extensions" Version="1.11.0" />
-    <PackageReference Include="LiteCharms.Features" Version="1.11.0" />
-    <PackageReference Include="LiteCharms.Models" Version="1.11.0" />
+    <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="Polly" Version="8.6.6" />
   </ItemGroup>
 

litecharms-shop-uat.yml

@@ -24,6 +24,7 @@ type: Opaque
 data:  
   connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPWxlYWRnZW5lcmF0b3ItZGV2O1VzZXJuYW1lPWxlYWRnZW5lcmF0b3I7UGFzc3dvcmQ9S2VLNDRsczRQWHBuYms7UGVyc2lzdCBTZWN1cml0eSBJbmZvPVRydWU=  
   quartz-store: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
+  aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -62,6 +63,7 @@ spec:
       containers:
         - name: shop
           image: nexus.khongisa.co.za/litecharms-shop:latest
+          imagePullPolicy: Always
           resources:
             limits:
               memory: "512Mi"
@@ -85,11 +87,6 @@ spec:
                 secretKeyRef:
                   name: shop-secrets
                   key: connection-string            
-            - name: ConnectionStrings__DiscordShop
-              valueFrom:
-                secretKeyRef:
-                  name: shop-secrets
-                  key: discord-webhook
             - name: Monitoring__Address
               valueFrom:
                 configMapKeyRef: