generated from pricelees/issue-pr-template
[#34] 회원 / 인증 도메인 재정의 #43
@ -94,7 +94,10 @@ class ReservationService(
|
|||||||
fun findUserSummaryReservation(user: CurrentUserContext): ReservationSummaryRetrieveListResponse {
|
fun findUserSummaryReservation(user: CurrentUserContext): ReservationSummaryRetrieveListResponse {
|
||||||
log.info { "[ReservationService.findSummaryByMemberId] 예약 조회 시작: userId=${user.id}" }
|
log.info { "[ReservationService.findSummaryByMemberId] 예약 조회 시작: userId=${user.id}" }
|
||||||
|
|
||||||
val reservations: List<ReservationEntity> = reservationRepository.findAllByUserId(user.id)
|
val reservations: List<ReservationEntity> = reservationRepository.findAllByUserIdAndStatusIsIn(
|
||||||
|
userId = user.id,
|
||||||
|
statuses = listOf(ReservationStatus.CONFIRMED, ReservationStatus.CANCELED)
|
||||||
|
)
|
||||||
|
|
||||||
return ReservationSummaryRetrieveListResponse(reservations.map {
|
return ReservationSummaryRetrieveListResponse(reservations.map {
|
||||||
val schedule: ScheduleSummaryResponse = scheduleService.findSummaryById(it.scheduleId)
|
val schedule: ScheduleSummaryResponse = scheduleService.findSummaryById(it.scheduleId)
|
||||||
|
|||||||
@ -7,7 +7,7 @@ import java.time.LocalDate
|
|||||||
|
|
||||||
interface ReservationRepository : JpaRepository<ReservationEntity, Long> {
|
interface ReservationRepository : JpaRepository<ReservationEntity, Long> {
|
||||||
|
|
||||||
fun findAllByUserId(userId: Long): List<ReservationEntity>
|
fun findAllByUserIdAndStatusIsIn(userId: Long, statuses: List<ReservationStatus>): List<ReservationEntity>
|
||||||
|
|
||||||
@Query("""
|
@Query("""
|
||||||
SELECT s.themeId
|
SELECT s.themeId
|
||||||
|
|||||||
@ -388,6 +388,17 @@ class ReservationApiTest(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PENDING 예약은 조회되지 않음.
|
||||||
|
dummyInitializer.createPendingReservation(
|
||||||
|
adminToken = adminToken,
|
||||||
|
reserverToken = userToken,
|
||||||
|
themeRequest = ThemeFixture.createRequest.copy(name = "theme-$4"),
|
||||||
|
scheduleRequest = ScheduleFixture.createRequest.copy(
|
||||||
|
date = LocalDate.now().plusDays(1),
|
||||||
|
time = LocalTime.now()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
runTest(
|
runTest(
|
||||||
token = userToken,
|
token = userToken,
|
||||||
on = {
|
on = {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user