Sort path on returned import job

digirati-co-uk · May 22, 2024 · 691d569 · 691d569
1 parent 01b1c78
commit 691d569
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/LeedsExperiment/Preservation.API/Models/ModelConverter.cs b/LeedsExperiment/Preservation.API/Models/ModelConverter.cs
@@ -128,15 +128,6 @@ public PreservationImportJob ToPreservationResource(ImportJob importJob, string
                 uriGenerator.GetRepositoryPath(importJob.ArchivalGroupUri)!),
         };
 
-    /*public ImportJobEntity ToEntity(PreservationImportJob preservationImportJob, string id) =>
-        new()
-        {
-            Id = id,
-            DigitalObject = preservationImportJob.DigitalObject,
-            ImportJobJson = JsonSerializer.Serialize(preservationImportJob),
-            OriginalImportJobId = preservationImportJob.Id!,
-        };*/
-
     private DigitalObjectVersion? ToDigitalObjectVersion(ObjectVersion? objectVersion, Uri repositoryUri)
     {
         if (objectVersion == null) return null;

diff --git a/LeedsExperiment/Preservation.API/Models/UriGenerator.cs b/LeedsExperiment/Preservation.API/Models/UriGenerator.cs
@@ -62,6 +62,7 @@ private UriBuilder GetUriBuilderForCurrentHost(string path)
             var baseAddress = preservationSettings.PreservationApiBaseAddress;
             var uriBuilderFromConfig = new UriBuilder(baseAddress.Scheme, baseAddress.Host)
             {
+                Path = path,
                 Port = baseAddress.Port,
             };
 

diff --git a/scripts/upload_s3/main.py b/scripts/upload_s3/main.py
@@ -13,7 +13,8 @@
 @click.option("--folder", default="c:\\temp\\uol\\payloads\\")
 @click.option("--deposit", required=True)
 def handle_request(folder: str, deposit: str):
-    root_key = f"deposits/dev/{deposit}/"
+    # root_key = f"deposits/dev/{deposit}/"
+    root_key = f"preservation_deposits/{deposit}/"
     upload_folder(folder, root_key)