Fixed the downloading issues and updated the downloads to include fin…

…alisations (#42) Co-authored-by: Thomas Anderson <[email protected]>
DEFRA · Jan 8, 2025 · de1fc27 · de1fc27
1 parent 438d3b2
commit de1fc27
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Btms.Backend/Endpoints/SyncEndpoints.cs b/Btms.Backend/Endpoints/SyncEndpoints.cs
@@ -52,7 +52,7 @@ internal static async Task<IResult> InitialiseEnvironment(IHost app, SyncPeriod
 
     private static IResult DownloadNotifications([FromServices] IWebHostEnvironment env, string id)
     {
-        var stream = File.OpenRead($"{Path.Combine(env.ContentRootPath, id)}.zip");
+        var stream = File.OpenRead($"{env.ContentRootPath}/{id}.zip");
         return Results.File(stream, "application/zip", $"{id}.zip", enableRangeProcessing: true);
     }
 

diff --git a/Btms.Business/Commands/DownloadNotificationsCommand.cs b/Btms.Business/Commands/DownloadNotificationsCommand.cs
@@ -39,8 +39,10 @@ public async Task Handle(DownloadCommand request, CancellationToken cancellation
             await Download(request, rootFolder, "RAW/GVMSAPIRESPONSE", typeof(SearchGmrsForDeclarationIdsResponse), cancellationToken);
 
             await Download(request, rootFolder, "RAW/DECISIONS", typeof(AlvsClearanceRequest), cancellationToken);
-
-            ZipFile.CreateFromDirectory(rootFolder, $"{env.ContentRootPath}\\{request.JobId}.zip");
+
+            await Download(request, rootFolder, "RAW/FINALISATION", typeof(AlvsClearanceRequest), cancellationToken);
+
+            ZipFile.CreateFromDirectory(rootFolder, $"{env.ContentRootPath}/{request.JobId}.zip");
 
             Directory.Delete(rootFolder, true);
         }

diff --git a/Btms.SensitiveData/SensitiveDataSerializer.cs b/Btms.SensitiveData/SensitiveDataSerializer.cs
@@ -55,6 +55,11 @@ public string RedactRawJson(string json, Type type)
         }
         var sensitiveFields = SensitiveFieldsProvider.Get(type);
 
+        if (!sensitiveFields.Any())
+        {
+            return json;
+        }
+
         var rootNode = JsonNode.Parse(json);
 
         foreach (var sensitiveField in sensitiveFields)