refactor [#87] 콘서트 정보 조회 API 변경에 따른 수정

team-confeti · Jan 18, 2025 · 770ad93 · 770ad93
1 parent c391ec4
commit 770ad93
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 23 deletions.
diff --git a/src/main/java/org/sopt/confeti/api/performance/controller/PerformanceController.java b/src/main/java/org/sopt/confeti/api/performance/controller/PerformanceController.java
@@ -10,6 +10,7 @@
 import org.sopt.confeti.global.common.BaseResponse;
 import org.sopt.confeti.global.message.SuccessMessage;
 import org.sopt.confeti.global.util.ApiResponseUtil;
+import org.sopt.confeti.global.util.S3FileHandler;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,12 +28,15 @@
 public class PerformanceController {
 
     private final PerformanceFacade performanceFacade;
+    private final S3FileHandler s3FileHandler;
 
     @GetMapping("/concerts/{concertId}")
-    public ResponseEntity<BaseResponse<?>> getConcertInfo(@RequestHeader("Authorization") Long userId,
-                                                          @PathVariable("concertId") @Min(value = 0, message = "요청 형식이 올바르지 않습니다.") Long concertId) {
+    public ResponseEntity<BaseResponse<?>> getConcertInfo(
+            @RequestHeader(name = "Authorization", required = false) Long userId,
+            @PathVariable("concertId") @Min(value = 0, message = "요청 형식이 올바르지 않습니다.") Long concertId
+    ) {
         ConcertDetailDTO concertDetailDTO = performanceFacade.getConcertDetailInfo(concertId);
-        return ApiResponseUtil.success(SuccessMessage.SUCCESS, ConcertDetailResponse.from(concertDetailDTO));
+        return ApiResponseUtil.success(SuccessMessage.SUCCESS, ConcertDetailResponse.of(concertDetailDTO, s3FileHandler));
     }
 
     @PostMapping("/festivals")

diff --git a/src/main/java/org/sopt/confeti/api/performance/dto/response/ConcertDetailInfoResponse.java b/src/main/java/org/sopt/confeti/api/performance/dto/response/ConcertDetailInfoResponse.java
@@ -3,6 +3,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import org.sopt.confeti.api.performance.facade.dto.response.ConcertDetailDTO;
+import org.sopt.confeti.global.util.S3FileHandler;
 
 public record ConcertDetailInfoResponse(
         long concertId,
@@ -21,11 +22,11 @@ public record ConcertDetailInfoResponse(
         String price,
         String infoImgUrl
 ) {
-    public static ConcertDetailInfoResponse from(final ConcertDetailDTO concertDetailDTO) {
+    public static ConcertDetailInfoResponse of(final ConcertDetailDTO concertDetailDTO, final S3FileHandler s3FileHandler) {
         return new ConcertDetailInfoResponse(
                 concertDetailDTO.concertId(),
-                concertDetailDTO.posterUrl(),
-                concertDetailDTO.posterBgUrl(),
+                s3FileHandler.getFileUrl(concertDetailDTO.posterPath()),
+                s3FileHandler.getFileUrl(concertDetailDTO.posterBgPath()),
                 concertDetailDTO.title(),
                 concertDetailDTO.subtitle(),
                 concertDetailDTO.startAt(),
@@ -37,7 +38,7 @@ public static ConcertDetailInfoResponse from(final ConcertDetailDTO concertDetai
                 concertDetailDTO.ageRating(),
                 concertDetailDTO.reservationOffice(),
                 concertDetailDTO.price(),
-                concertDetailDTO.infoImgUrl()
+                s3FileHandler.getFileUrl(concertDetailDTO.infoImgPath())
         );
     }
 }
diff --git a/src/main/java/org/sopt/confeti/api/performance/dto/response/ConcertDetailResponse.java b/src/main/java/org/sopt/confeti/api/performance/dto/response/ConcertDetailResponse.java
@@ -2,17 +2,24 @@
 
 import java.util.List;
 import org.sopt.confeti.api.performance.facade.dto.response.ConcertDetailDTO;
+import org.sopt.confeti.global.util.S3FileHandler;
 
 public record ConcertDetailResponse(
         ConcertDetailInfoResponse concert,
+        boolean isOpen,
         List<ConcertDetailArtistResponse> concertArtists
 ) {
-    public static ConcertDetailResponse from(final ConcertDetailDTO concertDetailDTO) {
+    private static final int OPEN_CRITERIA = 4;
+
+    public static ConcertDetailResponse of(final ConcertDetailDTO concertDetailDTO, final S3FileHandler s3FileHandler) {
+        List<ConcertDetailArtistResponse> concertArtists = concertDetailDTO.artists().stream()
+                .map(ConcertDetailArtistResponse::from)
+                .toList();
+
         return new ConcertDetailResponse(
-                ConcertDetailInfoResponse.from(concertDetailDTO),
-                concertDetailDTO.artists().stream()
-                        .map(ConcertDetailArtistResponse::from)
-                        .toList()
+                ConcertDetailInfoResponse.of(concertDetailDTO, s3FileHandler),
+                concertArtists.size() > OPEN_CRITERIA,
+                concertArtists
         );
     }
 }
diff --git a/src/main/java/org/sopt/confeti/api/performance/facade/PerformanceFacade.java b/src/main/java/org/sopt/confeti/api/performance/facade/PerformanceFacade.java
@@ -21,7 +21,7 @@ public class PerformanceFacade {
     @Transactional
     public ConcertDetailDTO getConcertDetailInfo(final long concertId) {
         Concert concert = concertService.getConcertDetailByConcertId(concertId);
-        return ConcertDetailDTO.of(concert, s3FileHandler);
+        return ConcertDetailDTO.from(concert);
     }
 
     @Transactional

diff --git a/src/main/java/org/sopt/confeti/api/performance/facade/dto/response/ConcertDetailDTO.java b/src/main/java/org/sopt/confeti/api/performance/facade/dto/response/ConcertDetailDTO.java
@@ -4,7 +4,6 @@
 import java.time.LocalDateTime;
 import java.util.List;
 import org.sopt.confeti.domain.concert.Concert;
-import org.sopt.confeti.global.util.S3FileHandler;
 
 public record ConcertDetailDTO(
         long concertId,
@@ -13,10 +12,10 @@ public record ConcertDetailDTO(
         LocalDate startAt,
         LocalDate endAt,
         String area,
-        String posterUrl,
-        String posterBgUrl,
-        String infoImgUrl,
-        String concertReservationBgUrl,
+        String posterPath,
+        String posterBgPath,
+        String infoImgPath,
+        String concertReservationBgPath,
         LocalDateTime reserveAt,
         String reservationUrl,
         String reservationOffice,
@@ -25,18 +24,18 @@ public record ConcertDetailDTO(
         String price,
         List<ConcertArtistDTO> artists
 ) {
-    public static ConcertDetailDTO of(final Concert concert, final S3FileHandler s3FileHandler) {
+    public static ConcertDetailDTO from(final Concert concert) {
         return new ConcertDetailDTO(
                 concert.getId(),
                 concert.getConcertTitle(),
                 concert.getConcertSubtitle(),
                 concert.getConcertStartAt(),
                 concert.getConcertEndAt(),
                 concert.getConcertArea(),
-                s3FileHandler.getFileUrl(concert.getConcertPosterPath()),
-                s3FileHandler.getFileUrl(concert.getConcertPosterBgPath()),
-                s3FileHandler.getFileUrl(concert.getConcertInfoImgPath()),
-                s3FileHandler.getFileUrl(concert.getConcertReservationBgPath()),
+                concert.getConcertPosterPath(),
+                concert.getConcertPosterBgPath(),
+                concert.getConcertInfoImgPath(),
+                concert.getConcertReservationBgPath(),
                 concert.getReserveAt(),
                 concert.getReservationUrl(),
                 concert.getReservationOffice(),