pricelees/roomescape-refactored
1
0
Fork 0
generated from pricelees/issue-pr-template
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[#16] Reservation 도메인 코드 코틀린 마이그레이션 #17

Merged
pricelees merged 40 commits from refactor/#16 into main 2025-07-21 12:08:56 +00:00
Conversation 0 Commits 40 Files Changed 81 +12 -6
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c2d4e10160 - Show all commits

2
src/main/java/roomescape/reservation/business/ReservationService.kt
View File

@ -201,7 +201,7 @@ class ReservationService(
fun approveWaiting(reservationId: Long, memberId: Long) {
validateIsMemberAdmin(memberId)
if (reservationRepository. isExistConfirmedReservation(reservationId)) {
if (reservationRepository.isExistConfirmedReservation(reservationId)) {
throw RoomescapeException(ErrorType.RESERVATION_DUPLICATED, HttpStatus.CONFLICT)
}
reservationRepository.updateStatusByReservationId(reservationId, ReservationStatus.CONFIRMED_PAYMENT_REQUIRED)

16
src/main/java/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt
View File

@ -28,11 +28,17 @@ interface ReservationRepository
@Query("""
SELECT EXISTS (
SELECT 1
FROM ReservationEntity r
WHERE r.id = :id
AND r.reservationStatus != 'WAITING'
)
""")
FROM ReservationEntity r2
WHERE r2.id = :id
AND EXISTS (
SELECT 1 FROM ReservationEntity r
WHERE r.theme.id = r2.theme.id
AND r.reservationTime.id = r2.reservationTime.id
AND r.date = r2.date
AND r.reservationStatus != 'WAITING'
)
)
""")
fun isExistConfirmedReservation(@Param("id") reservationId: Long): Boolean
@Query("""