#194 [Refactor] 이미지 리소스 URL 리다이렉트 통일 및 업로드 중복 제거

src/main/java/com/swyp/picke/domain/battle/repository/BattleOptionRepository.java

@@ -23,4 +23,13 @@ public interface BattleOptionRepository extends JpaRepository<BattleOption, Long
             "WHERE bo.battle IN :battles " +
             "ORDER BY bo.battle.id, COALESCE(bo.displayOrder, 9999), bo.label, bo.id")
     List<BattleOption> findByBattleIn(@Param("battles") List<Battle> battles);
+
+    @Query("SELECT COUNT(bo) FROM BattleOption bo " +
+            "WHERE bo.battle.deletedAt IS NULL " +
+            "AND bo.imageUrl = :imageUrl " +
+            "AND (:excludeOptionId IS NULL OR bo.id <> :excludeOptionId)")
+    long countActiveImageReferences(
+            @Param("imageUrl") String imageUrl,
+            @Param("excludeOptionId") Long excludeOptionId
+    );
 }

src/main/java/com/swyp/picke/domain/battle/repository/BattleRepository.java

@@ -64,6 +64,15 @@ public interface BattleRepository extends JpaRepository<Battle, Long> {
     // 주간 배치: 특정 기간(targetDate BETWEEN from AND to)의 배틀 조회
     List<Battle> findByTargetDateBetweenAndStatusAndDeletedAtIsNull(LocalDate from, LocalDate to, BattleStatus status);
 
+    @Query("SELECT COUNT(b) FROM Battle b " +
+            "WHERE b.deletedAt IS NULL " +
+            "AND b.thumbnailUrl = :thumbnailUrl " +
+            "AND (:excludeBattleId IS NULL OR b.id <> :excludeBattleId)")
+    long countActiveThumbnailReferences(
+            @Param("thumbnailUrl") String thumbnailUrl,
+            @Param("excludeBattleId") Long excludeBattleId
+    );
+
     // 탐색 탭: 전체 배틀 검색
     @Query("SELECT b FROM Battle b WHERE b.status = 'PUBLISHED' AND b.deletedAt IS NULL")
     List<Battle> searchAll(Pageable pageable);

src/main/java/com/swyp/picke/domain/battle/service/BattleServiceImpl.java

@@ -344,6 +344,8 @@ public AdminBattleDetailResponse createBattle(AdminBattleCreateRequest request,
                         Collectors.mapping(BattleOptionTag::getTag, Collectors.toList())
                 ));
 
+        cleanupUnreferencedDraftAssets(request.thumbnailUrl(), request.options());
+
         return battleConverter.toAdminDetailResponse(battle, getTagsByBattle(battle), savedOptions, optionTagsMap);
     }
 
@@ -373,7 +375,7 @@ public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRe
         String existingThumbnailKey = normalizeStoredImageReference(battle.getThumbnailUrl(), FileCategory.BATTLE);
         String resolvedThumbnailKey = resolveStoredImageKey(request.thumbnailUrl(), request.status(), FileCategory.BATTLE);
         if (existingThumbnailKey != null && !existingThumbnailKey.equals(resolvedThumbnailKey)) {
-            deleteStoredAsset(existingThumbnailKey);
+            deleteStoredAsset(existingThumbnailKey, battle.getId(), null);
         }
 
         battle.update(
@@ -421,7 +423,7 @@ public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRe
                 } else {
                     String existingOptionImageKey = normalizeStoredImageReference(option.getImageUrl(), FileCategory.PHILOSOPHER);
                     if (existingOptionImageKey != null && !existingOptionImageKey.equals(resolvedOptionImageKey)) {
-                        deleteStoredAsset(existingOptionImageKey);
+                        deleteStoredAsset(existingOptionImageKey, null, option.getId());
                     }
                     option.update(optionRequest.title(), optionRequest.stance(),
                             optionRequest.representative(), resolvedOptionImageKey);
@@ -435,7 +437,7 @@ public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRe
                     .toList();
 
             for (BattleOption removedOption : removedOptions) {
-                deleteStoredAsset(removedOption.getImageUrl());
+                deleteStoredAsset(removedOption.getImageUrl(), null, removedOption.getId());
                 List<BattleOptionTag> optionTags = battleOptionTagRepository.findByBattleOption(removedOption);
                 if (!optionTags.isEmpty()) {
                     battleOptionTagRepository.deleteAll(optionTags);
@@ -447,6 +449,8 @@ public AdminBattleDetailResponse updateBattle(Long battleId, AdminBattleUpdateRe
             }
         }
 
+        cleanupUnreferencedDraftAssets(request.thumbnailUrl(), request.options());
+
         List<BattleOption> updatedOptions = battleOptionRepository.findByBattle(battle);
         Map<Long, List<Tag>> optionTagsMap = battleOptionTagRepository.findByBattleWithTags(battle)
                 .stream()
@@ -585,12 +589,16 @@ private String extractPath(String value) {
         return value;
     }
 
-    private void deleteStoredAsset(String rawReference) {
+    private void deleteStoredAsset(String rawReference, Long excludeBattleId, Long excludeOptionId) {
         String normalized = normalizeStoredImageReference(rawReference, null);
         if (normalized == null) {
             return;
         }
 
+        if (hasOtherActiveReferences(normalized, excludeBattleId, excludeOptionId)) {
+            return;
+        }
+
         if (localDraftFileStorageService.isLocalDraftReference(normalized)) {
             localDraftFileStorageService.deleteIfLocalReference(normalized);
             return;
@@ -599,6 +607,30 @@ private void deleteStoredAsset(String rawReference) {
         s3UploadService.deleteFile(normalized);
     }
 
+    private boolean hasOtherActiveReferences(String normalizedReference, Long excludeBattleId, Long excludeOptionId) {
+        long thumbnailReferences = battleRepository.countActiveThumbnailReferences(normalizedReference, excludeBattleId);
+        long optionImageReferences = battleOptionRepository.countActiveImageReferences(normalizedReference, excludeOptionId);
+        return (thumbnailReferences + optionImageReferences) > 0;
+    }
+
+    private void cleanupUnreferencedDraftAssets(String thumbnailUrl, List<AdminBattleOptionRequest> options) {
+        Set<String> candidates = new LinkedHashSet<>();
+        if (thumbnailUrl != null && !thumbnailUrl.isBlank()) {
+            candidates.add(thumbnailUrl);
+        }
+        if (options != null) {
+            options.stream()
+                    .map(AdminBattleOptionRequest::imageUrl)
+                    .filter(Objects::nonNull)
+                    .filter(imageUrl -> !imageUrl.isBlank())
+                    .forEach(candidates::add);
+        }
+
+        for (String rawReference : candidates) {
+            deleteStoredAsset(rawReference, null, null);
+        }
+    }
+
     private BattleStatus parseBattleStatus(String status) {
         if (status == null || status.isBlank() || "ALL".equalsIgnoreCase(status)) {
             return null;

src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveCommentService.java

@@ -20,7 +20,8 @@
 import com.swyp.picke.domain.vote.service.BattleVoteService;
 import com.swyp.picke.global.common.exception.CustomException;
 import com.swyp.picke.global.common.exception.ErrorCode;
-import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService;
+import com.swyp.picke.global.infra.s3.enums.FileCategory;
+import com.swyp.picke.global.infra.s3.util.ResourceUrlProvider;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
@@ -43,7 +44,7 @@ public class PerspectiveCommentService {
     private final UserService userQueryService;
     private final BattleVoteService BattleVoteService;
     private final BattleService battleService;
-    private final S3PresignedUrlService s3PresignedUrlService;
+    private final ResourceUrlProvider resourceUrlProvider;
 
     @Transactional
     public CreateCommentResponse createComment(Long perspectiveId, Long userId, CreateCommentRequest request) {
@@ -207,6 +208,9 @@ private String resolveCharacterImageUrl(String characterType) {
         if (characterType == null || characterType.isBlank()) {
             return null;
         }
-        return s3PresignedUrlService.generatePresignedUrl(CharacterType.resolveImageKey(characterType));
+        return resourceUrlProvider.getImageUrl(
+                FileCategory.CHARACTER,
+                CharacterType.resolveImageKey(characterType)
+        );
     }
-}
+}

src/main/java/com/swyp/picke/domain/perspective/service/PerspectiveService.java

@@ -24,7 +24,8 @@
 import com.swyp.picke.domain.vote.service.BattleVoteService;
 import com.swyp.picke.global.common.exception.CustomException;
 import com.swyp.picke.global.common.exception.ErrorCode;
-import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService;
+import com.swyp.picke.global.infra.s3.enums.FileCategory;
+import com.swyp.picke.global.infra.s3.util.ResourceUrlProvider;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
@@ -48,7 +49,7 @@ public class PerspectiveService {
     private final UserService userQueryService;
     private final UserRepository userRepository;
     private final GptModerationService gptModerationService;
-    private final S3PresignedUrlService s3PresignedUrlService;
+    private final ResourceUrlProvider resourceUrlProvider;
 
     public PerspectiveDetailResponse getPerspectiveDetail(Long perspectiveId, Long userId) {
         Perspective perspective = findPerspectiveById(perspectiveId);
@@ -215,6 +216,9 @@ private String resolveCharacterImageUrl(String characterType) {
         if (characterType == null || characterType.isBlank()) {
             return null;
         }
-        return s3PresignedUrlService.generatePresignedUrl(CharacterType.resolveImageKey(characterType));
+        return resourceUrlProvider.getImageUrl(
+                FileCategory.CHARACTER,
+                CharacterType.resolveImageKey(characterType)
+        );
     }
-}
+}

src/main/java/com/swyp/picke/domain/user/service/MypageService.java

@@ -26,7 +26,8 @@
 import com.swyp.picke.domain.vote.service.VoteQueryService;
 import com.swyp.picke.global.common.exception.CustomException;
 import com.swyp.picke.global.common.exception.ErrorCode;
-import com.swyp.picke.global.infra.s3.service.S3PresignedUrlService;
+import com.swyp.picke.global.infra.s3.enums.FileCategory;
+import com.swyp.picke.global.infra.s3.util.ResourceUrlProvider;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -48,7 +49,7 @@ public class MypageService {
     private final VoteQueryService voteQueryService;
     private final BattleQueryService battleQueryService;
     private final PerspectiveQueryService perspectiveQueryService;
-    private final S3PresignedUrlService s3PresignedUrlService;
+    private final ResourceUrlProvider resourceUrlProvider;
 
     @Transactional
     public MypageResponse getMypage() {
@@ -74,7 +75,7 @@ public MypageResponse getMypage() {
                         philosopherType.getLabel(),
                         philosopherType.getTypeName(),
                         philosopherType.getDescription(),
-                        s3PresignedUrlService.generatePresignedUrl(
+                        resourceUrlProvider.getImageUrl(FileCategory.PHILOSOPHER,
                                 PhilosopherType.resolveImageKey(philosopherType.getLabel())
                         ))
                 : null;
@@ -355,7 +356,7 @@ private RecapResponse.PhilosopherCard toPhilosopherCard(PhilosopherType type) {
                 type.getTypeName(),
                 type.getDescription(),
                 type.getKeywordTags(),
-                s3PresignedUrlService.generatePresignedUrl(
+                resourceUrlProvider.getImageUrl(FileCategory.PHILOSOPHER,
                         PhilosopherType.resolveImageKey(type.getLabel())
                 )
         );
@@ -379,15 +380,17 @@ private NotificationSettingsResponse toNotificationSettingsResponse(UserSettings
 
     private String resolveCharacterImageUrl(CharacterType characterType) {
         String imageKey = CharacterType.resolveImageKey(characterType);
-        return imageKey != null ? s3PresignedUrlService.generatePresignedUrl(imageKey) : null;
+        return imageKey != null
+                ? resourceUrlProvider.getImageUrl(FileCategory.CHARACTER, imageKey)
+                : null;
     }
 
     private String resolveCharacterImageUrl(String characterType) {
         if (characterType == null || characterType.isBlank()) {
             return null;
         }
         String imageKey = CharacterType.resolveImageKey(characterType);
-        return s3PresignedUrlService.generatePresignedUrl(imageKey);
+        return resourceUrlProvider.getImageUrl(FileCategory.CHARACTER, imageKey);
     }
 }