Migration to guest_table for conversion works
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
import asyncio
|
||||
import xml.etree.ElementTree as ET
|
||||
from datetime import datetime
|
||||
from datetime import UTC, datetime
|
||||
from decimal import Decimal
|
||||
from typing import Any
|
||||
|
||||
@@ -12,6 +12,7 @@ from sqlalchemy.orm import selectinload
|
||||
|
||||
from .db import (
|
||||
Conversion,
|
||||
ConversionGuest,
|
||||
ConversionRoom,
|
||||
Customer,
|
||||
HashedCustomer,
|
||||
@@ -73,6 +74,70 @@ class ConversionService:
|
||||
f"session must be AsyncSession or SessionMaker, got {type(session)}"
|
||||
)
|
||||
|
||||
async def _get_or_create_conversion_guest(
|
||||
self,
|
||||
hotel_id: str,
|
||||
guest_id: str | None,
|
||||
guest_first_name: str | None,
|
||||
guest_last_name: str | None,
|
||||
guest_email: str | None,
|
||||
guest_country_code: str | None,
|
||||
guest_birth_date,
|
||||
session: AsyncSession,
|
||||
) -> ConversionGuest | None:
|
||||
"""Get or create a ConversionGuest record for the given guest data.
|
||||
|
||||
Uses (hotel_id, guest_id) as the natural key to identify a guest.
|
||||
If a guest with this key exists, updates it with new data.
|
||||
If not, creates a new guest record.
|
||||
|
||||
Returns the ConversionGuest record, or None if no guest data provided.
|
||||
"""
|
||||
# Don't create a ConversionGuest if we have no guest information
|
||||
if not any(
|
||||
[guest_first_name, guest_last_name, guest_email, guest_country_code, guest_birth_date]
|
||||
):
|
||||
return None
|
||||
|
||||
now = datetime.now(UTC)
|
||||
|
||||
# Try to find existing guest by (hotel_id, guest_id)
|
||||
if guest_id:
|
||||
result = await session.execute(
|
||||
select(ConversionGuest).where(
|
||||
(ConversionGuest.hotel_id == hotel_id)
|
||||
& (ConversionGuest.guest_id == guest_id)
|
||||
)
|
||||
)
|
||||
existing_guest = result.scalar_one_or_none()
|
||||
|
||||
if existing_guest:
|
||||
# Update with new data
|
||||
existing_guest.update_from_conversion_data(
|
||||
guest_first_name,
|
||||
guest_last_name,
|
||||
guest_email,
|
||||
guest_country_code,
|
||||
guest_birth_date,
|
||||
now,
|
||||
)
|
||||
return existing_guest
|
||||
|
||||
# Create new ConversionGuest
|
||||
new_guest = ConversionGuest.create_from_conversion_data(
|
||||
hotel_id=hotel_id,
|
||||
guest_id=guest_id,
|
||||
guest_first_name=guest_first_name,
|
||||
guest_last_name=guest_last_name,
|
||||
guest_email=guest_email,
|
||||
guest_country_code=guest_country_code,
|
||||
guest_birth_date=guest_birth_date,
|
||||
now=now,
|
||||
)
|
||||
session.add(new_guest)
|
||||
await session.flush() # Ensure the guest has an ID
|
||||
return new_guest
|
||||
|
||||
async def process_conversion_xml(self, xml_content: str) -> dict[str, Any]:
|
||||
"""Parse conversion XML and save daily sales data to database.
|
||||
|
||||
@@ -525,6 +590,20 @@ class ConversionService:
|
||||
# Flush to ensure conversion has an ID before creating room reservations
|
||||
await session.flush()
|
||||
|
||||
# Create or update ConversionGuest and link it to the conversion
|
||||
conversion_guest = await self._get_or_create_conversion_guest(
|
||||
hotel_id=hotel_id,
|
||||
guest_id=guest_id,
|
||||
guest_first_name=guest_first_name,
|
||||
guest_last_name=guest_last_name,
|
||||
guest_email=guest_email,
|
||||
guest_country_code=guest_country_code,
|
||||
guest_birth_date=guest_birth_date,
|
||||
session=session,
|
||||
)
|
||||
if conversion_guest:
|
||||
conversion.conversion_guest_id = conversion_guest.id
|
||||
|
||||
# Update stats for the conversion record itself
|
||||
if matched_reservation:
|
||||
stats["matched_to_reservation"] += 1
|
||||
|
||||
Reference in New Issue
Block a user