Fix booking snapshot lazy loading
All checks were successful
build-and-deploy / build-deploy (push) Successful in 33s
All checks were successful
build-and-deploy / build-deploy (push) Successful in 33s
This commit is contained in:
@@ -18,14 +18,14 @@ class BookingSnapshotBuilder(
|
||||
private val guestVehicleRepo: GuestVehicleRepo
|
||||
) {
|
||||
fun build(propertyId: UUID, bookingId: UUID): BookingDetailResponse {
|
||||
val booking = bookingRepo.findById(bookingId).orElseThrow {
|
||||
val booking = bookingRepo.findDetailedById(bookingId).orElseThrow {
|
||||
ResponseStatusException(HttpStatus.NOT_FOUND, "Booking not found")
|
||||
}
|
||||
if (booking.property.id != propertyId) {
|
||||
throw ResponseStatusException(HttpStatus.NOT_FOUND, "Booking not found for property")
|
||||
}
|
||||
|
||||
val stays = roomStayRepo.findByBookingId(bookingId)
|
||||
val stays = roomStayRepo.findByBookingIdWithRoom(bookingId)
|
||||
val activeRooms = stays.filter { it.toAt == null }
|
||||
val roomsToShow = activeRooms.ifEmpty { stays }
|
||||
val roomNumbers = roomsToShow.map { it.room.roomNumber }
|
||||
|
||||
@@ -13,4 +13,7 @@ interface BookingRepo : JpaRepository<Booking, UUID> {
|
||||
fun findByPropertyIdAndStatusInOrderByCreatedAtDesc(propertyId: UUID, status: Collection<com.android.trisolarisserver.models.booking.BookingStatus>): List<Booking>
|
||||
@EntityGraph(attributePaths = ["primaryGuest"])
|
||||
fun findByPropertyIdOrderByCreatedAtDesc(propertyId: UUID): List<Booking>
|
||||
|
||||
@EntityGraph(attributePaths = ["property", "primaryGuest", "createdBy"])
|
||||
fun findDetailedById(id: UUID): java.util.Optional<Booking>
|
||||
}
|
||||
|
||||
@@ -43,6 +43,14 @@ interface RoomStayRepo : JpaRepository<RoomStay, UUID> {
|
||||
""")
|
||||
fun findByBookingId(@Param("bookingId") bookingId: UUID): List<RoomStay>
|
||||
|
||||
@Query("""
|
||||
select rs
|
||||
from RoomStay rs
|
||||
join fetch rs.room r
|
||||
where rs.booking.id = :bookingId
|
||||
""")
|
||||
fun findByBookingIdWithRoom(@Param("bookingId") bookingId: UUID): List<RoomStay>
|
||||
|
||||
@Query("""
|
||||
select rs
|
||||
from RoomStay rs
|
||||
|
||||
Reference in New Issue
Block a user