restore VLT005+VLT006 (mistakenly replaced by VaaS only VLT005A in DA…

…NS-KNAW#95) + cleanup warnings
DANS-KNAW-jp · Jun 27, 2023 · fd10a24 · fd10a24
1 parent 69c0661
commit fd10a24
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 32 deletions.
diff --git a/src/main/java/nl/knaw/dans/ingest/core/service/mapper/DepositToDvDatasetMetadataMapper.java b/src/main/java/nl/knaw/dans/ingest/core/service/mapper/DepositToDvDatasetMetadataMapper.java
@@ -230,16 +230,10 @@ else if (isMigration) {
         }
 
         if (isMigration) {
-            var otherId = getIdentifiers(ddm)
-                .filter(Identifier::hasXsiTypeDoi)
-                .findFirst()
-                .map(Node::getTextContent)
-                .orElse(null);
-
             dataVaultFieldBuilder.addBagId(vaultMetadata.getBagId()); // VLT003A
             dataVaultFieldBuilder.addNbn(vaultMetadata.getNbn()); // VLT004A
-            if (null != otherId) // Vault service only
-                dataVaultFieldBuilder.addDansOtherId(otherId); // VLT005A
+            dataVaultFieldBuilder.addDansOtherId(vaultMetadata.getOtherId()); // VLT005
+            dataVaultFieldBuilder.addDansOtherIdVersion(vaultMetadata.getOtherIdVersion()); // VLT006
             dataVaultFieldBuilder.addSwordToken(vaultMetadata.getSwordToken()); // VLT007
         }
         else {

diff --git a/src/test/java/nl/knaw/dans/ingest/core/service/mapper/DansDataVaultMetadataTest.java b/src/test/java/nl/knaw/dans/ingest/core/service/mapper/DansDataVaultMetadataTest.java
@@ -17,17 +17,12 @@
 
 import nl.knaw.dans.ingest.core.domain.VaultMetadata;
 import org.junit.jupiter.api.Test;
-import org.w3c.dom.Document;
 
 import java.util.Set;
 
-import static nl.knaw.dans.ingest.core.service.mapper.MappingTestHelper.dcmi;
 import static nl.knaw.dans.ingest.core.service.mapper.MappingTestHelper.ddmWithCustomProfileContent;
 import static nl.knaw.dans.ingest.core.service.mapper.MappingTestHelper.getIngestFlowConfig;
 import static nl.knaw.dans.ingest.core.service.mapper.MappingTestHelper.getPrimitiveSingleValueField;
-import static nl.knaw.dans.ingest.core.service.mapper.MappingTestHelper.minimalDdmProfile;
-import static nl.knaw.dans.ingest.core.service.mapper.MappingTestHelper.readDocumentFromString;
-import static nl.knaw.dans.ingest.core.service.mapper.MappingTestHelper.rootAttributes;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class DansDataVaultMetadataTest {
@@ -58,18 +53,4 @@ public void VLT008_dataSupplier_should_default_to_userId() throws Exception {
         assertThat(getPrimitiveSingleValueField("dansDataVaultMetadata", "dansDataSupplier", result))
             .isEqualTo("xxx");
     }
-
-    @Test
-    public void VLT005A_dataSupplier_should_default_to_userId() throws Exception {
-        var vaultMetadata = new VaultMetadata("", "", "", "", "", "", "");
-        String xml
-            = "<ddm:DDM " + rootAttributes + ">"
-            + minimalDdmProfile()
-            + dcmi("<dct:identifier xsi:type='DOI'>10.17026/dans-x3g-jtm3</dct:identifier>")
-            + "</ddm:DDM>";
-        Document ddm = readDocumentFromString(xml);
-        var result = mapper.toDataverseDataset(ddm, null, null, null, vaultMetadata, false, null);
-        assertThat(getPrimitiveSingleValueField("dansDataVaultMetadata", "dansOtherId", result))
-            .isEqualTo("10.17026/dans-x3g-jtm3");
-    }
 }
diff --git a/...st/java/nl/knaw/dans/ingest/core/service/mapper/DepositToDvDatasetMetadataMapperTest.java b/...st/java/nl/knaw/dans/ingest/core/service/mapper/DepositToDvDatasetMetadataMapperTest.java
@@ -95,7 +95,7 @@ void to_dataverse_dataset() throws Exception {
     }
 
     @Test
-    void toDataverseDataset_should_include_otherId_from_ddm() throws Exception {
+    void toDataverseDataset_should_include_otherId_from_vault_metadata() throws Exception {
         var mapper = getMigrationMapper();
         var doc = readDocument("dataset-simple-with-doi.xml");
 
@@ -107,8 +107,8 @@ void toDataverseDataset_should_include_otherId_from_ddm() throws Exception {
             .withDefaultPrettyPrinter()
             .writeValueAsString(result);
 
-        assertThat(str).doesNotContain("doi:a/b");
-        assertThat(str).contains("10.17026/easy-dans-doi");
+        assertThat(str).contains("doi:a/b");
+        assertThat(str).doesNotContain("10.17026/easy-dans-doi");
     }
 
     @Test
@@ -158,7 +158,7 @@ void test_get_acquisition_methods() throws Exception {
     }
 
     @Test
-    void processMetadataBlock_should_deduplicate_items_for_PrimitiveFieldBuilder() throws Exception {
+    void processMetadataBlock_should_deduplicate_items_for_PrimitiveFieldBuilder() {
         var mapper = new DepositToDvDatasetMetadataMapper(true, Set.of("citation"), iso1ToDataverseLanguage, iso2ToDataverseLanguage, spatialCoverageCountryTerms, userMap, true);
         var fields = new HashMap<String, MetadataBlock>();
         var builder = new ArchaeologyFieldBuilder();
@@ -178,7 +178,7 @@ void processMetadataBlock_should_deduplicate_items_for_PrimitiveFieldBuilder() t
     }
 
     @Test
-    void processMetadataBlock_should_deduplicate_items_for_CompoundFieldBuilder() throws Exception {
+    void processMetadataBlock_should_deduplicate_items_for_CompoundFieldBuilder() {
         var fields = new HashMap<String, MetadataBlock>();
         var mapper = new DepositToDvDatasetMetadataMapper(true, Set.of("citation"), iso1ToDataverseLanguage, iso2ToDataverseLanguage, spatialCoverageCountryTerms, userMap, true);
         var builder = new ArchaeologyFieldBuilder();

diff --git a/src/test/java/nl/knaw/dans/ingest/core/service/mapper/SwordExamplesTest.java b/src/test/java/nl/knaw/dans/ingest/core/service/mapper/SwordExamplesTest.java
@@ -96,6 +96,8 @@ public void all_mappings_produces_most_documented_sub_fields() throws Exception
             // VLT001-2 dansDataversePid(version) generated by dataverse
             "dansBagId", // VLT003A
             "dansNbn", // VLT004A
+            "dansOtherId", // VLT005
+            "dansOtherIdVersion", // VLT006
             "dansSwordToken", // VLT007
             "dansDataSupplier"); // VLT008
         // TODO terms / restricted files // TRMnnn