fix 공고 상세 조회하기에서 디자이너의 공고 수정/삭제 가능 여부 필드 반환

Author: junilyy

src/main/java/modelly/modelly_be/domain/recruitment/controller/swagger/GuestRecruitmentSwagger.java

@@ -23,7 +23,10 @@ public interface GuestRecruitmentSwagger {
     @Operation(summary = "공고 상세 조회하기", description = """
             공고 상세 조회 시 사용하는 API입니다. (로그인 필요X)
             \n
-            `hasPendingReservation` : 확정 대기 중인 예약 존재 유무 (true: 유, false: 무)
+            `modelHasPendingReservation` : 모델이 신청한 확정 대기 중인 예약 존재 유무 (true: 유, false: 무)\n
+            `designerHasPendingReservation` : 해당 공고의 확정 대기 중인 예약 존재 유무 (true: 유, false: 무)\n
+            `designerHasConfirmedReservation` : 해당 공고의 확정된 예약 중 아직 진행하지 않은 예약 존재 유무 (true: 유, false: 무)\n
+            `canModify` : 디자이너의 해당 공고 수정/삭제 가능 여부 \n
             """)
     ApiResponse<GuestRecruitmentResponseDto> getRecruitment(@AuthenticationPrincipal AuthDetails authDetails, @PathVariable Long recruitmentId);
 

src/main/java/modelly/modelly_be/domain/recruitment/dto/response/GuestRecruitmentResponseDto.java

@@ -27,10 +27,13 @@ public record GuestRecruitmentResponseDto(
     String etc,
     Long reviewCount,
     double averageRating,
-    boolean hasPendingReservation
+    boolean modelHasPendingReservation,
+    boolean designerHasPendingReservation,
+    boolean designerHasConfirmedReservation,
+    boolean canModify
 ) {
 
-    public static GuestRecruitmentResponseDto of(DesignerResponseDto designerProfile, Recruitment recruitment, AverageReview averageReview, boolean isLiked, boolean hasPendingReservation) {
+    public static GuestRecruitmentResponseDto of(DesignerResponseDto designerProfile, Recruitment recruitment, AverageReview averageReview, boolean isLiked, boolean modelHasPendingReservation, boolean designerHasPendingReservation, boolean designerHasConfirmedReservation, boolean canModify) {
         List<RecruitmentSchedule> schedules = recruitment.getRecruitmentDates().stream()
                 .map(date -> RecruitmentSchedule.of(date.getDate(),
                         date.getRecruitmentTimes().stream()
@@ -66,7 +69,10 @@ public static GuestRecruitmentResponseDto of(DesignerResponseDto designerProfile
                 recruitment.getEtc(),
                 averageReview.totalCount(),
                 averageReview.averageRating(),
-                hasPendingReservation
+                modelHasPendingReservation,
+                designerHasPendingReservation,
+                designerHasConfirmedReservation,
+                canModify
         );
     }
 }

src/main/java/modelly/modelly_be/domain/recruitment/service/RecruitmentService.java

@@ -87,7 +87,9 @@ public GuestRecruitmentResponseDto getByIdWithDesigner(Long userId, Long recruit
         AverageReview averageReview = reviewService.calculateRating(recruitment.getDesigner());
 
         boolean isLiked = false;
-        boolean hasPendingReservation = false;
+        boolean modelHasPendingReservation = false;
+        boolean designerHasPendingReservation = false;
+        boolean designerHasConfirmedReservation = false;
 
         if (userId != null){
 
@@ -99,22 +101,37 @@ public GuestRecruitmentResponseDto getByIdWithDesigner(Long userId, Long recruit
                 isLiked = recruitmentLikeService.existsByModelAndRecruitment(model, recruitment);
 
                 // 이미 예약 신청(PENDING)을 했는지 확인
-                hasPendingReservation =
+                modelHasPendingReservation =
                         reservationService.hasReservationByModelAndRecruitment(
                                 model.getId(),
                                 recruitment.getId(),
                                 List.of(ReservationStatus.RESERVATION_PENDING)
                         );
+
             }
+            // DESIGNER 기준 (공고 전체)
+            designerHasPendingReservation =
+                    reservationService.hasPendingReservationByRecruitment(
+                            recruitment.getId()
+                    );
+
+            designerHasConfirmedReservation =
+                    reservationService.hasOngoingConfirmedReservation(
+                            recruitment.getId()
+                    );
 
         }
+        boolean canModify = !designerHasConfirmedReservation && !designerHasPendingReservation;
 
         return GuestRecruitmentResponseDto.of(
                 DesignerResponseDto.from(recruitment.getDesigner()),
                 recruitment,
                 averageReview,
                 isLiked,
-                hasPendingReservation
+                modelHasPendingReservation,
+                designerHasPendingReservation,
+                designerHasConfirmedReservation,
+                canModify
         );
     }
 

src/main/java/modelly/modelly_be/domain/reservation/repository/ReservationRepository.java

@@ -166,4 +166,27 @@ List<Long> findRecruitmentIdsWithOngoingConfirmed(
             @Param("today") LocalDate today,
             @Param("now") LocalTime now
     );
+
+    // 해당 공고의 status인 예약이 endtime 이후인지
+    @Query("""
+        select case when count(r) > 0 then true else false end
+        from Reservation r
+        where r.recruitment.id = :recruitmentId
+          and r.status = :status
+          and (
+                r.date > :today
+                or (r.date = :today and r.endTime > :now)
+              )
+    """)
+    boolean existsOngoingConfirmedReservation(
+            @Param("recruitmentId") Long recruitmentId,
+            @Param("status") ReservationStatus status,
+            @Param("today") LocalDate today,
+            @Param("now") LocalTime now
+    );
+
+    boolean existsByRecruitment_IdAndStatus(
+            Long recruitmentId,
+            ReservationStatus status
+    );
 }

src/main/java/modelly/modelly_be/domain/reservation/service/ReservationService.java

@@ -813,4 +813,26 @@ public boolean hasReservationByModelAndRecruitment(
                         statuses
                 );
     }
+
+    // 확정된 예약 중 끝난 예약이 있는지
+    @Transactional(readOnly = true)
+    public boolean hasOngoingConfirmedReservation(Long recruitmentId) {
+        LocalDate today = LocalDate.now();
+        LocalTime now = LocalTime.now();
+
+        return reservationRepository.existsOngoingConfirmedReservation(
+                recruitmentId,
+                ReservationStatus.RESERVATION_CONFIRMED,
+                today,
+                now
+        );
+    }
+
+    @Transactional(readOnly = true)
+    public boolean hasPendingReservationByRecruitment(Long recruitmentId) {
+        return reservationRepository.existsByRecruitment_IdAndStatus(
+                recruitmentId,
+                ReservationStatus.RESERVATION_PENDING
+        );
+    }
 }