From 2f8a81d9095093f091f82633bec0152f68323408 Mon Sep 17 00:00:00 2001
From: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com>
Date: Wed, 15 Nov 2023 12:55:58 +0100
Subject: [PATCH] ufal/be-cannot-download-and-preview-files-after-migration
 (#454)

* Find bitstream format using mimetype not ID.

* Updated tests according to fix.
---
 .../rest/ClarinBitstreamImportController.java |  7 +++--
 .../ClarinBitstreamImportControllerIT.java    | 26 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinBitstreamImportController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinBitstreamImportController.java
index 97ac1494d160..63380a756c2f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinBitstreamImportController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinBitstreamImportController.java
@@ -127,11 +127,10 @@ public BitstreamRest importBitstreamForExistingFile(HttpServletRequest request)
                 log.info("SequenceId is null. Bitstream UUID: " + bitstream.getID());
             }
             //add bitstream format
-            String bitstreamFormatIdString = request.getParameter("bitstreamFormat");
-            Integer bitstreamFormatId = getIntegerFromString(bitstreamFormatIdString);
+            String bitstreamFormatMimeType = request.getParameter("bitstreamFormat");
             BitstreamFormat bitstreamFormat = null;
-            if (!Objects.isNull(bitstreamFormatId)) {
-                bitstreamFormat = bitstreamFormatService.find(context, bitstreamFormatId);
+            if (StringUtils.isNotBlank(bitstreamFormatMimeType)) {
+                bitstreamFormat = bitstreamFormatService.findByMIMEType(context, bitstreamFormatMimeType);
             }
             bitstream.setFormat(context, bitstreamFormat);
             String deletedString = request.getParameter("deleted");
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ClarinBitstreamImportControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ClarinBitstreamImportControllerIT.java
index e16260565dc4..9e0c0f339a7c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ClarinBitstreamImportControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ClarinBitstreamImportControllerIT.java
@@ -95,7 +95,7 @@ public void setup() throws Exception {
                 .withName("TESTINGBUNDLE")
                 .build();
         token = getAuthToken(admin.getEmail(), password);
-        bitstreamFormat = BitstreamFormatBuilder.createBitstreamFormat(context).build();
+        bitstreamFormat = BitstreamFormatBuilder.createBitstreamFormat(context).withMimeType("application/pdf").build();
         String input = "Hello, World!";
         MockMultipartFile file = new MockMultipartFile("file", "hello.txt",
                 MediaType.TEXT_PLAIN_VALUE,
@@ -147,7 +147,7 @@ public void importBitstreamForExistingFileWithBundleTest() throws Exception {
                         .contentType(contentType)
                         .param("internal_id", internalId)
                         .param("storeNumber", Integer.toString(storeNumber))
-                        .param("bitstreamFormat", Integer.toString(bitstreamFormat.getID()))
+                        .param("bitstreamFormat", bitstreamFormat.getMIMEType())
                         .param("deleted", Boolean.toString(deleted))
                         .param("sequenceId", Integer.toString(sequence))
                         .param("primaryBundle_id", "")
@@ -156,8 +156,8 @@ public void importBitstreamForExistingFileWithBundleTest() throws Exception {
                         .andReturn().getResponse().getContentAsString(),
                 "$.id"));
 
-        checkCreatedBitstream(uuid, internalId, storeNumber, bitstreamFormat.getID(), sequence, deleted, sizeBytes,
-                checkSum);
+        checkCreatedBitstream(uuid, internalId, storeNumber, bitstreamFormat.getMIMEType(), sequence, deleted,
+                sizeBytes, checkSum);
 
         //clean all
         context.turnOffAuthorisationSystem();
@@ -182,7 +182,7 @@ public void importBitstreamForExistingFileWithoutBundleTest() throws Exception {
                                 .contentType(contentType)
                                 .param("internal_id", internalId)
                                 .param("storeNumber", Integer.toString(storeNumber))
-                                .param("bitstreamFormat", Integer.toString(bitstreamFormat.getID()))
+                                .param("bitstreamFormat", bitstreamFormat.getMIMEType())
                                 .param("deleted", Boolean.toString(deleted))
                                 .param("sequenceId", Integer.toString(sequence))
                                 .param("primaryBundle_id", "")
@@ -191,8 +191,8 @@ public void importBitstreamForExistingFileWithoutBundleTest() throws Exception {
                         .andReturn().getResponse().getContentAsString(),
                 "$.id"));
 
-        checkCreatedBitstream(uuid, internalId, storeNumber, bitstreamFormat.getID(), sequence, deleted, sizeBytes,
-                checkSum);
+        checkCreatedBitstream(uuid, internalId, storeNumber, bitstreamFormat.getMIMEType(), sequence, deleted,
+                sizeBytes, checkSum);
 
         //clean all
         context.turnOffAuthorisationSystem();
@@ -217,7 +217,7 @@ public void importBitstreamForExistingFileAsPrimaryBitstreamOfBundleTest() throw
                                 .contentType(contentType)
                                 .param("internal_id", internalId)
                                 .param("storeNumber", Integer.toString(storeNumber))
-                                .param("bitstreamFormat", Integer.toString(bitstreamFormat.getID()))
+                                .param("bitstreamFormat", bitstreamFormat.getMIMEType())
                                 .param("deleted", Boolean.toString(deleted))
                                 .param("sequenceId", Integer.toString(sequence))
                                 .param("primaryBundle_id", bundle.getID().toString())
@@ -226,8 +226,8 @@ public void importBitstreamForExistingFileAsPrimaryBitstreamOfBundleTest() throw
                         .andReturn().getResponse().getContentAsString(),
                 "$.id"));
 
-        checkCreatedBitstream(uuid, internalId, storeNumber, bitstreamFormat.getID(), sequence, deleted, sizeBytes,
-                checkSum);
+        checkCreatedBitstream(uuid, internalId, storeNumber, bitstreamFormat.getMIMEType(), sequence, deleted,
+                sizeBytes, checkSum);
         bundle = bundleService.find(context, bundle.getID());
         assertEquals(bundle.getPrimaryBitstream().getID(), bitstream.getID());
 
@@ -257,7 +257,7 @@ public void importBitstreamForExistingFileValidationErrorTest() throws Exception
                         .contentType(contentType)
                         .param("internal_id", internalId)
                         .param("storeNumber", Integer.toString(storeNumber))
-                        .param("bitstreamFormat", Integer.toString(bitstreamFormat.getID()))
+                        .param("bitstreamFormat", bitstreamFormat.getMIMEType())
                         .param("deleted", Boolean.toString(deleted))
                         .param("sequenceId", Integer.toString(sequence))
                         .param("primaryBundle_id", "")
@@ -271,12 +271,12 @@ public void importBitstreamForExistingFileValidationErrorTest() throws Exception
     }
 
     private void checkCreatedBitstream(UUID uuid, String internalId, int storeNumber,
-                                       Integer bitstreamFormat, int sequence, boolean deleted, long sizeBytes,
+                                       String bitstreamFormat, int sequence, boolean deleted, long sizeBytes,
                                        String checkSum) throws SQLException {
         bitstream = bitstreamService.find(context, uuid);
         assertEquals(bitstream.getChecksum(), checkSum);
         assertEquals(bitstream.getSizeBytes(), sizeBytes);
-        assertEquals(bitstream.getFormat(context).getID(), bitstreamFormat);
+        assertEquals(bitstream.getFormat(context).getMIMEType(), bitstreamFormat);
         assertEquals(bitstream.getInternalId(), internalId);
         assertEquals(bitstream.getStoreNumber(), storeNumber);
         assertEquals(bitstream.getSequenceID(), sequence);