movements example from sword-examples working correctly.

DANS-KNAW · Dec 9, 2024 · 3aa84dd · 3aa84dd
1 parent 12471a4
commit 3aa84dd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansBagMappingService.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansBagMappingService.java
@@ -34,7 +34,7 @@ public interface DansBagMappingService {
 
     EditFiles getEditFilesFromDansDeposit(DansBagDeposit dansDeposit, String updatesDataset);
 
-    EditPermissions getEditPermissionsFromDansDeposit(DansBagDeposit dansDeposit);
+    EditPermissions getEditPermissionsFromDansDeposit(DansBagDeposit dansDeposit, String updatesDataset);
 
     String packageOriginalMetadata(DansBagDeposit dansDeposit) throws IOException;
 }
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansBagMappingServiceImpl.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansBagMappingServiceImpl.java
@@ -153,14 +153,19 @@ public EditFiles getEditFilesFromDansDeposit(DansBagDeposit dansDeposit, String
     }
 
     @Override
-    public EditPermissions getEditPermissionsFromDansDeposit(DansBagDeposit dansDeposit) {
-        var userId = dansDeposit.getDepositorUserId();
-        var editPermissions = new EditPermissions();
-        var roleAssignment = new RoleAssignment();
-        roleAssignment.setAssignee("@" + userId);
-        roleAssignment.setRole("contributorplus"); // TODO: make this configurable
-        editPermissions.setAddRoleAssignments(List.of(roleAssignment));
-        return editPermissions;
+    public EditPermissions getEditPermissionsFromDansDeposit(DansBagDeposit dansDeposit, String updatesDataset) {
+        if (updatesDataset == null) {
+            var userId = dansDeposit.getDepositorUserId();
+            var editPermissions = new EditPermissions();
+            var roleAssignment = new RoleAssignment();
+            roleAssignment.setAssignee("@" + userId);
+            roleAssignment.setRole("contributorplus"); // TODO: make this configurable
+            editPermissions.setAddRoleAssignments(List.of(roleAssignment));
+            return editPermissions;
+        }
+        else {
+            return new EditPermissions();
+        }
     }
 
     @Override

diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansDepositConverter.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansDepositConverter.java
@@ -41,7 +41,7 @@ public void run() throws IOException {
         var editFiles = mappingService.getEditFilesFromDansDeposit(dansDeposit, updatesDataset);
         yamlService.writeYaml(new EditFilesRoot(editFiles), dansDeposit.getBagDir().resolve("edit-files.yml"));
 
-        var editPermissions = mappingService.getEditPermissionsFromDansDeposit(dansDeposit);
+        var editPermissions = mappingService.getEditPermissionsFromDansDeposit(dansDeposit, updatesDataset);
         yamlService.writeYaml(new EditPermissionsRoot(editPermissions), dansDeposit.getBagDir().resolve("edit-permissions.yml"));
 
         var updateState = new UpdateState();