밸런스 게임 임시저장 시 파일 중복 오류 해결

src/main/java/balancetalk/file/domain/repository/FileRepository.java

@@ -2,9 +2,12 @@
 
 import balancetalk.file.domain.File;
 import balancetalk.file.domain.FileType;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface FileRepository extends JpaRepository<File, Long>, FileRepositoryCustom {
 
     void deleteByResourceIdAndFileType(Long tempTalkPickId, FileType fileType);
+
+    void deleteByResourceIdInAndFileType(List<Long> ids, FileType fileType);
 }

src/main/java/balancetalk/game/application/TempGameService.java

@@ -3,6 +3,7 @@
 import static balancetalk.file.domain.FileType.TEMP_GAME_OPTION;
 import static balancetalk.game.dto.TempGameDto.CreateTempGameRequest;
 
+import balancetalk.file.domain.File;
 import balancetalk.file.domain.FileHandler;
 import balancetalk.file.domain.repository.FileRepository;
 import balancetalk.game.domain.MainTag;
@@ -21,7 +22,10 @@
 import balancetalk.member.dto.ApiMember;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,14 +48,23 @@ public void createTempGame(CreateTempGameSetRequest request, ApiMember apiMember
 
         List<CreateTempGameRequest> tempGames = request.getTempGames();
 
-        List<TempGame> newTempGames = tempGames.stream()
-                .map(game -> game.toEntity(fileRepository))
-                .toList();
+        List<TempGame> newTempGames = request.getTempGames().stream()
+            .map(game -> game.toEntity(fileRepository))
+            .toList();
 
         if (member.hasTempGameSet()) { // 기존 임시저장이 존재하는 경우
             TempGameSet existGame = member.getTempGameSet();
+
+            if (request.isNewRequest()) { // 새롭게 임시저장 하는 경우, 파일 모두 삭제
+                List<Long> oldFileIds = existGame.getAllFileIds();
+                if (!oldFileIds.isEmpty()) {
+                    fileRepository.deleteByResourceIdInAndFileType(oldFileIds, TEMP_GAME_OPTION);
+                }
+            }
+
+            // 새롭게 불러온 경우, 파일만 재배치 (isLoaded: true)
+            relocateFiles(request, existGame);
             existGame.updateTempGameSet(request.getTitle(), request.getSubTag(), mainTag, newTempGames);
-            processTempGameFiles(tempGames, existGame.getTempGames());
             return;
         }
 
@@ -67,6 +80,100 @@ public void createTempGame(CreateTempGameSetRequest request, ApiMember apiMember
         processTempGameFiles(tempGames, tempGameSet.getTempGames());
     }
 
+    private void relocateFiles(CreateTempGameSetRequest request, TempGameSet tempGameSet) {
+        if (request.getAllFileIds().isEmpty()) {
+            return;
+        }
+
+        List<Long> deletedFileIds = deleteFiles(request, tempGameSet);
+
+        List<Long> newFileIds = getNewNonDuplicateFileIds(request, deletedFileIds, tempGameSet);
+
+        relocateFilesToGameOption(request, newFileIds, tempGameSet);
+    }
+
+    private void relocateFilesToGameOption(
+            CreateTempGameSetRequest request,
+            List<Long> newFileIds,
+            TempGameSet tempGameSet
+    ) {
+        if (!newFileIds.isEmpty()) {
+            List<TempGame> tempGames = tempGameSet.getTempGames();
+            Map<Long, Long> fileToOptionMap = getFileToOptionMap(tempGames, request, newFileIds);
+
+            List<File> files = fileRepository.findAllById(newFileIds);
+            Map<Long, File> fileMap = files.stream()
+                    .collect(Collectors.toMap(File::getId, file -> file));
+
+            for (Map.Entry<Long, Long> entry : fileToOptionMap.entrySet()) {
+                Long fileId = entry.getKey();
+                Long tempGameOptionId = entry.getValue();
+
+                File file = fileMap.get(fileId);
+                if (file == null) {
+                    throw new BalanceTalkException(ErrorCode.NOT_FOUND_FILE);
+                }
+                fileHandler.relocateFile(file, tempGameOptionId, TEMP_GAME_OPTION);
+            }
+        }
+    }
+
+    private Map<Long, Long> getFileToOptionMap(
+            List<TempGame> tempGames,
+            CreateTempGameSetRequest request,
+            List<Long> newFileIds
+    ) {
+        Map<Long, Long> fileToOptionMap = new LinkedHashMap<>();
+        List<CreateTempGameRequest> tempGameRequests = request.getTempGames();
+
+        for (int i = 0; i < tempGameRequests.size(); i++) {
+            CreateTempGameRequest gameRequest = tempGameRequests.get(i);
+
+            List<TempGameOptionDto> tempGameOptions = gameRequest.getTempGameOptions();
+            for (TempGameOptionDto optionDto : tempGameOptions) {
+                Long fileId = optionDto.getFileId();
+
+                if (fileId != null && newFileIds.contains(fileId)) {
+                    TempGameOption tempGameOption = tempGames.get(i).getTempGameOptions()
+                            .stream()
+                            .filter(option -> option.getOptionType().equals(optionDto.getOptionType()))
+                            .findFirst()
+                            .orElseThrow(() -> new BalanceTalkException(ErrorCode.FILE_ID_GAME_OPTION_ID_MISMATCH));
+                    fileToOptionMap.put(fileId, tempGameOption.getId());
+                }
+            }
+        }
+        return fileToOptionMap;
+    }
+
+    private List<Long> getNewNonDuplicateFileIds(
+            CreateTempGameSetRequest request,
+            List<Long> deletedFileIds,
+            TempGameSet tempGameSet
+    ) {
+        List<Long> existingFileIds = tempGameSet.getAllFileIds();
+        return request.getAllFileIds().stream()
+                .filter(fileId -> !deletedFileIds.contains(fileId))
+                .filter(fileId -> !existingFileIds.contains(fileId))
+                .toList();
+    }
+
+    private List<Long> deleteFiles(CreateTempGameSetRequest request, TempGameSet tempGameSet) {
+        List<Long> existingFileIds = tempGameSet.getAllFileIds();
+
+        List<Long> newFileIds = request.getAllFileIds();
+
+        List<Long> filesIdsToDelete = existingFileIds.stream()
+                .filter(existingFileId -> !newFileIds.contains(existingFileId))
+                .toList();
+
+        if (!filesIdsToDelete.isEmpty()) {
+            List<File> filesToDelete = fileRepository.findAllById(filesIdsToDelete);
+            fileHandler.deleteFiles(filesToDelete);
+        }
+        return filesIdsToDelete;
+    }
+
     private void processTempGameFiles(List<CreateTempGameRequest> requests, List<TempGame> tempGames) {
 
         for (int i = 0; i < requests.size(); i++) {

src/main/java/balancetalk/game/domain/TempGameOption.java

@@ -41,6 +41,8 @@ public class TempGameOption {
     @Enumerated(value = EnumType.STRING)
     private VoteOption optionType;
 
+    private Long imgId;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "temp_game_id")
     private TempGame tempGame;
@@ -52,5 +54,6 @@ public void assignTempGame(TempGame tempGame) {
     public void updateTempGameOption(TempGameOption newTempGameOption) {
         this.name = newTempGameOption.getName();
         this.description = newTempGameOption.getDescription();
+        this.imgId = newTempGameOption.getImgId();
     }
 }

src/main/java/balancetalk/game/domain/TempGameSet.java

@@ -17,6 +17,7 @@
 import jakarta.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.IntStream;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -72,4 +73,12 @@ public void updateTempGameSet(String title, String subTag, MainTag mainTag, List
             existingGame.updateTempGame(newGame);
         });
     }
+
+    public List<Long> getAllFileIds() {
+        return tempGames.stream()
+                .flatMap(game -> game.getTempGameOptions().stream())
+                .map(TempGameOption::getImgId)
+                .filter(Objects::nonNull)
+                .toList();
+    }
 }

src/main/java/balancetalk/game/dto/TempGameOptionDto.java

@@ -1,6 +1,5 @@
 package balancetalk.game.dto;
 
-import balancetalk.file.domain.File;
 import balancetalk.file.domain.repository.FileRepository;
 import balancetalk.game.domain.TempGameOption;
 import balancetalk.global.exception.BalanceTalkException;
@@ -37,6 +36,7 @@ public TempGameOption toEntity(FileRepository fileRepository) {
 
         return TempGameOption.builder()
                 .name(name)
+                .imgId(fileId)
                 .description(description)
                 .optionType(optionType)
                 .build();

src/main/java/balancetalk/game/dto/TempGameSetDto.java

@@ -9,8 +9,10 @@
 import balancetalk.global.exception.ErrorCode;
 import balancetalk.member.domain.Member;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import java.util.List;
+import java.util.Objects;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -33,6 +35,10 @@ public static class CreateTempGameSetRequest {
         @Size(max = 10, message = "서브 태그는 최대 10자까지 입력 가능합니다")
         private String subTag;
 
+        @Schema(description = "최근 임시저장된 밸런스 게임 불러오기 여부", example = "true")
+        @NotNull(message = "isLoaded 필드는 NULL을 허용하지 않습니다.")
+        private Boolean isLoaded;
+
         private List<CreateTempGameRequest> tempGames;
 
         public TempGameSet toEntity(MainTag mainTag, Member member) {
@@ -46,6 +52,18 @@ public TempGameSet toEntity(MainTag mainTag, Member member) {
                     .member(member)
                     .build();
         }
+
+        public List<Long> getAllFileIds() {
+            return tempGames.stream()
+                    .flatMap(game -> game.getTempGameOptions().stream())
+                    .map(TempGameOptionDto::getFileId)
+                    .filter(Objects::nonNull)
+                    .toList();
+        }
+
+        public boolean isNewRequest() {
+            return !isLoaded;
+        }
     }
 
     @Data

src/main/java/balancetalk/global/exception/ErrorCode.java

@@ -20,6 +20,7 @@ public enum ErrorCode {
     EXCEEDED_IMAGES_SIZE(BAD_REQUEST, "첨부 가능한 이미지 개수를 초과했습니다."),
     NOT_SUPPORTED_MIME_TYPE(BAD_REQUEST, "지원하지 않는 MIME 타입입니다."),
     MISSING_MIME_TYPE(BAD_REQUEST, "MIME 타입이 존재하지 않습니다."),
+    FILE_ID_GAME_OPTION_ID_MISMATCH(BAD_REQUEST, "File id에 매핑되는 GameOption Id가 없습니다."),
     REPORT_MY_COMMENT(BAD_REQUEST, "본인의 댓글을 신고할 수 없습니다"),
     INVALID_REPORT_REASON(BAD_REQUEST, "신고 사유가 올바르지 않습니다."),
     INVALID_REPORT_TYPE(BAD_REQUEST, "신고 타입이 올바르지 않습니다."),