Adapting HarvestingClient and tests

DANS-KNAW · Dec 13, 2024 · 0c7aeb4 · 0c7aeb4
1 parent d483ae2
commit 0c7aeb4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClient.java b/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClient.java
@@ -297,7 +297,7 @@ public ClientHarvestRun getLastSuccessfulRun() {
         int i = harvestHistory.size() - 1;
 
         while (i > -1) {
-            if (harvestHistory.get(i).isCompleted()) {
+            if (harvestHistory.get(i).isCompleted() || harvestHistory.get(i).isCompletedWithFailures()) {
                 return harvestHistory.get(i);
             }
             i--;
@@ -314,7 +314,7 @@ ClientHarvestRun getLastNonEmptyRun() {
         int i = harvestHistory.size() - 1;
 
         while (i > -1) {
-            if (harvestHistory.get(i).isCompleted()) {
+            if (harvestHistory.get(i).isCompleted() || harvestHistory.get(i).isCompletedWithFailures()) {
                 if (harvestHistory.get(i).getHarvestedDatasetCount().longValue() > 0 ||
                     harvestHistory.get(i).getDeletedDatasetCount().longValue() > 0) {
                     return harvestHistory.get(i);

diff --git a/src/test/java/edu/harvard/iq/dataverse/api/HarvestingClientsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/HarvestingClientsIT.java
@@ -268,7 +268,7 @@ private void harvestingClientRun(boolean allowHarvestingMissingCVV)  throws Inte
                 assertEquals("inActive", clientStatus, "Unexpected client status: "+clientStatus);
 
                 // b) Confirm that it has actually succeeded:
-                assertEquals("SUCCESS", responseJsonPath.getString("data.lastResult"), "Last harvest not reported a success (took "+i+" seconds)");
+                assertTrue(responseJsonPath.getString("data.lastResult").contains("Completed"), "Last harvest not reported a success (took "+i+" seconds)");
                 String harvestTimeStamp = responseJsonPath.getString("data.lastHarvest");
                 assertNotNull(harvestTimeStamp); 
 
@@ -288,6 +288,8 @@ private void harvestingClientRun(boolean allowHarvestingMissingCVV)  throws Inte
 
         // Let's give the asynchronous indexing an extra sec. to finish:
         Thread.sleep(1000L); 
+        // Requires the index-harvested-metadata-source Flag feature to be enabled to search on the nickName
+        // Otherwise, the search must be performed with metadataSource:Harvested
         Response searchHarvestedDatasets = UtilIT.search("metadataSource:" + nickName, normalUserAPIKey);
         searchHarvestedDatasets.then().assertThat().statusCode(OK.getStatusCode());
         searchHarvestedDatasets.prettyPrint();