UFAL/Issue 1313: fixed error when file preview is not generated for bitstream with store_number = 77 (ufal#1318) (#1240)

* Issue ufal#1313: fixed error when file preview is not generated for bitstream with store number = 77

* resolve MR comments

(cherry picked from commit 04d64f7)

Co-authored-by: Milan Kuchtiak <kuchtiak@ufal.mff.cuni.cz>

Author: kosarko

dspace-api/src/main/java/org/dspace/storage/bitstore/SyncBitstreamStorageServiceImpl.java

@@ -7,6 +7,7 @@
  */
 package org.dspace.storage.bitstore;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
@@ -185,12 +186,17 @@ public Map computeChecksumSpecStore(Context context, Bitstream bitstream, int st
     }
 
     @Override
-    public InputStream retrieve(Context context, Bitstream bitstream)
-            throws SQLException, IOException {
+    public InputStream retrieve(Context context, Bitstream bitstream) throws SQLException, IOException {
         int storeNumber = this.whichStoreNumber(bitstream);
         return this.getStore(storeNumber).get(bitstream);
     }
 
+    @Override
+    public File retrieveFile(Context context, Bitstream bitstream) throws IOException {
+        int storeNumber = whichStoreNumber(bitstream);
+        return this.getStore(storeNumber).getFile(bitstream);
+    }
+
     @Override
     public void cleanup(boolean deleteDbRecords, boolean verbose) throws SQLException, IOException, AuthorizeException {
         Context context = new Context(Context.Mode.BATCH_EDIT);

dspace-api/src/test/java/org/dspace/builder/WorkspaceItemBuilder.java

@@ -249,6 +249,29 @@ public WorkspaceItemBuilder withFulltext(String name, String source, InputStream
         return this;
     }
 
+    /**
+     * Add bitstream with specific store number.
+     *
+     * @param name          bitstream name
+     * @param source        bitstream test source location
+     * @param is            input stream of the bitstream
+     * @param storeNumber   store number
+     *
+     * @return this WorkspaceItemBuilder
+     */
+    public WorkspaceItemBuilder withBitstream(String name, String source, InputStream is, int storeNumber) {
+        try {
+            Item item = workspaceItem.getItem();
+            Bitstream b = itemService.createSingleBitstream(context, is, item);
+            b.setStoreNumber(storeNumber);
+            b.setName(context, name);
+            b.setSource(context, source);
+        } catch (Exception e) {
+            handleException(e);
+        }
+        return this;
+    }
+
     /**
      * Create workspaceItem with any metadata
      * @param schema metadataSchema name e.g. `dc`

dspace-api/src/test/java/org/dspace/scripts/filepreview/FilePreviewIT.java

@@ -13,6 +13,8 @@
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasSize;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.InputStream;
 import java.sql.SQLException;
@@ -36,7 +38,11 @@
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.content.service.BitstreamService;
+import org.dspace.content.service.PreviewContentService;
 import org.dspace.eperson.EPerson;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.storage.bitstore.SyncBitstreamStorageServiceImpl;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -45,10 +51,14 @@
  * @author Milan Majchrak (milan.majchrak at dataquest.sk)
  */
 public class FilePreviewIT extends AbstractIntegrationTestWithDatabase {
-    BitstreamService bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
+    private static final int SYNC_STORE_NUMBER = SyncBitstreamStorageServiceImpl.SYNCHRONIZED_STORES_NUMBER;
 
+    BitstreamService bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
     BitstreamFormatService bitstreamFormatService = ContentServiceFactory.getInstance().getBitstreamFormatService();
+    PreviewContentService previewContentService = ContentServiceFactory.getInstance().getPreviewContentService();
+    ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
 
+    Collection collection;
     Item item;
     EPerson eperson;
     String PASSWORD = "test";
@@ -61,7 +71,7 @@ public void setup() throws SQLException, AuthorizeException {
         eperson = EPersonBuilder.createEPerson(context)
                 .withEmail("test@test.edu").withPassword(PASSWORD).build();
         Community community = CommunityBuilder.createCommunity(context).withName("Com").build();
-        Collection collection = CollectionBuilder.createCollection(context, community).withName("Col").build();
+        collection = CollectionBuilder.createCollection(context, community).withName("Col").build();
         WorkspaceItem wItem = WorkspaceItemBuilder.createWorkspaceItem(context, collection)
                 .withFulltext("preview-file-test.zip", "/local/path/preview-file-test.zip", previewZipIs)
                 .build();
@@ -116,22 +126,45 @@ public void testWhenNoFilesRun() throws Exception {
     @Test
     public void testForSpecificItem() throws Exception {
         // Run the script
-        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
-        String[] args = new String[] { "file-preview", "-u", item.getID().toString(),
-                "-e", eperson.getEmail(), "-p",  PASSWORD};
-        int run = ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl),
-                testDSpaceRunnableHandler, kernelImpl);
-        assertEquals(0, run);
-        // There should be no errors or warnings
-        checkNoError(testDSpaceRunnableHandler);
+        runScriptForItemWithBitstreams(item);
+    }
 
-        // There should be an info message about generating the file previews for the specified item
-        List<String> messages = testDSpaceRunnableHandler.getInfoMessages();
-        assertThat(messages, hasSize(2));
-        assertThat(messages, hasItem(containsString("Generate the file previews for the specified item with " +
-                "the given UUID: " + item.getID())));
-        assertThat(messages,
-                hasItem(containsString("Authentication by user: " + eperson.getEmail())));
+    @Test
+    public void testPreviewWithSyncStorage() throws Exception {
+        configurationService.setProperty("sync.storage.service.enabled", true);
+
+        context.turnOffAuthorisationSystem();
+
+        WorkspaceItem wItem2;
+        try (InputStream tgzFile = getClass().getResourceAsStream("logos.tgz")) {
+            wItem2 = WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                    .withBitstream("logos.tgz", "/local/path/logos.tgz", tgzFile, SYNC_STORE_NUMBER)
+                    .build();
+        }
+
+        context.restoreAuthSystemState();
+
+        // Get the item and its bitstream
+        Item item2 = wItem2.getItem();
+        List<Bundle> bundles = item2.getBundles();
+        Bitstream bitstream2 = bundles.get(0).getBitstreams().get(0);
+
+        // Set the bitstream format to application/zip
+        BitstreamFormat bitstreamFormat = bitstreamFormatService.findByMIMEType(context, "application/x-gtar");
+        bitstream2.setFormat(context, bitstreamFormat);
+        bitstreamService.update(context, bitstream2);
+        context.commit();
+        context.reloadEntity(bitstream2);
+        context.reloadEntity(item2);
+
+        runScriptForItemWithBitstreams(item2);
+
+        Bitstream b2 = bitstreamService.findAll(context).stream()
+                .filter(b -> b.getStoreNumber() == SYNC_STORE_NUMBER)
+                .findFirst().orElse(null);
+
+        assertNotNull(b2);
+        assertTrue("Expects preview content created and stored.", previewContentService.hasPreview(context, b2));
     }
 
     @Test
@@ -150,4 +183,24 @@ private void checkNoError(TestDSpaceRunnableHandler testDSpaceRunnableHandler) {
         assertThat(testDSpaceRunnableHandler.getErrorMessages(), empty());
         assertThat(testDSpaceRunnableHandler.getWarningMessages(), empty());
     }
+
+    private void runScriptForItemWithBitstreams(Item item) throws Exception {
+        // Run the script
+        TestDSpaceRunnableHandler testDSpaceRunnableHandler = new TestDSpaceRunnableHandler();
+        String[] args = new String[] { "file-preview", "-u", item.getID().toString(),
+                "-e", eperson.getEmail(), "-p",  PASSWORD};
+        int run = ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl),
+                testDSpaceRunnableHandler, kernelImpl);
+        assertEquals(0, run);
+        // There should be no errors or warnings
+        checkNoError(testDSpaceRunnableHandler);
+
+        // There should be an info message about generating the file previews for the specified item
+        List<String> messages = testDSpaceRunnableHandler.getInfoMessages();
+        assertThat(messages, hasSize(2));
+        assertThat(messages, hasItem(containsString("Generate the file previews for the specified item with " +
+                "the given UUID: " + item.getID())));
+        assertThat(messages,
+                hasItem(containsString("Authentication by user: " + eperson.getEmail())));
+    }
 }