[TEST] 열차 조회 서비스 테스트(TrainSearchApplicationService, TrainSearchService)

src/main/java/com/sudo/railo/train/application/TrainSearchApplicationService.java

@@ -2,15 +2,19 @@
 
 import java.util.List;
 
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.sudo.railo.train.application.dto.TrainScheduleBasicInfo;
 import com.sudo.railo.train.application.dto.request.TrainCarListRequest;
 import com.sudo.railo.train.application.dto.request.TrainCarSeatDetailRequest;
+import com.sudo.railo.train.application.dto.request.TrainSearchRequest;
+import com.sudo.railo.train.application.dto.response.OperationCalendarItem;
 import com.sudo.railo.train.application.dto.response.TrainCarInfo;
 import com.sudo.railo.train.application.dto.response.TrainCarListResponse;
 import com.sudo.railo.train.application.dto.response.TrainCarSeatDetailResponse;
+import com.sudo.railo.train.application.dto.response.TrainSearchSlicePageResponse;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,6 +28,24 @@ public class TrainSearchApplicationService {
 	private final TrainSearchService trainSearchService;
 	private final TrainSeatQueryService trainCarService;
 
+	/**
+	 * 운행 캘린더 조회
+	 */
+	public List<OperationCalendarItem> getOperationCalendar() {
+		return trainSearchService.getOperationCalendar();
+	}
+
+	/**
+	 * 통합 열차 조회 (열차 스케줄 검색)
+	 */
+	public TrainSearchSlicePageResponse searchTrains(TrainSearchRequest request, Pageable pageable) {
+		TrainSearchSlicePageResponse response = trainSearchService.searchTrains(request, pageable);
+
+		log.info("열차 검색 완료: {} 건 조회, hasNext: {}", response.numberOfElements(), response.hasNext());
+
+		return response;
+	}
+
 	/**
 	 * 열차 객차 목록 조회 (잔여 좌석이 있는 객차만)
 	 */
@@ -47,6 +69,7 @@ public TrainCarListResponse getAvailableTrainCars(TrainCarListRequest request) {
 			scheduleInfo.trainClassificationCode(), scheduleInfo.trainNumber());
 
 		return TrainCarListResponse.of(
+			request.trainScheduleId(),
 			recommendedCarNumber,
 			availableCars.size(),
 			scheduleInfo.trainClassificationCode(),
@@ -73,12 +96,17 @@ public TrainCarSeatDetailResponse getTrainCarSeatDetail(TrainCarSeatDetailReques
 	 * TODO: 조금 더 고도화된 객차 추천 알고리즘 필요
 	 */
 	private String selectRecommendedCar(List<TrainCarInfo> availableCars, int passengerCount) {
-		// 승객 수보다 잔여 좌석이 많은 객차 중에서 중간 위치 선택
-		return availableCars.stream()
+		// 승객 수보다 잔여 좌석이 많은 객차 필터링
+		List<TrainCarInfo> suitableCars = availableCars.stream()
 			.filter(car -> car.remainingSeats() >= passengerCount)
-			.skip(availableCars.size() / 2) // 중간 객차 선택
-			.findFirst()
-			.map(TrainCarInfo::carNumber)
-			.orElse(availableCars.get(0).carNumber()); // 없으면 첫 번째 객차
+			.toList();
+
+		// 적합한 객차가 있으면 중간 위치 선택, 없으면 첫 번째 객차
+		if (!suitableCars.isEmpty()) {
+			int middleIndex = suitableCars.size() / 2;
+			return suitableCars.get(middleIndex).carNumber();
+		}
+
+		return availableCars.get(0).carNumber();
 	}
 }

src/main/java/com/sudo/railo/train/application/TrainSearchService.java

@@ -60,7 +60,7 @@ public class TrainSearchService {
 
 	/**
 	 * 운행 캘린더 조회
-	 * @return
+	 * @return List<OperationCalendarItem>
 	 */
 	public List<OperationCalendarItem> getOperationCalendar() {
 		LocalDate startDate = LocalDate.now();
@@ -78,7 +78,7 @@ public List<OperationCalendarItem> getOperationCalendar() {
 			})
 			.toList();
 
-		log.info("운행 캘린더 조회 완료: {} ~ {} ({} 일), 운행일수: {}",
+		log.info("운행 캘린더 조회 : {} ~ {} ({} 일), 운행일수: {}",
 			startDate, endDate, calendar.size(), datesWithSchedule.size());
 
 		return calendar;
@@ -140,7 +140,7 @@ public TrainSearchSlicePageResponse searchTrains(TrainSearchRequest request, Pag
 		List<TrainSearchResponse> trainSearchResults = processTrainSearchResults(trainInfoSlice.getContent(), fare,
 			request);
 
-		log.info("Slice 기반 열차 조회 완료: {}건 조회, hasNext: {}", trainSearchResults.size(), trainInfoSlice.hasNext());
+		log.info("Slice 기반 열차 조회: {}건 조회, hasNext: {}", trainSearchResults.size(), trainInfoSlice.hasNext());
 
 		return createTrainSearchPageResponse(trainSearchResults, trainInfoSlice);
 	}
@@ -281,8 +281,9 @@ private TrainSearchSlicePageResponse createTrainSearchPageResponse(List<TrainSea
 	private TrainSearchResponse createTrainSearchResponse(TrainBasicInfo trainInfo, SectionSeatStatus sectionStatus,
 		StationFare fare, int passengerCount) {
 
-		// 입석 가능 여부 (일반실이 매진되었을 때만 입석 표시)
-		boolean hasStandingForStandard = !sectionStatus.canReserveStandard();
+		// 입석 가능 여부 (일반실이 예약 불가능하고 입석이 요청 인원을 수용 가능한 경우)
+		boolean hasStandingForStandard = !sectionStatus.canReserveStandard()
+			&& sectionStatus.canReserveStanding(passengerCount, standingRatio);
 
 		// 1. 좌석 타입별 정보 생성 (일반실 / 특실)
 		SeatTypeInfo standardSeatInfo = SeatTypeInfo.create(

src/main/java/com/sudo/railo/train/application/dto/response/SeatTypeInfo.java

@@ -37,7 +37,8 @@ public static SeatTypeInfo create(int availableSeats,
 		boolean hasStandingOption,
 		boolean canReserve) {
 
-		SeatAvailabilityStatus status = determineSeatStatus(availableSeats, passengerCount, hasStandingOption);
+		SeatAvailabilityStatus status = determineSeatStatus(availableSeats, passengerCount, hasStandingOption,
+			totalSeats);
 
 		String displayText = createDisplayText(status, seatTypeName);
 		String description = createDescription(status, availableSeats, passengerCount);
@@ -49,18 +50,22 @@ public static SeatTypeInfo create(int availableSeats,
 	 * 좌석 수와 승객 수로 예약 가능한 좌석 상태 결정
 	 */
 	private static SeatAvailabilityStatus determineSeatStatus(int availableSeats, int passengerCount,
-		boolean hasStandingOption) {
+		boolean hasStandingOption, int totalSeats) {
 		if (availableSeats == 0) {
 			// 좌석은 매진이지만 입석이 가능한 경우
 			return hasStandingOption ? SeatAvailabilityStatus.STANDING_ONLY : SeatAvailabilityStatus.SOLD_OUT;
 		}
 
+		// 좌석 부족
 		if (availableSeats < passengerCount) {
-			return SeatAvailabilityStatus.INSUFFICIENT;
+			// 입석이 가능하다면 STANDING_ONLY, 불가능하다면 INSUFFICIENT
+			return hasStandingOption ? SeatAvailabilityStatus.STANDING_ONLY : SeatAvailabilityStatus.INSUFFICIENT;
 		}
 
-		if (availableSeats >= passengerCount + 20) {
-			return SeatAvailabilityStatus.AVAILABLE;
+		double availabilityRatio = (double)availableSeats / totalSeats;
+
+		if (availabilityRatio >= 0.25) {
+			return SeatAvailabilityStatus.AVAILABLE; // 25% 이상이면 여유
 		} else {
 			return SeatAvailabilityStatus.LIMITED;
 		}

src/main/java/com/sudo/railo/train/application/dto/response/TrainCarListResponse.java

@@ -10,6 +10,9 @@
 @Schema(description = "열차 객차 목록 조회 응답")
 public record TrainCarListResponse(
 
+	@Schema(description = "열차 스케줄 ID", example = "26")
+	Long trainScheduleId,
+
 	@Schema(description = "AI가 추천하는 최적 객차 번호 (승객수, 위치 고려)", example = "14")
 	String recommendedCarNumber,
 
@@ -25,10 +28,10 @@ public record TrainCarListResponse(
 	@Schema(description = "좌석 선택 가능한 객차 정보 목록")
 	List<TrainCarInfo> carInfos
 ) {
-	public static TrainCarListResponse of(String recommendedCarNumber, int totalCarCount,
+	public static TrainCarListResponse of(Long trainScheduleId, String recommendedCarNumber, int totalCarCount,
 		String trainClassificationCode, String trainNumber,
 		List<TrainCarInfo> carInfos) {
-		return new TrainCarListResponse(recommendedCarNumber, totalCarCount,
+		return new TrainCarListResponse(trainScheduleId, recommendedCarNumber, totalCarCount,
 			trainClassificationCode, trainNumber, carInfos);
 	}
 }

src/main/java/com/sudo/railo/train/application/dto/response/TrainSearchResponse.java

@@ -98,7 +98,7 @@ private static void validateTrainSearchData(Long trainScheduleId, String trainNu
 	/**
 	 * 입석 정보 존재 여부
 	 */
-	public boolean hasStanding() {
+	public boolean hasStandingInfo() {
 		return standing != null;
 	}
 

src/main/java/com/sudo/railo/train/application/validator/TrainSearchValidator.java

@@ -33,6 +33,9 @@ private void validateOperationDate(TrainSearchRequest request) {
 		}
 	}
 
+	/**
+	 * 예약 날짜가 오늘(date)이면, 시(hour) 단위로만 비교
+	 */
 	private void validateDepartureTime(TrainSearchRequest request) {
 		if (request.operationDate().equals(LocalDate.now())) {
 			int requestHour = Integer.parseInt(request.departureHour());

src/main/java/com/sudo/railo/train/exception/TrainErrorCode.java

@@ -15,7 +15,7 @@ public enum TrainErrorCode implements ErrorCode {
 	TRAIN_SCHEDULE_NOT_FOUND("해당 날짜에 운행하는 열차가 없습니다.", HttpStatus.NOT_FOUND, "T4001"),
 	TRAIN_OPERATION_CANCELLED("해당 열차는 운행이 취소되었습니다.", HttpStatus.BAD_REQUEST, "T4002"),
 	TRAIN_OPERATION_DELAYED("해당 열차는 지연 운행 중입니다.", HttpStatus.BAD_REQUEST, "T4003"),
-	TRAIN_SCHEDULE_DETAIL_NOT_FOUND("요청하신 열차 스케줄이 존재하지 않습니다.", HttpStatus.NOT_FOUND, "T4004"),
+	TRAIN_SCHEDULE_DETAIL_NOT_FOUND("해당 열차 스케줄을 찾을 수 없습니다.", HttpStatus.NOT_FOUND, "T4004"),
 	NO_AVAILABLE_CARS("잔여 좌석이 있는 객차가 없습니다.", HttpStatus.NOT_FOUND, "TR_4005"),
 	TRAIN_CAR_NOT_FOUND("해당 객차를 찾을 수 없습니다.", HttpStatus.NOT_FOUND, "TR_4006"),
 

src/main/java/com/sudo/railo/train/infrastructure/TrainCarRepository.java

@@ -11,4 +11,6 @@
 public interface TrainCarRepository extends JpaRepository<TrainCar, Long> {
 
 	List<TrainCar> findByTrainIn(Collection<Train> trains);
+
+	List<TrainCar> findAllByTrainId(Long trainId);
 }

src/main/java/com/sudo/railo/train/presentation/TrainSearchController.java

@@ -46,7 +46,7 @@ public class TrainSearchController {
 	@Operation(summary = "운행 캘린더 조회", description = "금일로부터 한 달간의 운행 캘린더를 조회합니다.")
 	public SuccessResponse<List<OperationCalendarItem>> getOperationCalendar() {
 		log.info("운행 캘린더 조회");
-		List<OperationCalendarItem> calendar = trainSearchService.getOperationCalendar();
+		List<OperationCalendarItem> calendar = trainSearchApplicationService.getOperationCalendar();
 		log.info("운행 캘린더 조회: {} 건", calendar.size());
 
 		return SuccessResponse.of(TrainSearchSuccess.OPERATION_CALENDAR_SUCCESS, calendar);
@@ -70,7 +70,7 @@ public SuccessResponse<TrainSearchSlicePageResponse> searchTrainSchedules(
 			request.operationDate(), request.passengerCount(), request.departureHour(),
 			pageable.getPageNumber(), pageable.getPageSize());
 
-		TrainSearchSlicePageResponse response = trainSearchService.searchTrains(request, pageable);
+		TrainSearchSlicePageResponse response = trainSearchApplicationService.searchTrains(request, pageable);
 
 		return SuccessResponse.of(TrainSearchSuccess.TRAIN_SEARCH_SUCCESS, response);
 	}

src/test/java/com/sudo/railo/support/helper/ReservationTestHelper.java

@@ -6,6 +6,7 @@
 import java.util.List;
 
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.sudo.railo.booking.domain.Reservation;
 import com.sudo.railo.booking.domain.SeatReservation;
@@ -20,7 +21,6 @@
 import com.sudo.railo.train.domain.Train;
 import com.sudo.railo.train.domain.type.CarType;
 
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 
 @Component
@@ -35,7 +35,8 @@ public class ReservationTestHelper {
 	/**
 	 * 기본 예약 생성 메서드
 	 */
-	public Reservation createReservation(Member member, TrainScheduleWithStopStations scheduleWithStops) {
+	public Reservation createReservation(Member member,
+		TrainScheduleWithStopStations scheduleWithStops) {
 		Reservation reservation = Reservation.builder()
 			.trainSchedule(scheduleWithStops.trainSchedule())
 			.member(member)
@@ -55,6 +56,78 @@ public Reservation createReservation(Member member, TrainScheduleWithStopStation
 		return reservation;
 	}
 
+	/**
+	 * 특정 좌석 ID들에 대한 좌석 예약 생성 (출발, 도착 정차역 직접 지정)
+	 *
+	 * @param member 예약할 회원
+	 * @param scheduleWithStops 열차 스케줄 및 정차역 정보
+	 * @param departureStop 출발 정차역
+	 * @param arrivalStop 도착 정차역
+	 * @param seatIds 예약할 좌석 ID 목록
+	 * @param passengerType 승객 유형 (성인, 어린이 등)
+	 * @return 생성된 Reservation 객체
+	 */
+	public Reservation createReservationWithSeatIds(Member member,
+		TrainScheduleWithStopStations scheduleWithStops,
+		ScheduleStop departureStop,
+		ScheduleStop arrivalStop,
+		List<Long> seatIds,
+		PassengerType passengerType) {
+
+		Reservation reservation = Reservation.builder()
+			.trainSchedule(scheduleWithStops.trainSchedule())
+			.member(member)
+			.reservationCode("SEAT-" + System.currentTimeMillis())
+			.tripType(TripType.OW)
+			.totalPassengers(seatIds.size())
+			.passengerSummary("[{\"passengerType\":\"" + passengerType.name() + "\",\"count\":" + seatIds.size() + "}]")
+			.reservationStatus(ReservationStatus.RESERVED)
+			.expiresAt(LocalDateTime.now().plusMinutes(10))
+			.fare(50000 * seatIds.size())
+			.departureStop(departureStop)
+			.arrivalStop(arrivalStop)
+			.build();
+
+		reservationRepository.save(reservation);
+		createSeatReservations(reservation, seatIds, passengerType);
+		return reservation;
+	}
+
+	/**
+	 * 지정한 인원 수만큼 입석 예약 생성 (출발, 도착 정차역 직접 지정, seat 없이)
+	 *
+	 * @param member 예약할 회원
+	 * @param scheduleWithStops 열차 스케줄 및 정차역 정보
+	 * @param departureStop 출발 정차역
+	 * @param arrivalStop 도착 정차역
+	 * @param standingCount 입석 인원 수
+	 * @return 생성된 Reservation 객체
+	 */
+	public Reservation createStandingReservation(Member member,
+		TrainScheduleWithStopStations scheduleWithStops,
+		ScheduleStop departureStop,
+		ScheduleStop arrivalStop,
+		int standingCount) {
+
+		Reservation reservation = Reservation.builder()
+			.trainSchedule(scheduleWithStops.trainSchedule())
+			.member(member)
+			.reservationCode("STANDING-" + System.currentTimeMillis())
+			.tripType(TripType.OW)
+			.totalPassengers(standingCount)
+			.passengerSummary("[{\"passengerType\":\"ADULT\",\"count\":" + standingCount + "}]")
+			.reservationStatus(ReservationStatus.RESERVED)
+			.expiresAt(LocalDateTime.now().plusMinutes(10))
+			.fare((int)(50000 * 0.85) * standingCount)
+			.departureStop(departureStop)
+			.arrivalStop(arrivalStop)
+			.build();
+
+		reservationRepository.save(reservation);
+		createStandingSeatReservations(reservation, standingCount);
+		return reservation;
+	}
+
 	/**
 	 * 좌석 예약 생성 메서드
 	 */
@@ -74,6 +147,41 @@ private void createSeatReservation(Reservation reservation) {
 		seatReservationRepository.saveAll(seatReservations);
 	}
 
+	/**
+	 * 주어진 좌석 ID들로 SeatReservation 생성
+	 */
+	private void createSeatReservations(Reservation reservation, List<Long> seatIds, PassengerType passengerType) {
+		List<Seat> seats = trainTestHelper.getSeatsByIds(seatIds);
+
+		List<SeatReservation> seatReservations = seats.stream()
+			.map(seat -> SeatReservation.builder()
+				.trainSchedule(reservation.getTrainSchedule())
+				.seat(seat)
+				.reservation(reservation)
+				.passengerType(passengerType)
+				.build())
+			.toList();
+
+		seatReservationRepository.saveAll(seatReservations);
+	}
+
+	/**
+	 * Seat=null로 승객수만큼 입석 SeatReservations 생성
+	 */
+	private void createStandingSeatReservations(Reservation reservation, int count) {
+		List<SeatReservation> seatReservations =
+			java.util.stream.IntStream.range(0, count)
+				.mapToObj(i -> SeatReservation.builder()
+					.trainSchedule(reservation.getTrainSchedule())
+					.seat(null) // 입석 처리
+					.reservation(reservation)
+					.passengerType(PassengerType.ADULT)
+					.build())
+				.toList();
+
+		seatReservationRepository.saveAll(seatReservations);
+	}
+
 	private ScheduleStop getDepartureStop(List<ScheduleStop> scheduleStops) {
 		if (scheduleStops.isEmpty()) {
 			throw new IllegalArgumentException("출발역을 찾을 수 없습니다.");