refactor method called for newly uploaded chemical file from GalleryController into RSChemElementManager, then call it on file upload through FilesApiController

Author: mKowalski256

src/main/java/com/researchspace/api/v1/controller/FilesApiController.java

@@ -8,6 +8,7 @@
 import com.researchspace.core.util.ISearchResults;
 import com.researchspace.core.util.MediaUtils;
 import com.researchspace.files.service.FileStore;
+import com.researchspace.model.EcatChemistryFile;
 import com.researchspace.model.EcatImage;
 import com.researchspace.model.EcatMediaFile;
 import com.researchspace.model.FileProperty;
@@ -21,6 +22,7 @@
 import com.researchspace.model.record.Folder;
 import com.researchspace.service.FolderManager;
 import com.researchspace.service.MediaManager;
+import com.researchspace.service.RSChemElementManager;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -51,6 +53,7 @@ public class FilesApiController extends BaseApiController implements FilesApi {
   private @Autowired @Qualifier("compositeFileStore") FileStore fileStore;
   private @Autowired FilesAPIHandler fileHandler;
   private @Autowired MediaManager mediaMgr;
+  private @Autowired RSChemElementManager rsChemElementManager;
   private @Autowired FolderManager folderMgr;
   private @Autowired ApiAccountInitialiser contentInit;
   private @Autowired IPermissionUtils permUtils;
@@ -161,6 +164,10 @@ public ApiFile uploadFiles(
     if (emf.isImage() && originalImageId != null) {
       mediaMgr.saveOriginalImageLink((EcatImage) emf, originalImageId, user);
     }
+    if (emf.isChemistryFile()) {
+      rsChemElementManager.generateRsChemElementForNewlyUploadedChemistryFile(
+          (EcatChemistryFile) emf, user);
+    }
     ApiFile apiFile = new ApiFile(emf);
     addFileLink(apiFile);
     return apiFile;

src/main/java/com/researchspace/service/RSChemElementManager.java

@@ -2,6 +2,7 @@
 
 import com.researchspace.model.ChemSearchedItem;
 import com.researchspace.model.EcatChemistryFile;
+import com.researchspace.model.EcatMediaFile;
 import com.researchspace.model.FileProperty;
 import com.researchspace.model.RSChemElement;
 import com.researchspace.model.User;
@@ -177,15 +178,8 @@ List<RSChemElement> updateChemImages(
    */
   List<RSChemElement> getAllRSChemElementsByField(Long fieldId, User user);
 
-  /**
-   * Generate the byte representation of the given {@link RSChemElement} in the given format format
-   * is currently limited to either PNG or JPEG export with a specified size (width x height)
-   *
-   * @param format the ChemicalExportFormat to generate the bytes with
-   * @param rsChemElement the {@link RSChemElement} to generate the bytes of
-   * @return the byte array representation of the rschemelement
-   */
-  RSChemElement generateRsChemExportBytes(ChemicalExportFormat format, RSChemElement rsChemElement);
+  void generateRsChemElementForNewlyUploadedChemistryFile(EcatChemistryFile media,
+      User subject) throws IOException;
 
   /**
    * Get a list of the file extensions supported by the chemistry provider

src/main/java/com/researchspace/service/impl/RSChemElementManagerImpl.java

@@ -504,7 +504,38 @@ public List<RSChemElement> getAllRSChemElementsByField(Long fieldId, User user)
   }
 
   @Override
-  public RSChemElement generateRsChemExportBytes(
+  public void generateRsChemElementForNewlyUploadedChemistryFile(EcatChemistryFile chemFile,
+      User subject) throws IOException {
+
+    // Create Basic Chem Element in order for searching of gallery files to work
+    RSChemElement rsChemElement =
+        RSChemElement.builder()
+            .chemElements(
+                chemistryProvider.convert(chemFile.getChemString()))
+            .chemElementsFormat(ChemElementsFormat.MRV)
+            .ecatChemFileId(chemFile.getId())
+            .build();
+
+    ChemicalExportFormat format =
+        ChemicalExportFormat.builder()
+            .exportType(ChemicalExportType.PNG)
+            .height(1000)
+            .width(1000)
+            .build();
+    generateRsChemExportBytes(format, rsChemElement);
+    saveChemImagePng(
+        rsChemElement, new ByteArrayInputStream(rsChemElement.getDataImage()), subject);
+  }
+
+  /**
+   * Generate the byte representation of the given {@link RSChemElement} in the given format format
+   * is currently limited to either PNG or JPEG export with a specified size (width x height)
+   *
+   * @param format the ChemicalExportFormat to generate the bytes with
+   * @param rsChemElement the {@link RSChemElement} to generate the bytes of
+   * @return the byte array representation of the rschemelement
+   */
+  private RSChemElement generateRsChemExportBytes(
       ChemicalExportFormat format, RSChemElement rsChemElement) {
     byte[] image = chemistryProvider.exportToImage(rsChemElement.getChemElements(), format);
     rsChemElement.setDataImage(image);

src/main/java/com/researchspace/webapp/controller/GalleryController.java

@@ -97,7 +97,6 @@ public class GalleryController extends BaseController {
   private @Autowired MediaManager mediaManager;
   private @Autowired DetailedRecordInformationProvider infoProvider;
   private @Autowired RSChemElementManager rsChemElementManager;
-  private @Autowired ChemistryProvider chemistryProvider;
   @Autowired private SystemPropertyPermissionManager systemPropertyPermissionManager;
 
   /**
@@ -419,24 +418,8 @@ private AjaxReturnObject<RecordInformation> saveMediaFile(
               "",
               subject);
       if (media.isChemistryFile() && fieldId == null && mediaFileId == null) {
-        // Create Basic Chem Element in order for searching of gallery files to work
-        RSChemElement rsChemElement =
-            RSChemElement.builder()
-                .chemElements(
-                    chemistryProvider.convert(((EcatChemistryFile) media).getChemString()))
-                .chemElementsFormat(ChemElementsFormat.MRV)
-                .ecatChemFileId(media.getId())
-                .build();
-
-        ChemicalExportFormat format =
-            ChemicalExportFormat.builder()
-                .exportType(ChemicalExportType.PNG)
-                .height(1000)
-                .width(1000)
-                .build();
-        rsChemElementManager.generateRsChemExportBytes(format, rsChemElement);
-        rsChemElementManager.saveChemImagePng(
-            rsChemElement, new ByteArrayInputStream(rsChemElement.getDataImage()), subject);
+        rsChemElementManager.generateRsChemElementForNewlyUploadedChemistryFile(
+            (EcatChemistryFile) media, subject);
       }
       return new AjaxReturnObject<>(media.toRecordInfo(), null);