Sync active room stays when booking expected dates change

src/main/kotlin/com/android/trisolarisserver/controller/booking/BookingFlow.kt

@@ -511,6 +511,7 @@ class BookingFlow(
                 room = room,
                 fromAt = checkInAt,
                 toAt = null,
+                plannedCheckoutAt = booking.expectedCheckoutAt,
                 rateSource = parseRateSource(stay.rateSource),
                 nightlyRate = stay.nightlyRate,
                 ratePlanCode = stay.ratePlanCode,
@@ -579,6 +580,7 @@ class BookingFlow(
             throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Invalid date range")
         }
         validateRoomStayBoundsForExpectedDatesUpdate(booking, expectedIn, expectedOut)
+        syncActiveRoomStaysWithBookingExpectedDates(booking, expectedIn, expectedOut)
 
         booking.updatedAt = OffsetDateTime.now()
         bookingRepo.save(booking)
@@ -637,6 +639,32 @@ class BookingFlow(
         }
     }
 
+    private fun syncActiveRoomStaysWithBookingExpectedDates(
+        booking: com.android.trisolarisserver.models.booking.Booking,
+        expectedIn: OffsetDateTime?,
+        expectedOut: OffsetDateTime?
+    ) {
+        val bookingId = booking.id ?: return
+        if (expectedIn == null && expectedOut == null) return
+        val activeStays = roomStayRepo.findActiveByBookingId(bookingId)
+        if (activeStays.isEmpty()) return
+
+        var changed = false
+        activeStays.forEach { stay ->
+            if (booking.status == BookingStatus.OPEN && expectedIn != null && stay.fromAt != expectedIn) {
+                stay.fromAt = expectedIn
+                changed = true
+            }
+            if (expectedOut != null && stay.plannedCheckoutAt != expectedOut) {
+                stay.plannedCheckoutAt = expectedOut
+                changed = true
+            }
+        }
+        if (changed) {
+            roomStayRepo.saveAll(activeStays)
+        }
+    }
+
     @PostMapping("/{bookingId}/billing-policy")
     @ResponseStatus(HttpStatus.NO_CONTENT)
     @Transactional

src/main/kotlin/com/android/trisolarisserver/controller/room/RoomStays.kt

@@ -69,7 +69,7 @@ class RoomStays(
                 roomTypeName = roomType.name,
                 fromAt = stay.fromAt.toString(),
                 checkinAt = booking.checkinAt?.toString(),
-                expectedCheckoutAt = booking.expectedCheckoutAt?.toString(),
+                expectedCheckoutAt = (stay.plannedCheckoutAt ?: booking.expectedCheckoutAt)?.toString(),
                 nightlyRate = stay.nightlyRate
             )
         }

src/main/kotlin/com/android/trisolarisserver/models/room/RoomStay.kt

@@ -33,6 +33,9 @@ class RoomStay(
     @Column(name = "to_at", columnDefinition = "timestamptz")
     var toAt: OffsetDateTime? = null,   // null = active
 
+    @Column(name = "planned_checkout_at", columnDefinition = "timestamptz")
+    var plannedCheckoutAt: OffsetDateTime? = null,
+
     @Column(name = "is_voided", nullable = false)
     var isVoided: Boolean = false,
 

src/main/kotlin/com/android/trisolarisserver/repo/room/RoomStayRepo.kt

@@ -48,7 +48,7 @@ interface RoomStayRepo : JpaRepository<RoomStay, UUID> {
     @Query("""
         select rs.room.id as roomId,
                rs.fromAt as fromAt,
-               b.expectedCheckoutAt as expectedCheckoutAt
+               coalesce(rs.plannedCheckoutAt, b.expectedCheckoutAt) as expectedCheckoutAt
         from RoomStay rs
         join rs.booking b
         where rs.property.id = :propertyId