♻️ : 이미지 수정

TEAMMatchDev · Mar 16, 2024 · 5a12700 · 5a12700
1 parent 6a84621
commit 5a12700
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/Match-Api/src/main/java/com/example/matchapi/project/service/ProjectImgService.java b/Match-Api/src/main/java/com/example/matchapi/project/service/ProjectImgService.java
@@ -10,7 +10,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,15 +23,15 @@ public class ProjectImgService {
     private final ProjectConverter projectConverter;
     private final S3UploadService s3UploadService;
 
-    public void saveImgList(Long id, String url, List<String> imgUrlList) {
+    public void saveImgList(Long projectId, String url, List<String> imgUrlList) {
         imgUrlList.add(url);
         List<ProjectImage> projectImages = new ArrayList<>();
 
         for (int i=1 ; i <= imgUrlList.size(); i++) {
             if(i==imgUrlList.size()){
-                projectImages.add(projectConverter.postProjectImage(id,imgUrlList.get(i-1),REPRESENT,i));
+                projectImages.add(projectConverter.postProjectImage(projectId,imgUrlList.get(i-1),REPRESENT,i));
             }else {
-                projectImages.add(projectConverter.postProjectImage(id, imgUrlList.get(i-1),NORMAL, i));
+                projectImages.add(projectConverter.postProjectImage(projectId, imgUrlList.get(i-1),NORMAL, i));
             }
         }
 
@@ -48,10 +47,12 @@ public ProjectImage save(ProjectImage projectImage) {
     }
 
     public void updateImageLists(Project project, List<Long> deleteImageList, MultipartFile presentFile, List<MultipartFile> multipartFiles) {
+        List<ProjectImage> projectsImage = project.getProjectImage();
         if(deleteImageList != null){
-            List<ProjectImage> images = projectImgAdaptor.findByIdIn(deleteImageList);
-            for (ProjectImage image : images) {
-                s3UploadService.deleteFile(image.getUrl());
+            for (ProjectImage projectImage : projectsImage) {
+                if(deleteImageList.contains(projectImage.getId())){
+                    s3UploadService.deleteFile(projectImage.getUrl());
+                }
             }
             projectImgAdaptor.deleteImgList(deleteImageList);
         }
@@ -64,7 +65,18 @@ public void updateImageLists(Project project, List<Long> deleteImageList, Multip
         }
         if(multipartFiles != null){
             List<String> imgUrlList = s3UploadService.listUploadProjectFiles(project.getId(), multipartFiles);
-            saveImgList(project.getId(), imgUrlList.get(0), imgUrlList);
+            patchImageLists(project.getId(), imgUrlList.get(0), imgUrlList, projectsImage.size()-deleteImageList.size());
         }
     }
+
+    public void patchImageLists(Long projectId, String url, List<String> imgUrlList, int size) {
+        imgUrlList.add(url);
+        List<ProjectImage> projectImages = new ArrayList<>();
+
+        for (int i=size ; i <= imgUrlList.size(); size++) {
+                projectImages.add(projectConverter.postProjectImage(projectId,imgUrlList.get(i-1),REPRESENT,i));
+        }
+
+        projectImgAdaptor.saveAll(projectImages);
+    }
 }