Ensure Bitstream access conditions appear after replacing

Author: ybnd

dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemRestRepository.java

@@ -188,8 +188,10 @@ public WorkspaceItemRest upload(HttpServletRequest request, String apiCategory,
         WorkspaceItem source = wis.find(context, id);
         List<ErrorRest> errors = submissionService.uploadFileToInprogressSubmission(context, request, wsi, source,
                 file);
+
+        // Commit & reload before converting to REST to ensure that Bitstream access conditions are taken into account
         context.commit();
-        context.reloadEntity(source);
+        source = context.reloadEntity(source);
         wsi = converter.toRest(source, utils.obtainProjection());
 
         if (!errors.isEmpty()) {

dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java

@@ -10789,12 +10789,12 @@ public void enforceRequiredRelationTiltedLeftTest() throws Exception {
             .andExpect(status().isUnprocessableEntity());
     }
 
-        @Test
+    @Test
     public void uploadAndReplaceTest() throws Exception {
         context.turnOffAuthorisationSystem();
-            configurationService.setProperty("replace-bitstream.enabled", true);
+        configurationService.setProperty("replace-bitstream.enabled", true);
 
-            parentCommunity = CommunityBuilder.createCommunity(context)
+        parentCommunity = CommunityBuilder.createCommunity(context)
             .withName("Parent Community")
             .build();
         Collection collection = CollectionBuilder.createCollection(context, parentCommunity)
@@ -10813,13 +10813,26 @@ public void uploadAndReplaceTest() throws Exception {
                 .withMimeType("text/plain")
                 .build();
         }
+        // Set access conditions on the old file; they should be copied to the new one
+        LocalDate startDate = LocalDate.now();
+        DateTimeFormatter dateFmt = DateTimeFormatter.ISO_LOCAL_DATE;
+        String startDateStr = dateFmt.format(LocalDate.now());
+
+        ResourcePolicyBuilder.createResourcePolicy(context, null, anonymousGroup)
+                             .withDspaceObject(originalBitstream)
+                             .withAction(Constants.READ)
+                             .withPolicyType(TYPE_CUSTOM)
+                             .withName("embargo")
+                             .withStartDate(startDate);
         InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
         final MockMultipartFile newFile =
             new MockMultipartFile("file", "/local/path/simple-article.pdf", "application/pdf", pdf);
 
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
+
+
         // Upload new file, to replace old one
         getClient(token).perform(multipart("/api/submission/workspaceitems/" + workspaceItem.getID())
                 .file(newFile)
@@ -10833,14 +10846,20 @@ public void uploadAndReplaceTest() throws Exception {
             .andExpect(jsonPath("$.sections.upload.files[0].metadata['dspace.bitstream.isReplacementOf'][0].authority",
                     is(originalBitstream.getID().toString())))
             .andExpect(jsonPath("$.sections.upload.files[0].metadata['dc.source'][0].value",
-                is("/local/path/simple-article.pdf")));
-        // Check new file metadata
+                is("/local/path/simple-article.pdf")))
+            .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].name", is("embargo")))
+            .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].startDate", is(startDateStr)))
+            .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].endDate", nullValue()));
+        // Check new file metadata and access conditions
         getClient(token).perform(get("/api/submission/workspaceitems/" + workspaceItem.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$.sections.upload.files[0].metadata['dc.title'][0].value",
                 is("simple-article.pdf")))
             .andExpect(jsonPath("$.sections.upload.files[0].metadata['dc.source'][0].value",
-                is("/local/path/simple-article.pdf")));
+                is("/local/path/simple-article.pdf")))
+            .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].name", is("embargo")))
+            .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].startDate", is(startDateStr)))
+            .andExpect(jsonPath("$.sections.upload.files[0].accessConditions[0].endDate", nullValue()));
         originalBitstream = bitstreamService.find(context, originalBitstream.getID());
         List<MetadataValue> originalMetadata = bitstreamService.getMetadata(originalBitstream, DSPACE,
                 BITSTREAM, IS_REPLACED_BY, null);