Mark downloads without preparedIds as PREPARING not RESTORING #40

ral-facilities · Nov 22, 2024 · a53f54e · a53f54e
1 parent 26a5bd2
commit a53f54e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/main/java/org/icatproject/topcat/web/rest/AdminResource.java b/src/main/java/org/icatproject/topcat/web/rest/AdminResource.java
@@ -175,7 +175,12 @@ public Response setDownloadStatus(
             throw new NotFoundException("could not find download");
         }
 
-        download.setStatus(DownloadStatus.valueOf(value));
+        if (download.getPreparedId() == null && value.equals("RESTORING")) {
+            // Queued jobs need to be marked PREPARING first to generate a preparedId before RESTORING
+            download.setStatus(DownloadStatus.PREPARING);
+        } else {
+            download.setStatus(DownloadStatus.valueOf(value));
+        }
         if(value.equals("COMPLETE")){
             download.setCompletedAt(new Date());
         }

diff --git a/src/test/java/org/icatproject/topcat/AdminResourceTest.java b/src/test/java/org/icatproject/topcat/AdminResourceTest.java
@@ -236,6 +236,30 @@ public void testDownloadAPI() throws Exception {
 		downloadRepository.removeDownload(testDownload.getId());
 	}
 
+	@Test
+	public void testSetDownloadStatus() throws Exception {
+		Download testDownload = new Download();
+		String facilityName = "LILS";
+		testDownload.setFacilityName(facilityName);
+		testDownload.setSessionId(adminSessionId);
+		testDownload.setStatus(DownloadStatus.PAUSED);
+		testDownload.setIsDeleted(false);
+		testDownload.setUserName("simple/root");
+		testDownload.setFileName("testFile.txt");
+		testDownload.setTransport("http");
+		downloadRepository.save(testDownload);
+
+		Response response = adminResource.setDownloadStatus(testDownload.getId(), facilityName, adminSessionId, DownloadStatus.RESTORING.toString());
+		assertEquals(200, response.getStatus());
+
+		response = adminResource.getDownloads(facilityName, adminSessionId, "1 = 1");
+		assertEquals(200, response.getStatus());
+		List<Download> downloads = (List<Download>) response.getEntity();
+
+		testDownload = findDownload(downloads, testDownload.getId());
+		assertEquals(DownloadStatus.PREPARING, testDownload.getStatus());
+	}
+
 	@Test
 	public void testSetDownloadTypeStatus() throws Exception {