Merge pull request #137 from InningLog/feat/#136/thumbnail-expansion

feat : 직관일지/좌석시야 목록 조회 시 썸네일 URL 반환 #136

Author: GOOHAESEUNG

src/main/java/com/inninglog/inninglog/domain/journal/usecase/JournalUsecase.java

@@ -23,6 +23,7 @@
 import com.inninglog.inninglog.domain.team.domain.Team;
 import com.inninglog.inninglog.domain.team.service.TeamGetService;
 import com.inninglog.inninglog.global.s3.S3Uploader;
+import com.inninglog.inninglog.global.s3.ThumbnailUrlGenerator;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Slice;
@@ -51,6 +52,7 @@ public class JournalUsecase {
     private final GameReportService gameReportService;
     private final GameGetService gameGetService;
     private final S3Uploader s3Uploader;
+    private final ThumbnailUrlGenerator thumbnailUrlGenerator;
     private final LikeValidateService likeValidateService;
     private final ScrapValidateService scrapValidateService;
     private final CommentGetService commentGetService;
@@ -96,7 +98,7 @@ public Page<JournalSumListResDto> getJournalsByMemberSum(
         return journals.map(
                 journal -> JournalSumListResDto.from(
                         journal,
-                        s3Uploader.getDirectUrl(journal.getMedia_url()),
+                        thumbnailUrlGenerator.generateThumbnailUrl(journal.getMedia_url()),
                         member.getTeam().getShortCode(),
                         likedIds.contains(journal.getId()),
                         scrapedIds.contains(journal.getId())
@@ -184,7 +186,7 @@ public SliceResponse<JournalFeedResDto> getPublicJournalFeed(Long memberId, Stri
 
             return JournalFeedResDto.from(
                     journal,
-                    s3Uploader.getDirectUrl(journal.getMedia_url()),
+                    thumbnailUrlGenerator.generateThumbnailUrl(journal.getMedia_url()),
                     writedByMe,
                     likedByMe,
                     scrapedByMe
@@ -219,7 +221,7 @@ public SliceResponse<JournalFeedResDto> searchPublicJournals(Long memberId, Stri
 
             return JournalFeedResDto.from(
                     journal,
-                    s3Uploader.getDirectUrl(journal.getMedia_url()),
+                    thumbnailUrlGenerator.generateThumbnailUrl(journal.getMedia_url()),
                     writedByMe,
                     likedByMe,
                     scrapedByMe
@@ -244,7 +246,7 @@ public SliceResponse<JournalSumListResDto> getMyJournals(Member member, Pageable
         Slice<JournalSumListResDto> dtoSlice = journals.map(
                 journal -> JournalSumListResDto.from(
                         journal,
-                        s3Uploader.getDirectUrl(journal.getMedia_url()),
+                        thumbnailUrlGenerator.generateThumbnailUrl(journal.getMedia_url()),
                         member.getTeam().getShortCode(),
                         likedIds.contains(journal.getId()),
                         scrapedIds.contains(journal.getId())
@@ -298,7 +300,7 @@ public SliceResponse<JournalFeedResDto> getPopularJournals(Long memberId, Pageab
 
             return JournalFeedResDto.from(
                     journal,
-                    s3Uploader.getDirectUrl(journal.getMedia_url()),
+                    thumbnailUrlGenerator.generateThumbnailUrl(journal.getMedia_url()),
                     writedByMe,
                     likedByMe,
                     scrapedByMe
@@ -333,7 +335,7 @@ private SliceResponse<JournalFeedResDto> toFeedPage(Slice<Long> journalIdSlice,
 
                     return JournalFeedResDto.from(
                             journal,
-                            s3Uploader.getDirectUrl(journal.getMedia_url()),
+                            thumbnailUrlGenerator.generateThumbnailUrl(journal.getMedia_url()),
                             writedByMe,
                             likedByMe,
                             scrapedByMe

src/main/java/com/inninglog/inninglog/domain/seatView/service/HashtagSearchService.java

@@ -5,6 +5,8 @@
 import com.inninglog.inninglog.domain.contentType.ContentType;
 import com.inninglog.inninglog.global.exception.CustomException;
 import com.inninglog.inninglog.global.exception.ErrorCode;
+import com.inninglog.inninglog.global.s3.S3UrlProperties;
+import com.inninglog.inninglog.global.s3.ThumbnailUrlGenerator;
 import com.inninglog.inninglog.domain.member.repository.MemberRepository;
 import com.inninglog.inninglog.domain.seatView.domain.SeatView;
 import com.inninglog.inninglog.domain.seatView.dto.res.SeatViewImageResult;
@@ -29,6 +31,8 @@ public class HashtagSearchService {
     private final SeatViewRepository seatViewRepository;
     private final ContentImageRepository contentImageRepository;
     private final MemberRepository memberRepository;
+    private final ThumbnailUrlGenerator thumbnailUrlGenerator;
+    private final S3UrlProperties s3UrlProperties;
 
     // 모아보기 형태 검색 (사진만)
     public Page<SeatViewImageResult> searchSeatViewsByHashtagsGallery(Long memberId, String stadiumShortCode, List<String> hashtagCodes, Pageable pageable) {
@@ -70,10 +74,15 @@ private Map<Long, String> getThumbnailMap(List<Long> seatViewIds) {
         List<ContentImage> images = contentImageRepository.findAllByContentTypeAndTargetIdIn(
                 ContentType.SEATVIEW, seatViewIds);
 
+        String baseUrlPrefix = s3UrlProperties.getBaseUrl() + "/";
+
         return images.stream()
                 .collect(Collectors.toMap(
                         ContentImage::getTargetId,
-                        ContentImage::getOriginalUrl,
+                        img -> {
+                            String key = img.getOriginalUrl().replace(baseUrlPrefix, "");
+                            return thumbnailUrlGenerator.generateThumbnailUrl(key);
+                        },
                         (existing, replacement) -> existing
                 ));
     }

src/main/java/com/inninglog/inninglog/domain/seatView/service/SeatSearchService.java

@@ -5,6 +5,8 @@
 import com.inninglog.inninglog.domain.contentType.ContentType;
 import com.inninglog.inninglog.global.exception.CustomException;
 import com.inninglog.inninglog.global.exception.ErrorCode;
+import com.inninglog.inninglog.global.s3.S3UrlProperties;
+import com.inninglog.inninglog.global.s3.ThumbnailUrlGenerator;
 import com.inninglog.inninglog.domain.member.repository.MemberRepository;
 import com.inninglog.inninglog.domain.seatView.domain.SeatView;
 import com.inninglog.inninglog.domain.seatView.dto.req.SeatSearchReq;
@@ -30,6 +32,8 @@ public class SeatSearchService {
     private final SeatViewRepository seatViewRepository;
     private final ContentImageRepository contentImageRepository;
     private final MemberRepository memberRepository;
+    private final ThumbnailUrlGenerator thumbnailUrlGenerator;
+    private final S3UrlProperties s3UrlProperties;
 
     public Page<SeatViewImageResult> searchSeats(
             Long memeberId,
@@ -81,10 +85,15 @@ private Map<Long, String> getThumbnailMap(List<Long> seatViewIds) {
         List<ContentImage> images = contentImageRepository.findAllByContentTypeAndTargetIdIn(
                 ContentType.SEATVIEW, seatViewIds);
 
+        String baseUrlPrefix = s3UrlProperties.getBaseUrl() + "/";
+
         return images.stream()
                 .collect(Collectors.toMap(
                         ContentImage::getTargetId,
-                        ContentImage::getOriginalUrl,
+                        img -> {
+                            String key = img.getOriginalUrl().replace(baseUrlPrefix, "");
+                            return thumbnailUrlGenerator.generateThumbnailUrl(key);
+                        },
                         (existing, replacement) -> existing // 첫 번째 이미지(썸네일) 유지
                 ));
     }