1.1.3.2 - Add lib to lower image resolutions

FunixProductions · Nov 11, 2024 · 81e152b · 81e152b
1 parent fdd4d0e
commit 81e152b
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Lien du repository Maven : [FunixProductions - Core spring package](https://mvn.
 <parent>
     <groupId>com.funixproductions.core</groupId>
     <artifactId>funixproductions-core</artifactId>
-    <version>(maven version)</version>
+    <version>1.1.3.2</version>
 </parent>
 
 <repository>

diff --git a/crud/pom.xml b/crud/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.funixproductions.core</groupId>
         <artifactId>funixproductions-core</artifactId>
-        <version>1.1.3.1</version>
+        <version>1.1.3.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/exceptions/pom.xml b/exceptions/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.funixproductions.core</groupId>
         <artifactId>funixproductions-core</artifactId>
-        <version>1.1.3.1</version>
+        <version>1.1.3.2</version>
     </parent>
 
     <groupId>com.funixproductions.core.exceptions</groupId>

diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>com.funixproductions.core</groupId>
     <artifactId>funixproductions-core</artifactId>
-    <version>1.1.3.1</version>
+    <version>1.1.3.2</version>
     <name>funixproductions-core</name>
     <description>funixproductions-core for all company projects</description>
     <url>https://github.com/FunixProductions/spring-core</url>
@@ -29,7 +29,7 @@
 
     <properties>
         <java.version>21</java.version>
-        <com.funixproductions.core.version>1.1.3.1</com.funixproductions.core.version>
+        <com.funixproductions.core.version>1.1.3.2</com.funixproductions.core.version>
 
         <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
         <com.google.guava.version>33.3.1-jre</com.google.guava.version>
@@ -58,6 +58,8 @@
         <org.apache.pdfbox.version>3.0.3</org.apache.pdfbox.version>
         <!-- https://mvnrepository.com/artifact/io.sentry/sentry-spring-boot-starter-jakarta -->
         <io.sentry.version>7.16.0</io.sentry.version>
+        <!-- https://mvnrepository.com/artifact/org.imgscalr/imgscalr-lib -->
+        <org.imgscalr-lib.version>4.2</org.imgscalr-lib.version>
     </properties>
 
     <licenses>

diff --git a/storage/pom.xml b/storage/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.funixproductions.core</groupId>
         <artifactId>funixproductions-core</artifactId>
-        <version>1.1.3.1</version>
+        <version>1.1.3.2</version>
     </parent>
 
     <groupId>com.funixproductions.core.files</groupId>
@@ -26,6 +26,13 @@
             <version>${com.funixproductions.core.version}</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.imgscalr/imgscalr-lib -->
+        <dependency>
+            <groupId>org.imgscalr</groupId>
+            <artifactId>imgscalr-lib</artifactId>
+            <version>${org.imgscalr-lib.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.funixproductions.core.test</groupId>
             <artifactId>test-utils</artifactId>

diff --git a/storage/src/main/java/com/funixproductions/core/files/services/ApiStorageService.java b/storage/src/main/java/com/funixproductions/core/files/services/ApiStorageService.java
@@ -14,11 +14,15 @@
 import jakarta.transaction.Transactional;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
+import org.imgscalr.Scalr;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -146,7 +150,7 @@ public void beforeDeletingEntity(@NonNull Iterable<ENTITY> filesEnt) {
         }
     }
 
-    @Scheduled(fixedRate = 3, timeUnit = TimeUnit.MINUTES)
+    @Scheduled(fixedRate = 1, timeUnit = TimeUnit.MINUTES)
     public void checkCache() {
         final List<String> uuids = new ArrayList<>(resourceCache.asMap().keySet());
 
@@ -159,6 +163,22 @@ public void checkCache() {
         }
     }
 
+    public static byte[] createThumbnailFromImage(@NonNull MultipartFile originalFile, int width) {
+        if (width <= 0) {
+            throw new ApiBadRequestException("La redimention d'une image ne peut pas se faire avec une largeur de 0 ou moins.");
+        }
+
+        try (final ByteArrayOutputStream thumbOutput = new ByteArrayOutputStream()) {
+            BufferedImage img = ImageIO.read(originalFile.getInputStream());
+            BufferedImage thumbImg = Scalr.resize(img, Scalr.Method.AUTOMATIC, Scalr.Mode.AUTOMATIC, width, Scalr.OP_ANTIALIAS);
+
+            ImageIO.write(thumbImg, originalFile.getContentType().split("/")[1], thumbOutput);
+            return thumbOutput.toByteArray();
+        } catch (Exception e) {
+            throw new ApiException("Erreur interne lors de la création d'une image en basse résolution.", e);
+        }
+    }
+
     @NonNull
     private DTO storeNewFile(MultipartFile multipartFile, DTO fileDto) {
         final String originalFileName = multipartFile.getResource().getFilename();

diff --git a/storage/src/test/java/com/funixproductions/core/files/ApiStorageResourceTest.java b/storage/src/test/java/com/funixproductions/core/files/ApiStorageResourceTest.java
@@ -1,7 +1,9 @@
 package com.funixproductions.core.files;
 
 import com.funixproductions.core.TestApp;
+import com.funixproductions.core.exceptions.ApiBadRequestException;
 import com.funixproductions.core.files.doc.dtos.TestStorageFileDTO;
+import com.funixproductions.core.files.services.ApiStorageService;
 import com.funixproductions.core.test.beans.JsonHelper;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,11 +14,15 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -211,4 +217,39 @@ void testDeleteFile() throws Exception {
                 .andExpect(status().isNotFound());
     }
 
+    @Test
+    void testMakeThumbnailOfImage() throws Exception {
+        InputStream imageStream = getClass().getResourceAsStream("/test-image.jpeg");
+
+        MockMultipartFile testImage = new MockMultipartFile(
+                "image",
+                "test-image.jpg",
+                MediaType.IMAGE_JPEG_VALUE,
+                imageStream
+        );
+
+        ApiStorageService.createThumbnailFromImage(testImage, 200);
+        ApiStorageService.createThumbnailFromImage(testImage, 100);
+
+        assertThrowsExactly(ApiBadRequestException.class, () -> {
+            ApiStorageService.createThumbnailFromImage(testImage, 0);
+            ApiStorageService.createThumbnailFromImage(testImage, -1);
+        });
+
+        final byte[] bytes = ApiStorageService.createThumbnailFromImage(testImage, 30);
+
+        File outputFile = new File("./target/test.jpeg");
+        try (FileOutputStream fos = new FileOutputStream(outputFile)) {
+            fos.write(bytes);
+        }
+
+        // Verify if the saved file is a readable image
+        BufferedImage img = ImageIO.read(outputFile);
+        if (img != null) {
+            System.out.println("Image written successfully! Width: " + img.getWidth() + ", Height: " + img.getHeight());
+        } else {
+            fail("Failed to read the image. The file might not be a valid image format.");
+        }
+    }
+
 }
diff --git a/storage/src/test/resources/test-image.jpeg b/storage/src/test/resources/test-image.jpeg
diff --git a/test-utils/pom.xml b/test-utils/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.funixproductions.core</groupId>
         <artifactId>funixproductions-core</artifactId>
-        <version>1.1.3.1</version>
+        <version>1.1.3.2</version>
     </parent>
 
     <groupId>com.funixproductions.core.test</groupId>

diff --git a/tools/pom.xml b/tools/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.funixproductions.core</groupId>
         <artifactId>funixproductions-core</artifactId>
-        <version>1.1.3.1</version>
+        <version>1.1.3.2</version>
     </parent>
 
     <groupId>com.funixproductions.core.tools</groupId>