Merge pull request #40 from DEFRA/feature/cleanse-reporting-email

Cleanse reporting;

Author: krisddefra

.github/workflows/check-pull-request.yml

@@ -77,7 +77,8 @@ jobs:
         with:
           compose-file: |
             ./working-dir/docker-compose.yml
-            ./working-dir/docker-compose.override.yml
+            ./working-dir/docker-compose.ci.yml
+          up-flags: "--build"
       - name: Make script executable
         run: chmod +x ./working-dir/wait-for-docker-logs.sh
       - name: Wait for localstack

.gitignore

@@ -270,3 +270,6 @@ library.db
 /localstack_data/cache
 /coverage
 /coverage-report
+
+/coverage-report-final
+/coverage-report-full

Dockerfile

@@ -14,7 +14,6 @@ RUN apt update && \
 # Build stage image
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
-ARG TARGETARCH=x64
 ENV BUILD_CONFIGURATION=${BUILD_CONFIGURATION}
 WORKDIR /src
 
@@ -23,18 +22,20 @@ COPY ["src/KeeperData.Bridge.Worker/KeeperData.Bridge.Worker.csproj", "KeeperDat
 COPY ["src/KeeperData.Infrastructure/KeeperData.Infrastructure.csproj", "KeeperData.Infrastructure/"]
 COPY ["src/KeeperData.Application/KeeperData.Application.csproj", "KeeperData.Application/"]
 COPY ["src/KeeperData.Core/KeeperData.Core.csproj", "KeeperData.Core/"]
+COPY ["src/KeeperData.Core.Reports/KeeperData.Core.Reports.csproj", "KeeperData.Core.Reports/"]
 
-RUN dotnet restore "KeeperData.Bridge/KeeperData.Bridge.csproj" -r linux-${TARGETARCH} -v n
-RUN dotnet restore "KeeperData.Bridge.Worker/KeeperData.Bridge.Worker.csproj" -r linux-${TARGETARCH} -v n
-RUN dotnet restore "KeeperData.Infrastructure/KeeperData.Infrastructure.csproj" -r linux-${TARGETARCH} -v n
-RUN dotnet restore "KeeperData.Application/KeeperData.Application.csproj" -r linux-${TARGETARCH} -v n
-RUN dotnet restore "KeeperData.Core/KeeperData.Core.csproj" -r linux-${TARGETARCH} -v n
+RUN dotnet restore "KeeperData.Bridge/KeeperData.Bridge.csproj" -r linux-x64 -v n
+RUN dotnet restore "KeeperData.Bridge.Worker/KeeperData.Bridge.Worker.csproj" -r linux-x64 -v n
+RUN dotnet restore "KeeperData.Infrastructure/KeeperData.Infrastructure.csproj" -r linux-x64 -v n
+RUN dotnet restore "KeeperData.Application/KeeperData.Application.csproj" -r linux-x64 -v n
+RUN dotnet restore "KeeperData.Core/KeeperData.Core.csproj" -r linux-x64 -v n
+RUN dotnet restore "KeeperData.Core.Reports/KeeperData.Core.Reports.csproj" -r linux-x64 -v n
 
 COPY ["src/", "."]
 
 FROM build AS publish
 WORKDIR "/src/KeeperData.Bridge"
-RUN dotnet publish "KeeperData.Bridge.csproj" -v n -c ${BUILD_CONFIGURATION} -o /app/publish -r linux-${TARGETARCH} --no-restore /p:UseAppHost=false
+RUN dotnet publish "KeeperData.Bridge.csproj" -v n -c ${BUILD_CONFIGURATION} -o /app/publish -r linux-x64 --no-restore /p:UseAppHost=false
 
 ENV ASPNETCORE_FORWARDEDHEADERS_ENABLED=true
 

compose/start-localstack.sh

@@ -1,8 +1,5 @@
 services:
   keeperdata_bridge:
-    build:
-      args:
-        TARGETARCH: x64
     labels:
       com.microsoft.visual-studio.project-name: "KeeperData.Bridge"
     environment:
@@ -18,11 +15,3 @@ services:
       - AesSalt=LD8BB2NNze7qKbVyLutAfGBxhkAApR 
     ports:
       - "5560"
-    volumes:
-      # Mac-specific paths for user secrets and HTTPS certificates
-      - ~/.microsoft/usersecrets:/home/app/.microsoft/usersecrets:ro
-      - ~/.microsoft/usersecrets:/root/.microsoft/usersecrets:ro
-      - ~/.aspnet/https:/home/app/.aspnet/https:ro
-      - ~/.aspnet/https:/root/.aspnet/https:ro
-    networks:
-      - cdp-tenant

docker-compose.override.mac.intel.yml docker-compose.ci.ymldocker-compose.override.mac.intel.yml renamed to docker-compose.ci.yml

@@ -20,5 +20,3 @@ services:
       - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
       - ${APPDATA}/ASP.NET/Https:/home/app/.aspnet/https:ro
       - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:ro
-    networks:
-      - cdp-tenant

docker-compose.override.mac.arm.yml

@@ -7,6 +7,7 @@
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
+    <UserSecretsId>KeeperData.Bridge-20241201</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

docker-compose.override.yml

@@ -0,0 +1,30 @@
+using System.Diagnostics.CodeAnalysis;
+using KeeperData.Bridge.Worker.Tasks;
+using Microsoft.Extensions.Logging;
+using Quartz;
+
+namespace KeeperData.Bridge.Worker.Jobs;
+
+[DisallowConcurrentExecution]
+[ExcludeFromCodeCoverage(Justification = "Quartz job wrapper - covered by integration tests.")]
+public class CleanseReportJob(
+    ITaskRunCleanseReport taskRunCleanseReport,
+    ILogger<CleanseReportJob> logger) : IJob
+{
+    public async Task Execute(IJobExecutionContext context)
+    {
+        logger.LogInformation("CleanseReportJob started at {StartTime}", DateTime.UtcNow);
+
+        try
+        {
+            await taskRunCleanseReport.RunAsync(context.CancellationToken);
+
+            logger.LogInformation("CleanseReportJob completed at {EndTime}", DateTime.UtcNow);
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "CleanseReportJob failed");
+            throw;
+        }
+    }
+}

src/KeeperData.Bridge.PerformanceTests/KeeperData.Bridge.PerformanceTests.csproj

@@ -1,10 +1,12 @@
+using System.Diagnostics.CodeAnalysis;
 using KeeperData.Bridge.Worker.Tasks;
 using Microsoft.Extensions.Logging;
 using Quartz;
 
 namespace KeeperData.Bridge.Worker.Jobs;
 
 [DisallowConcurrentExecution]
+[ExcludeFromCodeCoverage(Justification = "Quartz job wrapper - covered by integration tests.")]
 public class ImportBulkFilesJob(
     ITaskProcessBulkFiles taskProcessBulkFiles,
     ILogger<ImportBulkFilesJob> logger) : IJob