Merge branch 'develop' of https://github.com/TEAM-BEAT/BEAT-SERVER in…

…to bug/#282
TEAM-BEAT · Dec 3, 2024 · fcd8a0c · fcd8a0c
2 parents 04fc515 + 1bc1520
commit fcd8a0c
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 41 deletions.
diff --git a/src/main/java/com/beat/domain/booking/api/TicketApi.java b/src/main/java/com/beat/domain/booking/api/TicketApi.java
@@ -1,5 +1,7 @@
 package com.beat.domain.booking.api;
 
+import java.util.List;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -52,8 +54,8 @@ public interface TicketApi {
 	ResponseEntity<SuccessResponse<TicketRetrieveResponse>> getTickets(
 		@CurrentMember Long memberId,
 		@PathVariable Long performanceId,
-		@RequestParam(required = false) ScheduleNumber scheduleNumber,
-		@RequestParam(required = false) BookingStatus bookingStatus
+		@RequestParam(required = false) List<ScheduleNumber> scheduleNumbers,
+		@RequestParam(required = false) List<BookingStatus> bookingStatuses
 	);
 
 	@Operation(summary = "예매자 목록 검색 API", description = "메이커가 자신의 공연에 대한 예매자 목록을 검색하는 GET API입니다.")
@@ -84,8 +86,8 @@ ResponseEntity<SuccessResponse<TicketRetrieveResponse>> searchTickets(
 		@CurrentMember Long memberId,
 		@PathVariable Long performanceId,
 		@RequestParam String searchWord,
-		@RequestParam(required = false) ScheduleNumber scheduleNumber,
-		@RequestParam(required = false) BookingStatus bookingStatus
+		@RequestParam(required = false) List<ScheduleNumber> scheduleNumbers,
+		@RequestParam(required = false) List<BookingStatus> bookingStatuses
 	);
 
 	@Operation(summary = "예매자 입금여부 수정 및 웹발신 API", description = "메이커가 자신의 공연에 대한 예매자의 입금여부 정보를 수정한 뒤 예매확정 웹발신을 보내는 PUT API입니다.")

diff --git a/src/main/java/com/beat/domain/booking/api/TicketController.java b/src/main/java/com/beat/domain/booking/api/TicketController.java
@@ -1,5 +1,7 @@
 package com.beat.domain.booking.api;
 
+import java.util.List;
+
 import org.springframework.http.CacheControl;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,14 +39,13 @@ public class TicketController implements TicketApi {
 	public ResponseEntity<SuccessResponse<TicketRetrieveResponse>> getTickets(
 		@CurrentMember Long memberId,
 		@PathVariable Long performanceId,
-		@RequestParam(required = false) ScheduleNumber scheduleNumber,
-		@RequestParam(required = false) BookingStatus bookingStatus) {
-		if (bookingStatus == BookingStatus.BOOKING_DELETED) {
+		@RequestParam(required = false) List<ScheduleNumber> scheduleNumbers,
+		@RequestParam(required = false) List<BookingStatus> bookingStatuses) {
+		if (bookingStatuses != null && bookingStatuses.contains(BookingStatus.BOOKING_DELETED)) {
 			throw new BadRequestException(TicketErrorCode.DELETED_TICKET_RETRIEVE_NOT_ALLOWED);
 		}
 		TicketRetrieveResponse response = ticketService.findAllTicketsByConditions(memberId, performanceId,
-			scheduleNumber,
-			bookingStatus);
+			scheduleNumbers, bookingStatuses);
 		return ResponseEntity.ok(SuccessResponse.of(TicketSuccessCode.TICKET_RETRIEVE_SUCCESS, response));
 	}
 
@@ -54,18 +55,17 @@ public ResponseEntity<SuccessResponse<TicketRetrieveResponse>> searchTickets(
 		@CurrentMember Long memberId,
 		@PathVariable Long performanceId,
 		@RequestParam String searchWord,
-		@RequestParam(required = false) ScheduleNumber scheduleNumber,
-		@RequestParam(required = false) BookingStatus bookingStatus) {
+		@RequestParam(required = false) List<ScheduleNumber> scheduleNumbers,
+		@RequestParam(required = false) List<BookingStatus> bookingStatuses) {
 		if (searchWord.length() < 2) {
 			throw new BadRequestException(TicketErrorCode.SEARCH_WORD_TOO_SHORT);
 		}
-		if (bookingStatus == BookingStatus.BOOKING_DELETED) {
+		if (bookingStatuses != null && bookingStatuses.contains(BookingStatus.BOOKING_DELETED)) {
 			throw new BadRequestException(TicketErrorCode.DELETED_TICKET_RETRIEVE_NOT_ALLOWED);
 		}
 
 		TicketRetrieveResponse response = ticketService.searchAllTicketsByConditions(memberId, performanceId,
-			searchWord,
-			scheduleNumber, bookingStatus);
+			searchWord, scheduleNumbers, bookingStatuses);
 		return ResponseEntity.ok()
 			.cacheControl(CacheControl.noCache())
 			.body(SuccessResponse.of(TicketSuccessCode.TICKET_SEARCH_SUCCESS, response));

diff --git a/src/main/java/com/beat/domain/booking/application/TicketService.java b/src/main/java/com/beat/domain/booking/application/TicketService.java
@@ -1,6 +1,7 @@
 package com.beat.domain.booking.application;
 
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -56,49 +57,61 @@ public class TicketService {
 	private final CoolSmsService coolSmsService;
 
 	public TicketRetrieveResponse findAllTicketsByConditions(Long memberId, Long performanceId,
-		ScheduleNumber scheduleNumber,
-		BookingStatus bookingStatus) {
+		List<ScheduleNumber> scheduleNumbers, List<BookingStatus> bookingStatuses) {
 		Member member = findMember(memberId);
 		Users user = findUser(member);
 		Performance performance = findPerformance(performanceId);
 		performance.validatePerformanceOwnership(user.getId());
-		List<Schedule> schedules = scheduleRepository.findAllByPerformanceId(performanceId);
 
+		List<Schedule> schedules = scheduleRepository.findAllByPerformanceId(performanceId);
 		int totalPerformanceTicketCount = calculateTotalTicketCount(schedules);
 		int totalPerformanceSoldTicketCount = calculateTotalSoldTicketCount(schedules);
 
-		List<Booking> bookings = ticketRepository.findBookings(performanceId, scheduleNumber, bookingStatus);
+		List<Booking> bookings = ticketRepository.findBookings(performanceId, scheduleNumbers, bookingStatuses);
 
 		return findTicketRetrieveResponse(performance, totalPerformanceTicketCount, totalPerformanceSoldTicketCount,
 			bookings);
 	}
 
 	public TicketRetrieveResponse searchAllTicketsByConditions(Long memberId, Long performanceId, String searchWord,
-		ScheduleNumber scheduleNumber, BookingStatus bookingStatus) {
+		List<ScheduleNumber> scheduleNumbers, List<BookingStatus> bookingStatuses) {
 		Member member = findMember(memberId);
 		Users user = findUser(member);
 		Performance performance = findPerformance(performanceId);
 		performance.validatePerformanceOwnership(user.getId());
-		List<Schedule> schedules = scheduleRepository.findAllByPerformanceId(performanceId);
 
+		List<Schedule> schedules = scheduleRepository.findAllByPerformanceId(performanceId);
 		int totalPerformanceTicketCount = calculateTotalTicketCount(schedules);
 		int totalPerformanceSoldTicketCount = calculateTotalSoldTicketCount(schedules);
 
-		String scheduleNumberValue = null;
-		if (scheduleNumber != null) {
-			scheduleNumberValue = scheduleNumber.name();
+		List<String> selectedScheduleNumbers = schedules.stream()
+			.map(schedule -> schedule.getScheduleNumber().name())
+			.toList();
+
+		List<String> selectedBookingStatuses = Arrays.asList(
+			BookingStatus.CHECKING_PAYMENT.name(),
+			BookingStatus.BOOKING_CONFIRMED.name(),
+			BookingStatus.BOOKING_CANCELLED.name(),
+			BookingStatus.REFUND_REQUESTED.name()
+		);
+
+		if (scheduleNumbers != null && !scheduleNumbers.isEmpty()) {
+			selectedScheduleNumbers = scheduleNumbers.stream()
+				.map(Enum::name)
+				.toList();
 		}
 
-		String bookingStatusValue = null;
-		if (bookingStatus != null) {
-			bookingStatusValue = bookingStatus.name();
+		if (bookingStatuses != null && !bookingStatuses.isEmpty()) {
+			selectedBookingStatuses = bookingStatuses.stream()
+				.map(Enum::name)
+				.toList();
 		}
 
 		List<Booking> bookings = ticketRepository.searchBookings(
 			performanceId,
 			searchWord,
-			scheduleNumberValue,
-			bookingStatusValue
+			selectedScheduleNumbers,
+			selectedBookingStatuses
 		);
 
 		log.info("searchTickets result: {}", bookings);

diff --git a/src/main/java/com/beat/domain/booking/dao/TicketRepository.java b/src/main/java/com/beat/domain/booking/dao/TicketRepository.java
@@ -15,8 +15,8 @@ public interface TicketRepository extends JpaRepository<Booking, Long> {
 	@Query("SELECT b FROM Booking b " +
 		"WHERE b.schedule.performance.id = :performanceId " +
 		"AND b.bookingStatus != com.beat.domain.booking.domain.BookingStatus.BOOKING_DELETED " +
-		"AND (:scheduleNumber IS NULL OR b.schedule.scheduleNumber = :scheduleNumber) " +
-		"AND (:bookingStatus IS NULL OR b.bookingStatus = :bookingStatus) " +
+		"AND (:scheduleNumbers IS NULL OR b.schedule.scheduleNumber IN :scheduleNumbers) " +
+		"AND (:bookingStatuses IS NULL OR b.bookingStatus IN :bookingStatuses) " +
 		"ORDER BY CASE b.bookingStatus " +
 		"           WHEN com.beat.domain.booking.domain.BookingStatus.REFUND_REQUESTED THEN 1 " +
 		"           WHEN com.beat.domain.booking.domain.BookingStatus.CHECKING_PAYMENT THEN 2 " +
@@ -26,8 +26,8 @@ public interface TicketRepository extends JpaRepository<Booking, Long> {
 		"         b.createdAt DESC")
 	List<Booking> findBookings(
 		@Param("performanceId") Long performanceId,
-		@Param("scheduleNumber") ScheduleNumber scheduleNumber,
-		@Param("bookingStatus") BookingStatus bookingStatus);
+		@Param("scheduleNumbers") List<ScheduleNumber> scheduleNumbers,
+		@Param("bookingStatuses") List<BookingStatus> bookingStatuses);
 
 	List<Booking> findByBookingStatusAndCancellationDateBefore(BookingStatus bookingStatus,
 		LocalDateTime cancellationDate);
@@ -37,23 +37,24 @@ List<Booking> findByBookingStatusAndCancellationDateBefore(BookingStatus booking
 		FROM booking b
 		JOIN schedule s ON b.schedule_id = s.id
 		WHERE s.performance_id = :performanceId
-		  AND b.booking_status != 'BOOKING_DELETED'
-		  AND (:scheduleNumber IS NULL OR s.schedule_number = :scheduleNumber)
-		  AND(:bookingStatus IS NULL OR b.booking_status = :bookingStatus)
-		  AND MATCH(b.booker_name) AGAINST(:searchWord IN BOOLEAN MODE)
+		    AND b.booking_status != 'BOOKING_DELETED'
+		    AND (s.schedule_number IN (:selectedScheduleNumbers))
+		    AND (b.booking_status IN (:selectedBookingStatuses))
+		    AND MATCH(b.booker_name) AGAINST(:searchWord IN BOOLEAN MODE)
 		ORDER BY
-		     CASE b.booking_status
+		    CASE b.booking_status
 		    WHEN 'REFUND_REQUESTED' THEN 1
 		    WHEN 'CHECKING_PAYMENT' THEN 2
 		    WHEN 'BOOKING_CONFIRMED' THEN 3
 		    WHEN 'BOOKING_CANCELLED' THEN 4
-		  END ASC,
-		  b.created_at DESC
+		    END ASC,
+		    b.created_at DESC
 		""", nativeQuery = true)
 	List<Booking> searchBookings(
 		@Param("performanceId") Long performanceId,
 		@Param("searchWord") String searchWord,
-		@Param("scheduleNumber") String scheduleNumber,
-		@Param("bookingStatus") String bookingStatus);
+		@Param("selectedScheduleNumbers") List<String> selectedScheduleNumbers,
+		@Param("selectedBookingStatuses") List<String> selectedBookingStatuses
+	);
 
 }