Change submission upload replaceFile parameter to UUID

This synchronizes the /workspaceitems with the /edititems, where we don't have a clear file order

Author: ybnd

dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/SubmissionService.java

@@ -376,7 +376,7 @@ public DataDuplicateDetection getDataDuplicateDetection(Context context, InProgr
      * Utility method used by the {@link WorkspaceItemRestRepository} and
      * {@link WorkflowItemRestRepository} to deal with the upload in an inprogress
      * submission
-     * 
+     *
      * @param context DSpace Context Object
      * @param request the http request containing the upload request
      * @param wsi     the inprogress submission current rest representation
@@ -424,7 +424,7 @@ public List<ErrorRest> uploadFileToInprogressSubmission(Context context, HttpSer
             UploadableStep uploadableStep = (UploadableStep) stepInstanceAndCfg[0];
             Bitstream originalFile = null;
             if (uploadableStep instanceof UploadStep) {
-                originalFile = findOriginalFile(request, (UploadStep) uploadableStep, source);
+                originalFile = findOriginalFile(request);
             }
             Bitstream newFile;
             ErrorRest err;
@@ -459,7 +459,7 @@ public List<ErrorRest> uploadFileToInprogressSubmission(Context context, HttpSer
      * Utility method used by the {@link WorkspaceItemRestRepository} and
      * {@link WorkflowItemRestRepository} to deal with the patch of an inprogress
      * submission
-     * 
+     *
      * @param context DSpace Context Object
      * @param request the http request
      * @param source  the current inprogress submission
@@ -538,27 +538,15 @@ public void evaluatePatchToInprogressSubmission(Context context, HttpServletRequ
     }
 
     /**
-     * If {@code request} has parameter 'replaceFile', returns the file at index 'replaceFile'
-     * from the list of uploaded files in {@code submission}.
+     * If {@code request} has parameter 'replaceFile', interpret it as a Bitstream UUID
      * Otherwise, returns null.
      */
-    private Bitstream findOriginalFile(HttpServletRequest request, UploadStep uploadStep,
-                                       InProgressSubmission submission) throws SQLException {
+    private Bitstream findOriginalFile(HttpServletRequest request) throws SQLException {
         String replaceFile = request.getParameter("replaceFile");
         if (replaceFile == null) {
             return null;
         }
-        int originalFileIndex;
-        try {
-            originalFileIndex = Integer.parseInt(replaceFile);
-        } catch (NumberFormatException e) {
-            throw new DSpaceBadRequestException(e.getMessage(), e);
-        }
-        List<UploadBitstreamRest> files = uploadStep.getData(this, submission, null).getFiles();
-        if (originalFileIndex < 0 || originalFileIndex >= files.size()) {
-            throw new DSpaceBadRequestException("Provided file index is out of bounds");
-        }
-        UUID uuid = files.get(originalFileIndex).getUuid();
+        UUID uuid = UUID.fromString(replaceFile);
         return bitstreamService.find(new Context(), uuid);
     }
 

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

@@ -10820,11 +10820,10 @@ public void uploadAndReplaceTest() throws Exception {
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
-        int oldFileIndex = 0;
         // Upload new file, to replace old one
         getClient(token).perform(multipart("/api/submission/workspaceitems/" + workspaceItem.getID())
                 .file(newFile)
-                .param("replaceFile", Integer.toString(oldFileIndex))
+                .param("replaceFile", originalBitstream.getID().toString())
                 .param("replaceName", "true"))
             .andExpect(status().isCreated())
             .andExpect(jsonPath("$.sections.upload.files[0].metadata['dc.title'][0].value",
@@ -10890,16 +10889,10 @@ public void uploadAndReplaceBadParamTest() throws Exception {
                 .file(newFile)
                 .param("replaceFile", bitstream.getName()))
             .andExpect(status().isBadRequest());
-        // UUID is not supported
-        getClient(token).perform(multipart("/api/submission/workspaceitems/" + workspaceItem.getID())
-                .file(newFile)
-                .param("replaceFile", bitstream.getID().toString()))
-            .andExpect(status().isBadRequest());
-        // Parameter cannot be out of bounds
-        int fileIndexOutOfBounds = 1;
+        // Integer is not supported
         getClient(token).perform(multipart("/api/submission/workspaceitems/" + workspaceItem.getID())
                 .file(newFile)
-                .param("replaceFile", Integer.toString(fileIndexOutOfBounds)))
+                .param("replaceFile", "0"))
             .andExpect(status().isBadRequest());
     }
 
@@ -10955,8 +10948,9 @@ public void uploadAndReplaceForbiddenTest() throws Exception {
             .withIssueDate("2017-10-17")
             .build();
         // Create file that will be replaced
+        Bitstream originalFile;
         try (InputStream is = IOUtils.toInputStream("Test", CharEncoding.UTF_8)) {
-            BitstreamBuilder.createBitstream(context, workspaceItem.getItem(), is)
+            originalFile = BitstreamBuilder.createBitstream(context, workspaceItem.getItem(), is)
                 .withName("Bitstream")
                 .withDescription("description")
                 .withMimeType("text/plain")
@@ -10969,11 +10963,10 @@ public void uploadAndReplaceForbiddenTest() throws Exception {
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
-        int oldFileIndex = 0;
         // Upload new file, to replace old one
         getClient(token).perform(multipart("/api/submission/workspaceitems/" + workspaceItem.getID())
                 .file(newFile)
-                .param("replaceFile", Integer.toString(oldFileIndex)))
+                .param("replaceFile", originalFile.getID().toString()))
             .andExpect(status().isForbidden());
     }
 
@@ -11009,11 +11002,10 @@ public void uploadAndReplaceNoWriteRightsTest() throws Exception {
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
-        int oldFileIndex = 0;
         // Upload new file, to replace old one
         getClient(token).perform(multipart("/api/submission/workspaceitems/" + workspaceItem.getID())
                 .file(newFile)
-                .param("replaceFile", Integer.toString(oldFileIndex)))
+                .param("replaceFile", originalFile.getID().toString()))
             .andExpect(status().isForbidden());
     }