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

Use occupied_rooms from occupancy report for past-date OTB, excluding overflow

Browse source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
jtricerolph 2026-07-20 12:37:28 +00:00
parent d8ad753a62
commit f0d4fb3beb
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
backend/api/public.py
View file

@ -53,10 +53,12 @@ async def get_rooms_forecast(
row = result.fetchone() row = result.fetchone()
fallback_total_rooms = int(row.config_value) if row and row.config_value else 30 fallback_total_rooms = int(row.config_value) if row and row.config_value else 30
# Pre-fetch available rooms per day using is_included flag from room categories settings # Pre-fetch available and occupied rooms per day using is_included flag from room category settings
occ_result = await db.execute( occ_result = await db.execute(
text(""" text("""
SELECT o.date, SUM(COALESCE(o.available, 0) - COALESCE(o.maintenance, 0)) AS available_rooms SELECT o.date,
SUM(COALESCE(o.available, 0) - COALESCE(o.maintenance, 0)) AS available_rooms,
SUM(COALESCE(o.occupied, 0)) AS occupied_rooms
FROM newbook_occupancy_report_data o FROM newbook_occupancy_report_data o
JOIN newbook_room_categories c ON o.category_id = c.site_id JOIN newbook_room_categories c ON o.category_id = c.site_id
WHERE o.date >= :start_date AND o.date <= :end_date WHERE o.date >= :start_date AND o.date <= :end_date
@ -65,7 +67,9 @@ async def get_rooms_forecast(
"""), """),
{"start_date": start, "end_date": end} {"start_date": start, "end_date": end}
) )
available_by_date = {row.date: int(row.available_rooms) for row in occ_result.fetchall() if row.available_rooms} occ_by_date = {row.date: row for row in occ_result.fetchall()}
available_by_date = {d: int(r.available_rooms) for d, r in occ_by_date.items() if r.available_rooms}
occupied_by_date = {d: int(r.occupied_rooms) for d, r in occ_by_date.items() if r.occupied_rooms}
data = [] data = []
current = start current = start
@ -120,16 +124,17 @@ async def get_rooms_forecast(
pickup_guests = round(pickup_rooms * guests_per_room) pickup_guests = round(pickup_rooms * guests_per_room)
forecast_guests = otb_guests + pickup_guests forecast_guests = otb_guests + pickup_guests
else: else:
# Past date - get actuals from stats # Past date - use occupied count from occupancy report (is_included only, no overflow)
otb_rooms = occupied_by_date.get(current, 0)
# Guest count still comes from stats (no per-category guest breakdown available)
stats_result = await db.execute( stats_result = await db.execute(
text(""" text("""
SELECT booking_count, guests_count FROM newbook_bookings_stats SELECT guests_count FROM newbook_bookings_stats
WHERE date = :target_date WHERE date = :target_date
"""), """),
{"target_date": current} {"target_date": current}
) )
stats_row = stats_result.fetchone() stats_row = stats_result.fetchone()
otb_rooms = stats_row.booking_count if stats_row else 0
otb_guests = stats_row.guests_count if stats_row and stats_row.guests_count else 0 otb_guests = stats_row.guests_count if stats_row and stats_row.guests_count else 0
forecast_rooms = otb_rooms forecast_rooms = otb_rooms
forecast_guests = otb_guests forecast_guests = otb_guests