Restored nl.knaw.dans.ingest.core.service.DepositIngestTask#getDoi. F…

…or SWORD-datasets we must always use dansSwordToken when looking up the target of an update-deposit,

both in migration as well when processing SWORD deposits. For the migration of non-SWORD datasets this will not work. There we must use dansBagId. This will only work
for two version-datasets, because it is not possible to find datasets by metadata values from earlier versions.

src/main/java/nl/knaw/dans/ingest/core/service/DepositIngestTask.java

@@ -493,7 +493,11 @@ public OffsetDateTime getCreatedInstant() {
     }
 
     String resolveDoi(Deposit deposit) throws IOException, DataverseException {
-        var items = datasetService.searchDatasets("dansSwordToken", deposit.getVaultMetadata().getSwordToken());
+        return getDoi("dansSwordToken", deposit.getVaultMetadata().getSwordToken());
+    }
+
+    String getDoi(String key, String value) throws IOException, DataverseException {
+        var items = datasetService.searchDatasets(key, value);
 
         if (items.size() != 1) {
             throw new FailedDepositException(deposit, String.format(

src/main/java/nl/knaw/dans/ingest/core/service/DepositMigrationTask.java

@@ -156,5 +156,17 @@ void validateDeposit() {
             );
         }
     }
+
+    @Override
+    String resolveDoi(Deposit deposit) throws IOException, DataverseException {
+        if (deposit.getVaultMetadata().getSwordToken() != null) {
+            // Migration of SWORD datasets
+            return getDoi("dansSwordToken", deposit.getVaultMetadata().getSwordToken());
+        } else {
+            // Migration of other datasets. This will only work if there are two versions, because search only works for the latest version of a dataset,
+            // so dansBagId in earlier versions will not be found.
+            return getDoi("dansBagId", deposit.getIsVersionOf());
+        }
+    }
 }