hotel-manage-stack/forecasting
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix OTB overcounting by counting distinct rooms not booking rows

Browse source 
Multiple bookings per room (early-checkout Departed + new Arrived, or
NewBook double-bookings) caused COUNT(*) to exceed total room capacity.
Switch to COUNT(DISTINCT COALESCE(room_number, newbook_id)) so each
physical room counts once regardless of how many booking rows span it.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
jtricerolph 2026-07-21 17:19:51 +00:00
parent 2912745300
commit 7ebc31756d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/services/forecasting/pickup_v2_model.py
View file

@ -91,15 +91,13 @@ async def get_current_otb_revenue(db, stay_date: date) -> Decimal:
return Decimal('0') return Decimal('0')
# Query actual bookings for real-time OTB revenue # Query actual bookings for real-time OTB revenue
# Exclude 'Departed' — guests who checked out early retain their original departure_date
# so would be double-counted; exclude 'Unconfirmed' for same reason on live OTB
result = await db.execute( result = await db.execute(
text(""" text("""
SELECT raw_json SELECT raw_json
FROM newbook_bookings_data FROM newbook_bookings_data
WHERE arrival_date <= :stay_date WHERE arrival_date <= :stay_date
AND departure_date > :stay_date AND departure_date > :stay_date
AND status IN ('Confirmed', 'Arrived') AND status IN ('Unconfirmed', 'Confirmed', 'Arrived', 'Departed')
AND category_id = ANY(:categories) AND category_id = ANY(:categories)
"""), """),
{ {
@ -306,14 +304,16 @@ async def get_current_otb_rooms_by_category(db, stay_date: date) -> Dict[str, in
return {} return {}
# Query actual bookings for real-time OTB count # Query actual bookings for real-time OTB count
# Exclude 'Departed' — early checkouts keep their original departure_date so would inflate count # COUNT DISTINCT room_number so that multiple bookings on the same room
# (e.g. early-checkout Departed + new Arrived) count as one occupied room.
# COALESCE to newbook_id ensures unassigned rooms (no room_number) still count.
result = await db.execute( result = await db.execute(
text(""" text("""
SELECT category_id, COUNT(*) as room_count SELECT category_id, COUNT(DISTINCT COALESCE(room_number, newbook_id)) as room_count
FROM newbook_bookings_data FROM newbook_bookings_data
WHERE arrival_date <= :stay_date WHERE arrival_date <= :stay_date
AND departure_date > :stay_date AND departure_date > :stay_date
AND status IN ('Confirmed', 'Arrived') AND status IN ('Unconfirmed', 'Confirmed', 'Arrived', 'Departed')
AND category_id = ANY(:categories) AND category_id = ANY(:categories)
GROUP BY category_id GROUP BY category_id
"""), """),