이미지 수정 변경

kdt-8-4 · Dec 4, 2023 · d19d710 · d19d710
1 parent 21cdfab
commit d19d710
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/src/main/java/com/weatherfit/board/controller/BoardController.java b/src/main/java/com/weatherfit/board/controller/BoardController.java
@@ -140,12 +140,15 @@ public boolean patchBoard(
             @RequestHeader("decodedToken") String nickName,
             @PathVariable int boardId,
             @RequestPart("board") String boardJson,
-            @RequestPart(value = "images", required = false) MultipartFile[] images,
-            @RequestPart(value = "deletedImages", required = false) String[] deletedImages) throws UnsupportedEncodingException {
+            @RequestPart(value = "images", required = false) MultipartFile[] images
+            ) throws UnsupportedEncodingException, JsonProcessingException {
 
         String decodedNickname = new String(Base64.getDecoder().decode(nickName), "UTF-8");
 
-        boardService.patchBoard(boardId, boardJson, images, deletedImages, decodedNickname);
+        System.out.println(boardJson);
+
+
+        boardService.patchBoard(boardId, boardJson, images, decodedNickname);
         return true;
     }
 

diff --git a/src/main/java/com/weatherfit/board/dto/BoardUpdateDTO.java b/src/main/java/com/weatherfit/board/dto/BoardUpdateDTO.java
@@ -15,6 +15,6 @@ public class BoardUpdateDTO {
     private List<String> category;
     private List<String> hashTag;
     private List<ImageEntity> images;
-    private String[] deletedImages;
+    private Integer[] deletedImages;
 
 }
diff --git a/src/main/java/com/weatherfit/board/service/BoardService.java b/src/main/java/com/weatherfit/board/service/BoardService.java
@@ -154,7 +154,7 @@ public BoardEntity insertBoard(BoardEntity board) {
 
     // 게시글 수정
     @Transactional
-    public void patchBoard(int boardId, String boardJson, MultipartFile[] images, String[] deletedImages, String nickName) {
+    public void patchBoard(int boardId, String boardJson, MultipartFile[] images, String nickName) {
         Optional<BoardEntity> optionalBoard = Optional.ofNullable(boardRepository.findById(boardId));
 
         BoardEntity originalBoard = optionalBoard.orElseThrow(() -> new IllegalArgumentException("해당 게시글이 존재하지 않습니다. id=" + boardId));
@@ -172,27 +172,23 @@ public void patchBoard(int boardId, String boardJson, MultipartFile[] images, St
 
         for (MultipartFile image : images) {
             String imageUrl = imageService.saveImage(image);
+            ImageEntity imageEntity = ImageEntity.builder()
+                    .imageUrl(imageUrl)
+                    .boardId(originalBoard)
+                    .build();
+            imageRepository.save(imageEntity);
 
-            if (!imageRepository.existsByImageUrl(imageUrl)) {
-                ImageEntity imageEntity = ImageEntity.builder()
-                        .imageUrl(imageUrl)
-                        .boardId(originalBoard)
-                        .build();
-                imageRepository.save(imageEntity);
+            originalBoard.getImages().add(imageEntity);
 
-                originalBoard.getImages().add(imageEntity);
-            }
         }
 
-        // 삭제된 이미지 처리
-        if (deletedImages != null) {
-            for (String imageUrl : deletedImages) {
-                ImageEntity imageEntity = imageRepository.findByImageUrl(imageUrl);
-                if (imageEntity != null) {
-                    imageRepository.delete(imageEntity);
-                    imageService.deleteImage(imageUrl);
+        if (boardUpdateDTO.getDeletedImages() != null) {
+            for (Integer imageId : boardUpdateDTO.getDeletedImages()) {
+                Optional<ImageEntity> optionalImageEntity = imageRepository.findById(imageId);
+                ImageEntity imageEntity = optionalImageEntity.orElseThrow(() -> new IllegalArgumentException("해당 이미지가 존재하지 않습니다. id=" + imageId));
 
-                }
+                imageRepository.deleteById(imageId);
+                imageService.deleteImage(imageEntity.getImageUrl());
             }
         }