Skip to content

Commit 540460f

Browse files
committed
Merge remote-tracking branch 'origin/main' into develop
2 parents 226a151 + e23d77f commit 540460f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/main/kotlin/com/wafflestudio/csereal/core/reservation/database/ReservationRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ interface ReservationRepository : JpaRepository<ReservationEntity, Long> {
2323
): List<ReservationEntity>
2424

2525
fun deleteAllByRecurrenceId(recurrenceId: UUID)
26-
fun findByRecurrenceId(recurrenceId: UUID): ReservationEntity?
26+
fun findFirstByRecurrenceId(recurrenceId: UUID): ReservationEntity?
2727
}

src/main/kotlin/com/wafflestudio/csereal/core/reservation/service/ReservationService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class ReservationServiceImpl(
106106

107107
override fun cancelRecurring(recurrenceId: UUID) {
108108
val user = userService.getLoginUser()
109-
val reservation = reservationRepository.findByRecurrenceId(recurrenceId)
109+
val reservation = reservationRepository.findFirstByRecurrenceId(recurrenceId)
110110
?: throw CserealException.Csereal404("reservation not found")
111111
if (!isCurrentUserStaff() && user.id != reservation.user.id) {
112112
throw CserealException.Csereal403("Cannot cancel other's reservation")

0 commit comments

Comments
 (0)