Implemented setTermsOfAccess and setFileAccessRequest.

src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansBagMappingServiceImpl.java

@@ -132,14 +132,17 @@ public Dataset getDatasetMetadataFromDansDeposit(DansBagDeposit dansDeposit, Dat
             dansDeposit.getHasOrganizationalIdentifier(),
             dansDeposit.getHasOrganizationalIdentifierVersion());
         var version = dataset.getDatasetVersion();
-        version.setFileAccessRequest(dansDeposit.allowAccessRequests());
 
-        // TODO: when processing an update-deposit, retrieve terms of access from the previous version
-        if (!dansDeposit.allowAccessRequests() && StringUtils.isBlank(version.getTermsOfAccess())) {
+        // Allow access requests only if it was not forbidden in previous versions
+        var fileAccessRequest = dansDeposit.allowAccessRequests() && (currentMetadata == null || currentMetadata.getFileAccessRequest());
+        version.setFileAccessRequest(fileAccessRequest);
+        if (StringUtils.isBlank(version.getTermsOfAccess()) && currentMetadata != null) {
+            version.setTermsOfAccess(currentMetadata.getTermsOfAccess());
+        }
+        if (!fileAccessRequest && StringUtils.isBlank(version.getTermsOfAccess())) {
+            // Dataverse requires terms of access to be set if file access requests are disabled, so set it to "N/a" if not explicitly provided
             version.setTermsOfAccess("N/a");
         }
-
-
         version.setLicense(supportedLicenses.getLicenseFromDansDeposit(dansDeposit));
         return dataset;
     }

src/main/java/nl/knaw/dans/dvingest/core/dansbag/SupportedLicenses.java

@@ -30,6 +30,7 @@
 
 import static nl.knaw.dans.dvingest.core.dansbag.xml.XPathConstants.DDM_DCMI_METADATA;
 
+// TODO: move to mapping package
 public class SupportedLicenses {
     private final Map<URI, License> supportedLicenses;
 

src/test/java/nl/knaw/dans/dvingest/core/dansbag/DansBagMappingServiceTest.java

@@ -47,9 +47,4 @@ public void getUpdatesDataset_finds_dataset_for_update_deposit() throws Exceptio
         // When / Then
         assertThat(mappingService.getUpdatesDataset(testDepositDir)).isEqualTo(doi);
     }
-
-
-
-
-
 }

src/test/java/nl/knaw/dans/dvingest/core/dansbag/DansDepositConverterTest.java

@@ -27,6 +27,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+/**
+ * Test class for {@link DansDepositConverter}. It uses the valid examples from the dd-dans-sword2-examples project.
+ */
 public class DansDepositConverterTest extends DansConversionFixture {
 
     private final YamlService yamlService = new YamlServiceImpl();