Merge branch 'MP-243' into 'develop'

MP-244 / multiple + single file deletions

See merge request !58

CHANGELOG.md

@@ -3,6 +3,8 @@
 - adding dtos : ElementContentDTO and InnerFileDTO
 - Adding feature of : getting files within a certain tender analysis folder
 ## Changed
+- Docs Controller : adding multiple files deletion feature. 
+- Docs controller : adding single file deletion feature. 
 - File import & subfolder creation logics : tracking the current session infoss. 
 - Docs controller : exposing the detailed content feature via endpoint
 - Docs service : by defining a detailed folder content getter function : getDetailedFolderContent

src/main/java/com/marketingconfort/mobimarche/user_management_service/Controller/DocsController.java

 package com.marketingconfort.mobimarche.user_management_service.Controller;
 
 import com.amazonaws.services.s3.model.S3ObjectSummary;
+import com.marketingconfort.mobimarche.user_management_service.dto.request.MultipleFilesDeletionReqDTO;
 import com.marketingconfort.mobimarche.user_management_service.dto.response.ElementContentDTO;
 import com.marketingconfort.mobimarche.user_management_service.service.DocsService;
 import com.marketingconfort.starter.core.exceptions.FunctionalException;
@@ -30,10 +31,10 @@ public class DocsController {
     @PostMapping(value=UPLOAD_FILE,consumes = "multipart/form-data")
     public ResponseEntity<String> uploadFile
             (@RequestPart("file") MultipartFile file,
-             @RequestParam String appelOffre,
+             @RequestParam String parent,
              @PathVariable("email") String email)
             throws S3FunctionalException, FunctionalException {
-            String fileUrl = service.uploadAnalyseFileToFolder(appelOffre,
+            String fileUrl = service.uploadAnalyseFileToFolder(parent,
                     file,
                     email);
             return ResponseEntity.ok().body(fileUrl);
@@ -74,4 +75,21 @@ public class DocsController {
         return ResponseEntity.ok().
                 body(service.createSubFolder(parent,name,email));
     }
+
+    @DeleteMapping(DELETE_SINGLE_FILE)
+    ResponseEntity<?> deleteFile(
+            @RequestParam("fileName") String fileName,
+            @RequestParam("email") String email
+    ) throws S3FunctionalException, FunctionalException {
+        service.deleteSingleFileInBucket(fileName,email);
+        return ResponseEntity.ok().build();
+    }
+
+    @DeleteMapping(DELETE_MULTIPLE_FILES)
+    ResponseEntity<?> deleteFile(
+            @RequestBody MultipleFilesDeletionReqDTO req)
+            throws S3FunctionalException, FunctionalException {
+        service.deleteFilesInBucket(req.getEmail(),req.getFileNames());
+        return ResponseEntity.ok().build();
+    }
 }

src/main/java/com/marketingconfort/mobimarche/user_management_service/constants/ApiPaths.java

@@ -64,4 +64,6 @@ public class ApiPaths {
     public static final String GET_DETAILED_CONTENT_OF_ELEMENT =
             "/folder-content";
     public static final String CREATE_SUBFOLDER = "/create-subfolder";
+    public static final String DELETE_SINGLE_FILE = "/delete";
+    public static final String DELETE_MULTIPLE_FILES = "/delete-multiple";
 }

src/main/java/com/marketingconfort/mobimarche/user_management_service/dto/request/MultipleFilesDeletionReqDTO.java

+package com.marketingconfort.mobimarche.user_management_service.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Data
+public class MultipleFilesDeletionReqDTO {
+    private String email;
+    private List<String> fileNames;
+}

src/main/java/com/marketingconfort/mobimarche/user_management_service/repository/FileRepository.java

@@ -4,6 +4,10 @@ import com.marketingconfort.mobimarche.common.user.models.File;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
 @Repository
 public interface FileRepository extends JpaRepository<File, Long> {
+    Optional<File> findByUrl(String url);
 }
+

src/main/java/com/marketingconfort/mobimarche/user_management_service/service/DocsService.java

@@ -18,8 +18,14 @@ public interface DocsService {
     ElementContentDTO getSpecFolderContent(String id)
         throws S3FunctionalException;
 
-    public String createSubFolder(String parent, String name,
+    String createSubFolder(String parent, String name,
                                   String email) throws
             S3FunctionalException, FunctionalException;
 
+    void deleteSingleFileInBucket(String fileName,String email)
+            throws S3FunctionalException , FunctionalException;
+
+    void deleteFilesInBucket(String email, List<String> fileNames)
+            throws S3FunctionalException , FunctionalException;
+
 }

src/main/java/com/marketingconfort/mobimarche/user_management_service/serviceImpl/DocsServiceImpl.java

 package com.marketingconfort.mobimarche.user_management_service.serviceImpl;
 
 import com.amazonaws.services.s3.model.S3ObjectSummary;
+import com.marketingconfort.mobimarche.common.TenderManagement.enums.UserType;
 import com.marketingconfort.mobimarche.common.user.models.File;
 import com.marketingconfort.mobimarche.common.user.models.Folder;
 import com.marketingconfort.mobimarche.common.user.models.User;
@@ -20,6 +21,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+
+import static com.marketingconfort.mobimarche.common.TenderManagement.enums.UserType.ADMIN;
 
 @RequiredArgsConstructor
 @Service
@@ -54,7 +58,7 @@ public class DocsServiceImpl implements DocsService {
         Folder local = Folder.builder().folderName("analyse/appelsOffres/" + id).
                 build();
         folderRepository.save(local);
-        return "analyse/appelsOffres/" + id;
+        return "analyse/appelsOffres/" + id+ "/";
     }
 
     @Override
@@ -133,6 +137,42 @@ public class DocsServiceImpl implements DocsService {
         return id;
     }
 
+    @Override
+    public void deleteSingleFileInBucket
+            (String fileName, String email)
+            throws S3FunctionalException , FunctionalException
+    {
+        User connected = userRepository.findByEmail(email).
+                orElseThrow(()-> new FunctionalException("user not found"));
+        File concernedFile = fileRepository.findByUrl(fileName).
+                orElseThrow(()-> new FunctionalException("unknown file"));
+        User fileOwner = concernedFile.getUser();
+        if(!Objects.equals(connected.getEmail(),fileOwner.getEmail()) &&
+                connected.getUserType() != ADMIN) {
+            throw new FunctionalException("files are only deleted by admins or their owners");
+        }
+        s3FileService.deleteSingleFileInBucket(bucketName,fileName);
+    }
+
+    @Override
+    public void deleteFilesInBucket(String email, List<String> fileNames)
+            throws S3FunctionalException, FunctionalException
+    {
+        User connected = userRepository.findByEmail(email).
+                orElseThrow(()-> new FunctionalException("user not found"));
+
+        for(String fileName : fileNames) {
+            File concernedFile = fileRepository.findByUrl(fileName).
+                    orElseThrow(()-> new FunctionalException("unknown file"));
+            User owner = concernedFile.getUser();
+            if(! owner.getEmail().equals(connected.getEmail()) &&
+                    connected.getUserType() != ADMIN) {
+                throw new FunctionalException("can't delete files you don't possess");
+            }
+        }
+        s3FileService.deleteFilesInBucket(bucketName,fileNames);
+    }
+
     @Override
     public String uploadAnalyseFileToFolder
             (String parentFolder, MultipartFile fileMult, String email)