Merge pull request #612 from Podo-Store/develop

[FIX] 공연 소식 api 수정

Author: pipi-shortstocking

src/main/java/PodoeMarket/podoemarket/common/repository/PerformanceRepository.java

@@ -19,7 +19,11 @@ public interface PerformanceRepository extends JpaRepository<PerformanceEntity,L
 SELECT p FROM PerformanceEntity p
 WHERE p.startDate <= :today
   AND p.endDate >= :today
-  AND (:isUsed IS NULL OR p.isUsed = :isUsed)
+  AND (
+        (:isUsed = true AND p.isUsed = true)
+        OR (:isUsed = false)
+        OR (:isUsed IS NULL)
+    )
 ORDER BY p.startDate DESC
 """)
     Page<PerformanceEntity> findOngoing(
@@ -31,7 +35,11 @@ Page<PerformanceEntity> findOngoing(
     @Query("""
 SELECT p FROM PerformanceEntity p
 WHERE p.startDate > :today
-  AND (:isUsed IS NULL OR p.isUsed = :isUsed)
+  AND (
+        (:isUsed = true AND p.isUsed = true)
+        OR (:isUsed = false)
+        OR (:isUsed IS NULL)
+    )
 ORDER BY p.startDate DESC
 """)
     Page<PerformanceEntity> findUpcoming(
@@ -43,7 +51,11 @@ Page<PerformanceEntity> findUpcoming(
     @Query("""
 SELECT p FROM PerformanceEntity p
 WHERE p.endDate < :today
-  AND (:isUsed IS NULL OR p.isUsed = :isUsed)
+  AND (
+        (:isUsed = true AND p.isUsed = true)
+        OR (:isUsed = false)
+        OR (:isUsed IS NULL)
+    )
 ORDER BY p.startDate DESC
 """)
     Page<PerformanceEntity> findPast(

src/main/java/PodoeMarket/podoemarket/performance/controller/PerformanceController.java

@@ -118,11 +118,12 @@ public ResponseEntity<?> getPastPerformanceMain(@AuthenticationPrincipal UserEnt
     }
 
     @GetMapping("/")
-    public ResponseEntity<?> getPerformanceList(@RequestParam PerformanceStatus status,
+    public ResponseEntity<?> getPerformanceList(@AuthenticationPrincipal UserEntity userInfo,
+                                                @RequestParam PerformanceStatus status,
                                                 @RequestParam(required = false) Boolean isUsed,
                                                 @RequestParam(value = "page", defaultValue = "0") int page) {
         try {
-            final List<PerformanceStatusResponseDTO.PerformanceListDTO> resDTO = performanceService.getPerformanceList(status, isUsed, page, 20).getContent();
+            final List<PerformanceStatusResponseDTO.PerformanceListDTO> resDTO = performanceService.getPerformanceList(userInfo, status, isUsed, page, 20).getContent();
 
             return ResponseEntity.ok().body(resDTO);
         } catch (Exception e) {

src/main/java/PodoeMarket/podoemarket/performance/dto/response/PerformanceStatusResponseDTO.java

@@ -30,5 +30,7 @@ public static class PerformanceListDTO {
         private LocalDate startDate;
         private LocalDate endDate;
         private Boolean isUsed;
+        private Boolean isOwner;
+        private String link;
     }
 }

src/main/java/PodoeMarket/podoemarket/performance/service/PerformanceService.java

@@ -215,7 +215,7 @@ public List<PerformanceMainResponseDTO> getStatusPerformanceMain(PerformanceStat
         }
     }
 
-    public Page<PerformanceStatusResponseDTO.PerformanceListDTO> getPerformanceList(PerformanceStatus status, Boolean isUsed, int page, int pageSize) {
+    public Page<PerformanceStatusResponseDTO.PerformanceListDTO> getPerformanceList(UserEntity userInfo, PerformanceStatus status, Boolean isUsed, int page, int pageSize) {
         try {
             LocalDate today = LocalDate.now(ZoneId.of("Asia/Seoul"));
             Pageable pageable = PageRequest.of(page, pageSize, Sort.by("startDate").descending());
@@ -234,7 +234,7 @@ public Page<PerformanceStatusResponseDTO.PerformanceListDTO> getPerformanceList(
                 default -> throw new IllegalArgumentException("잘못된 공연 상태입니다.");
             }
 
-            return result.map(this::getStatusListDTO);
+            return result.map(p -> getStatusListDTO(p, userInfo));
         } catch (Exception e) {
             throw e;
         }
@@ -364,11 +364,13 @@ private PerformanceMainResponseDTO getMainStatusListDTO(PerformanceEntity perfor
                 .build();
     }
 
-    private PerformanceStatusResponseDTO.PerformanceListDTO getStatusListDTO(PerformanceEntity p) {
+    private PerformanceStatusResponseDTO.PerformanceListDTO getStatusListDTO(PerformanceEntity p, UserEntity userInfo) {
         String posterPath = p.getPosterPath() != null
                 ? bucketURL + URLEncoder.encode(p.getPosterPath(), StandardCharsets.UTF_8)
                 : "";
 
+        boolean isOwner = userInfo != null && p.getUser() != null && p.getUser().getId().equals(userInfo.getId());
+
         return PerformanceStatusResponseDTO.PerformanceListDTO.builder()
                 .id(p.getId())
                 .posterPath(posterPath)
@@ -377,6 +379,8 @@ private PerformanceStatusResponseDTO.PerformanceListDTO getStatusListDTO(Perform
                 .startDate(p.getStartDate())
                 .endDate(p.getEndDate())
                 .isUsed(p.getIsUsed())
+                .isOwner(isOwner)
+                .link(p.getLink())
                 .build();
     }
 }