1.1.3.3 - Fix storage crud

Author: FunixG

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>1.1.3.2</version>
+    <version>1.1.3.3</version>
 </parent>
 
 <repository>

crud/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.funixproductions.core</groupId>
         <artifactId>funixproductions-core</artifactId>
-        <version>1.1.3.2</version>
+        <version>1.1.3.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

exceptions/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.funixproductions.core</groupId>
         <artifactId>funixproductions-core</artifactId>
-        <version>1.1.3.2</version>
+        <version>1.1.3.3</version>
     </parent>
 
     <groupId>com.funixproductions.core.exceptions</groupId>

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>com.funixproductions.core</groupId>
     <artifactId>funixproductions-core</artifactId>
-    <version>1.1.3.2</version>
+    <version>1.1.3.3</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.2</com.funixproductions.core.version>
+        <com.funixproductions.core.version>1.1.3.3</com.funixproductions.core.version>
 
         <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
         <com.google.guava.version>33.3.1-jre</com.google.guava.version>

storage/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.funixproductions.core</groupId>
         <artifactId>funixproductions-core</artifactId>
-        <version>1.1.3.2</version>
+        <version>1.1.3.3</version>
     </parent>
 
     <groupId>com.funixproductions.core.files</groupId>

storage/src/main/java/com/funixproductions/core/files/services/ApiStorageService.java

@@ -28,6 +28,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -77,10 +78,10 @@ public DTO store(final DTO request, final MultipartFile multipartFile) {
             throw new ApiBadRequestException("Le nom du fichier ne peut pas être null ou vide");
         }
 
-        request.setFileName(originalFileName);
+        request.setFileName(UUID.randomUUID() + "_" + originalFileName);
         request.setFileSize(multipartFile.getSize());
         request.setFileExtension(originalFileName.substring(originalFileName.lastIndexOf(".") + 1));
-        request.setFilePath("toSet");
+        request.setFilePath("toSet" + UUID.randomUUID());
         final DTO fileDto = super.create(request);
 
         return storeNewFile(multipartFile, fileDto);
@@ -181,12 +182,12 @@ public static byte[] createThumbnailFromImage(@NonNull MultipartFile originalFil
 
     @NonNull
     private DTO storeNewFile(MultipartFile multipartFile, DTO fileDto) {
-        final String originalFileName = multipartFile.getResource().getFilename();
+        final String originalFileName = fileDto.getFileName();
         if (Strings.isNullOrEmpty(originalFileName)) {
             throw new ApiBadRequestException("Le nom du fichier ne peut pas être null ou vide");
         }
 
-        final File file = new File(storageDirectory, fileDto.getId() + "-" + originalFileName);
+        final File file = new File(storageDirectory, originalFileName);
 
         fileDto.setFileName(originalFileName);
         fileDto.setFileSize(multipartFile.getSize());
@@ -212,6 +213,8 @@ private DTO updateFileDTO(MultipartFile multipartFile, DTO dto) {
         try {
             Files.deleteIfExists(oldFile.toPath());
             log.info("File {} has been deleted, path: {}", dto.getId(), oldFile.getPath());
+
+            dto.setFileName(UUID.randomUUID() + "_" + multipartFile.getResource().getFilename());
             this.resourceCache.invalidate(dto.getId().toString());
             return storeNewFile(multipartFile, dto);
         } catch (final Exception e) {

storage/src/test/java/com/funixproductions/core/files/ApiStorageResourceTest.java

@@ -64,7 +64,7 @@ void testUploadSuccess() throws Exception {
                 .andReturn();
 
         final TestStorageFileDTO storageFileDTO = jsonHelper.fromJson(result.getResponse().getContentAsString(), TestStorageFileDTO.class);
-        assertEquals(fileName + '.' + fileExt, storageFileDTO.getFileName());
+        assertTrue(storageFileDTO.getFileName().contains(fileName));
         assertEquals(request.getData(), storageFileDTO.getData());
         assertEquals(fileExt, storageFileDTO.getFileExtension());
 
@@ -122,7 +122,7 @@ void testPatchSuccess() throws Exception {
         final TestStorageFileDTO finalStorageFileDTO = jsonHelper.fromJson(result.getResponse().getContentAsString(), TestStorageFileDTO.class);
         assertEquals(storageFileDTO.getId(), finalStorageFileDTO.getId());
         assertNotEquals(storageFileDTO.getFileName(), finalStorageFileDTO.getFileName());
-        assertEquals(finalFileName + '.' + finalFileExt, finalStorageFileDTO.getFileName());
+        assertTrue(finalStorageFileDTO.getFileName().contains(finalFileName));
 
         result = this.mockMvc.perform(get("/testfile/file/" + storageFileDTO.getId()))
                 .andExpect(status().isOk())
@@ -175,7 +175,7 @@ void testPutSuccess() throws Exception {
         final TestStorageFileDTO finalStorageFileDTO = jsonHelper.fromJson(result.getResponse().getContentAsString(), TestStorageFileDTO.class);
         assertEquals(storageFileDTO.getId(), finalStorageFileDTO.getId());
         assertNotEquals(storageFileDTO.getFileName(), finalStorageFileDTO.getFileName());
-        assertEquals(finalFileName + '.' + finalFileExt, finalStorageFileDTO.getFileName());
+        assertTrue(finalStorageFileDTO.getFileName().contains(finalFileName));
 
         result = this.mockMvc.perform(get("/testfile/file/" + storageFileDTO.getId()))
                 .andExpect(status().isOk())
@@ -185,7 +185,7 @@ void testPutSuccess() throws Exception {
 
     @Test
     void testDeleteFile() throws Exception {
-        final String fileName = "fileNameTest" + UUID.randomUUID();
+        final String fileName = UUID.randomUUID() + "_fileNameTest";
         final String fileExt = "txt";
         final String fileContent = "test";
         final TestStorageFileDTO request = new TestStorageFileDTO();
@@ -207,7 +207,7 @@ void testDeleteFile() throws Exception {
                 .andReturn();
 
         final TestStorageFileDTO storageFileDTO = jsonHelper.fromJson(result.getResponse().getContentAsString(), TestStorageFileDTO.class);
-        assertEquals(fileName + '.' + fileExt, storageFileDTO.getFileName());
+        assertTrue(storageFileDTO.getFileName().contains(fileName));
         assertEquals(fileExt, storageFileDTO.getFileExtension());
 
         this.mockMvc.perform(delete("/testfile?id=" + storageFileDTO.getId()))

test-utils/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.funixproductions.core</groupId>
         <artifactId>funixproductions-core</artifactId>
-        <version>1.1.3.2</version>
+        <version>1.1.3.3</version>
     </parent>
 
     <groupId>com.funixproductions.core.test</groupId>

tools/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.funixproductions.core</groupId>
         <artifactId>funixproductions-core</artifactId>
-        <version>1.1.3.2</version>
+        <version>1.1.3.3</version>
     </parent>
 
     <groupId>com.funixproductions.core.tools</groupId>