jonas/alpinebits_python
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

New pydantic model for ConversionGuest

Browse Source
This commit is contained in:
Jonas Linter
2025-12-02 13:18:43 +01:00
parent b1c867ca93
commit 0f3805bed4
4 changed files with 282 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/alpine_bits_python/api.py
View File

@@ -32,6 +32,7 @@ from sqlalchemy import and_, select, update
from sqlalchemy.ext.asyncio import async_sessionmaker from sqlalchemy.ext.asyncio import async_sessionmaker
from sqlalchemy.orm import selectinload from sqlalchemy.orm import selectinload
from alpine_bits_python.hotel_service import HotelService
from alpine_bits_python.schemas import WebhookRequestData from alpine_bits_python.schemas import WebhookRequestData
from .alpinebits_server import ( from .alpinebits_server import (
@@ -46,14 +47,15 @@ from .const import HttpStatusCode, WebhookStatus
from .conversion_service import ConversionService from .conversion_service import ConversionService
from .csv_import import CSVImporter from .csv_import import CSVImporter
from .db import Customer as DBCustomer from .db import Customer as DBCustomer
from .db import Reservation as DBReservation
from .db import ( from .db import (
Hotel,
ResilientAsyncSession, ResilientAsyncSession,
SessionMaker, SessionMaker,
WebhookEndpoint, WebhookEndpoint,
WebhookRequest, WebhookRequest,
create_database_engine, create_database_engine,
) )
from .db import Reservation as DBReservation
from .db_setup import run_startup_tasks from .db_setup import run_startup_tasks
from .email_monitoring import ReservationStatsCollector from .email_monitoring import ReservationStatsCollector
from .email_service import create_email_service from .email_service import create_email_service
@@ -890,8 +892,6 @@ async def handle_webhook_unified(
webhook_request.status = WebhookStatus.PROCESSING webhook_request.status = WebhookStatus.PROCESSING
webhook_request.processing_started_at = timestamp webhook_request.processing_started_at = timestamp
else: else:
webhook_request_data = WebhookRequestData( webhook_request_data = WebhookRequestData(
payload_hash=payload_hash, payload_hash=payload_hash,
webhook_endpoint_id=webhook_endpoint.id, webhook_endpoint_id=webhook_endpoint.id,
@@ -1134,6 +1134,7 @@ async def _process_conversion_xml_background(
filename: str, filename: str,
session_maker: SessionMaker, session_maker: SessionMaker,
log_filename: Path, log_filename: Path,
hotel: Hotel,
): ):
"""Background task to process conversion XML. """Background task to process conversion XML.
@@ -1162,7 +1163,7 @@ async def _process_conversion_xml_background(
# Now process the conversion XML # Now process the conversion XML
_LOGGER.info("Starting database processing of %s", filename) _LOGGER.info("Starting database processing of %s", filename)
conversion_service = ConversionService(session_maker) conversion_service = ConversionService(session_maker, hotel.hotel_id)
processing_stats = await conversion_service.process_conversion_xml(xml_content) processing_stats = await conversion_service.process_conversion_xml(xml_content)
_LOGGER.info( _LOGGER.info(
@@ -1250,6 +1251,10 @@ async def handle_xml_upload(
extension = Path(filename).suffix or ".xml" extension = Path(filename).suffix or ".xml"
log_filename = logs_dir / f"{base_filename}_{username}_{timestamp}{extension}" log_filename = logs_dir / f"{base_filename}_{username}_{timestamp}{extension}"
hotel_service = HotelService(db_session)
hotel = await hotel_service.get_hotel_by_username(username)
_LOGGER.info( _LOGGER.info(
"XML file queued for processing: %s by user %s (original: %s)", "XML file queued for processing: %s by user %s (original: %s)",
log_filename, log_filename,
@@ -1266,6 +1271,7 @@ async def handle_xml_upload(
filename, filename,
session_maker, session_maker,
log_filename, log_filename,
hotel,
) )
response_headers = { response_headers = {

224
src/alpine_bits_python/conversion_service.py
View File

@@ -1,13 +1,12 @@
"""Service for handling conversion data from hotel PMS XML files.""" """Service for handling conversion data from hotel PMS XML files."""
import asyncio import asyncio
import hashlib
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from datetime import UTC, datetime from datetime import UTC, datetime
from decimal import Decimal from decimal import Decimal
from typing import Any from typing import Any
from sqlalchemy import insert, or_, select from sqlalchemy import or_, select
from sqlalchemy.dialects.postgresql import insert as pg_insert from sqlalchemy.dialects.postgresql import insert as pg_insert
from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import selectinload from sqlalchemy.orm import selectinload
@@ -22,6 +21,7 @@ from .db import (
SessionMaker, SessionMaker,
) )
from .logging_config import get_logger from .logging_config import get_logger
from .schemas import ConversionGuestData
_LOGGER = get_logger(__name__) _LOGGER = get_logger(__name__)
@@ -37,7 +37,11 @@ class ConversionService:
2. Concurrent mode: SessionMaker passed in, creates independent sessions per task 2. Concurrent mode: SessionMaker passed in, creates independent sessions per task
""" """
def __init__(self, session: AsyncSession | SessionMaker | None = None, hotel_id: str | None = None): def __init__(
self,
session: AsyncSession | SessionMaker | None = None,
hotel_id: str | None = None,
):
"""Initialize the ConversionService. """Initialize the ConversionService.
Args: Args:
@@ -81,17 +85,19 @@ class ConversionService:
async def _extract_unique_guests_from_xml( async def _extract_unique_guests_from_xml(
self, reservations: list self, reservations: list
) -> dict[tuple[str, str | None], dict]: ) -> dict[tuple[str, int], ConversionGuestData]:
"""Extract and deduplicate all guest data from XML reservations. """Extract and deduplicate all guest data from XML reservations.
Phase 0: Single pass through XML to collect all unique guests. Phase 0: Single pass through XML to collect all unique guests.
Uses (hotel_id, guest_id) as the key for deduplication. Uses (hotel_id, guest_id) as the key for deduplication.
Validates each guest using Pydantic before storing.
Args: Args:
reservations: List of XML reservation elements reservations: List of XML reservation elements
Returns: Returns:
Dictionary mapping (hotel_id, guest_id) to guest data dict Dictionary mapping (hotel_id, guest_id) to validated ConversionGuestData
""" """
guest_data_by_key = {} guest_data_by_key = {}
now = datetime.now(UTC) now = datetime.now(UTC)
@@ -101,7 +107,10 @@ class ConversionService:
guest_elem = reservation_elem.find("guest") guest_elem = reservation_elem.find("guest")
if guest_elem is None: if guest_elem is None:
_LOGGER.debug("No guest element found, skipping reservation %s (will be created with guest_id=None in Phase 2)", reservation_elem.get("id")) _LOGGER.debug(
"No guest element found, skipping reservation %s (will be created with guest_id=None in Phase 2)",
reservation_elem.get("id"),
)
continue continue
guest_id = guest_elem.get("id") guest_id = guest_elem.get("id")
@@ -111,33 +120,50 @@ class ConversionService:
guest_country_code = guest_elem.get("countryCode") guest_country_code = guest_elem.get("countryCode")
guest_birth_date_str = guest_elem.get("dateOfBirth") guest_birth_date_str = guest_elem.get("dateOfBirth")
guest_birth_date = None guest_birth_date = None
if guest_birth_date_str: if guest_birth_date_str:
try: try:
guest_birth_date = datetime.strptime(guest_birth_date_str, "%Y-%m-%d").date() guest_birth_date = datetime.strptime(
guest_birth_date_str, "%Y-%m-%d"
).date()
except ValueError: except ValueError:
_LOGGER.warning("Invalid birth date format: %s", guest_birth_date_str) _LOGGER.warning(
"Invalid birth date format: %s", guest_birth_date_str
)
key = (hotel_id, guest_id) # Validate guest data with Pydantic during extraction
try:
validated_guest = ConversionGuestData(
hotel_id=hotel_id,
guest_id=guest_id, # Will be validated and converted to int
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,
first_seen=now,
last_seen=now,
)
# Store guest data by key (will keep the last occurrence from XML) # Use validated guest_id (now an int) for the key
guest_data_by_key[key] = { key = (hotel_id, validated_guest.guest_id)
"hotel_id": hotel_id,
"guest_id": guest_id, # Store validated guest data (will keep the last occurrence from XML)
"guest_first_name": guest_first_name, guest_data_by_key[key] = validated_guest
"guest_last_name": guest_last_name,
"guest_email": guest_email, except ValueError:
"guest_country_code": guest_country_code, _LOGGER.exception(
"guest_birth_date": guest_birth_date, "Failed to validate guest data for reservation %s",
"now": now, reservation_elem.get("id"),
} )
continue
return guest_data_by_key return guest_data_by_key
async def _bulk_upsert_guests( async def _bulk_upsert_guests(
self, session: AsyncSession, guest_data_by_key: dict[tuple[str, str | None], dict] self,
session: AsyncSession,
guest_data_by_key: dict[tuple[str, int], ConversionGuestData],
) -> None: ) -> None:
"""Bulk upsert all unique guests to database using PostgreSQL ON CONFLICT. """Bulk upsert all unique guests to database using PostgreSQL ON CONFLICT.
@@ -147,7 +173,9 @@ class ConversionService:
Args: Args:
session: AsyncSession to use session: AsyncSession to use
guest_data_by_key: Dictionary mapping (hotel_id, guest_id) to guest data guest_data_by_key: Dictionary mapping (hotel_id, guest_id) to
validated ConversionGuestData
""" """
if not guest_data_by_key: if not guest_data_by_key:
return return
@@ -160,28 +188,12 @@ class ConversionService:
batch_end = min(batch_start + batch_size, len(items)) batch_end = min(batch_start + batch_size, len(items))
batch_items = items[batch_start:batch_end] batch_items = items[batch_start:batch_end]
# Prepare list of values for this batch # Prepare list of values for this batch (already validated)
values_list = [] values_list = []
for (hotel_id, guest_id), guest_data in batch_items: for (hotel_id, guest_id), validated_guest in batch_items:
now = guest_data["now"] # Convert validated Pydantic model to dict for insertion
values_list.append({ # (all validations and hash calculations are already done)
"hotel_id": guest_data["hotel_id"], values_list.append(validated_guest.model_dump())
"guest_id": guest_data["guest_id"],
"guest_first_name": guest_data["guest_first_name"],
"guest_last_name": guest_data["guest_last_name"],
"guest_email": guest_data["guest_email"],
"guest_country_code": guest_data["guest_country_code"],
"guest_birth_date": guest_data["guest_birth_date"],
"hashed_first_name": ConversionGuest._normalize_and_hash(guest_data["guest_first_name"]),
"hashed_last_name": ConversionGuest._normalize_and_hash(guest_data["guest_last_name"]),
"hashed_email": ConversionGuest._normalize_and_hash(guest_data["guest_email"]),
"hashed_country_code": ConversionGuest._normalize_and_hash(guest_data["guest_country_code"]),
"hashed_birth_date": ConversionGuest._normalize_and_hash(
guest_data["guest_birth_date"].isoformat() if guest_data["guest_birth_date"] else None
),
"first_seen": now,
"last_seen": now,
})
# Use PostgreSQL ON CONFLICT DO UPDATE for atomic upsert # Use PostgreSQL ON CONFLICT DO UPDATE for atomic upsert
stmt = pg_insert(ConversionGuest).values(values_list) stmt = pg_insert(ConversionGuest).values(values_list)
@@ -252,9 +264,13 @@ class ConversionService:
stats["deleted_reservations"] += 1 stats["deleted_reservations"] += 1
pms_reservation_id_str = deleted_res.get("ID") pms_reservation_id_str = deleted_res.get("ID")
try: try:
pms_reservation_id = int(pms_reservation_id_str) if pms_reservation_id_str else None pms_reservation_id = (
int(pms_reservation_id_str) if pms_reservation_id_str else None
)
if pms_reservation_id is None: if pms_reservation_id is None:
_LOGGER.warning("Deleted reservation missing ID attribute, skipping") _LOGGER.warning(
"Deleted reservation missing ID attribute, skipping"
)
continue continue
await self._handle_deleted_reservation(pms_reservation_id, session) await self._handle_deleted_reservation(pms_reservation_id, session)
await session.commit() await session.commit()
@@ -295,7 +311,10 @@ class ConversionService:
# Phase 1: Bulk upsert all unique guests to database # Phase 1: Bulk upsert all unique guests to database
if guest_data_by_key: if guest_data_by_key:
_LOGGER.debug("Phase 1: Bulk upserting %d unique guests to database", len(guest_data_by_key)) _LOGGER.debug(
"Phase 1: Bulk upserting %d unique guests to database",
len(guest_data_by_key),
)
if self.session_maker: if self.session_maker:
session = await self.session_maker.create_session() session = await self.session_maker.create_session()
else: else:
@@ -304,7 +323,9 @@ class ConversionService:
try: try:
await self._bulk_upsert_guests(session, guest_data_by_key) await self._bulk_upsert_guests(session, guest_data_by_key)
await session.commit() await session.commit()
_LOGGER.info("Phase 1: Successfully upserted %d guests", len(guest_data_by_key)) _LOGGER.info(
"Phase 1: Successfully upserted %d guests", len(guest_data_by_key)
)
except Exception as e: except Exception as e:
await session.rollback() await session.rollback()
_LOGGER.exception("Phase 1: Error during bulk guest upsert: %s", e) _LOGGER.exception("Phase 1: Error during bulk guest upsert: %s", e)
@@ -318,9 +339,13 @@ class ConversionService:
# Returns list of successfully created pms_reservation_ids # Returns list of successfully created pms_reservation_ids
_LOGGER.debug("Phase 2: Creating/updating conversions") _LOGGER.debug("Phase 2: Creating/updating conversions")
if self.supports_concurrent: if self.supports_concurrent:
pms_reservation_ids = await self._process_reservations_concurrent(reservations, stats) pms_reservation_ids = await self._process_reservations_concurrent(
reservations, stats
)
else: else:
pms_reservation_ids = await self._process_reservations_sequential(reservations, stats) pms_reservation_ids = await self._process_reservations_sequential(
reservations, stats
)
_LOGGER.debug( _LOGGER.debug(
"Phase 3: Found %d successfully created conversions out of %d total reservations", "Phase 3: Found %d successfully created conversions out of %d total reservations",
@@ -335,9 +360,13 @@ class ConversionService:
if pms_reservation_ids: if pms_reservation_ids:
_LOGGER.debug("Phase 3: Matching conversions to reservations/customers") _LOGGER.debug("Phase 3: Matching conversions to reservations/customers")
if self.supports_concurrent: if self.supports_concurrent:
await self._match_conversions_from_db_concurrent(pms_reservation_ids, stats) await self._match_conversions_from_db_concurrent(
pms_reservation_ids, stats
)
else: else:
await self._match_conversions_from_db_sequential(pms_reservation_ids, stats) await self._match_conversions_from_db_sequential(
pms_reservation_ids, stats
)
return stats return stats
@@ -375,9 +404,12 @@ class ConversionService:
try: try:
# Load all reservations with their hashed customers in one query # Load all reservations with their hashed customers in one query
from sqlalchemy.orm import selectinload from sqlalchemy.orm import selectinload
query = select(Reservation).options( query = select(Reservation).options(
selectinload(Reservation.customer).selectinload(Customer.hashed_version), selectinload(Reservation.customer).selectinload(
selectinload(Reservation.hashed_customer) Customer.hashed_version
),
selectinload(Reservation.hashed_customer),
) )
result = await session.execute(query) result = await session.execute(query)
reservations = result.scalars().all() reservations = result.scalars().all()
@@ -420,6 +452,7 @@ class ConversionService:
Returns: Returns:
List of pms_reservation_ids that were successfully created/updated List of pms_reservation_ids that were successfully created/updated
""" """
semaphore = asyncio.Semaphore(1) # Process one at a time semaphore = asyncio.Semaphore(1) # Process one at a time
results = [] results = []
@@ -460,6 +493,7 @@ class ConversionService:
Returns: Returns:
List of pms_reservation_ids that were successfully created/updated List of pms_reservation_ids that were successfully created/updated
""" """
if not self.session_maker: if not self.session_maker:
_LOGGER.error( _LOGGER.error(
@@ -568,16 +602,22 @@ class ConversionService:
""" """
if not self.hotel_id: if not self.hotel_id:
_LOGGER.error("Cannot delete reservation: hotel_id not set in ConversionService") _LOGGER.error(
"Cannot delete reservation: hotel_id not set in ConversionService"
)
return return
_LOGGER.info("Processing deleted reservation: Hotel %s, PMS ID %s", self.hotel_id, pms_reservation_id) _LOGGER.info(
"Processing deleted reservation: Hotel %s, PMS ID %s",
self.hotel_id,
pms_reservation_id,
)
# Delete conversion records for this hotel + pms_reservation_id # Delete conversion records for this hotel + pms_reservation_id
result = await session.execute( result = await session.execute(
select(Conversion).where( select(Conversion).where(
Conversion.hotel_id == self.hotel_id, Conversion.hotel_id == self.hotel_id,
Conversion.pms_reservation_id == pms_reservation_id Conversion.pms_reservation_id == pms_reservation_id,
) )
) )
conversions = result.scalars().all() conversions = result.scalars().all()
@@ -684,7 +724,7 @@ class ConversionService:
existing_result = await session.execute( existing_result = await session.execute(
select(Conversion).where( select(Conversion).where(
Conversion.hotel_id == hotel_id, Conversion.hotel_id == hotel_id,
Conversion.pms_reservation_id == pms_reservation_id Conversion.pms_reservation_id == pms_reservation_id,
) )
) )
existing_conversion = existing_result.scalar_one_or_none() existing_conversion = existing_result.scalar_one_or_none()
@@ -744,9 +784,7 @@ class ConversionService:
# Fetch ALL existing rooms for this conversion (not just the ones in current XML) # Fetch ALL existing rooms for this conversion (not just the ones in current XML)
existing_rooms_result = await session.execute( existing_rooms_result = await session.execute(
select(ConversionRoom).where( select(ConversionRoom).where(ConversionRoom.conversion_id == conversion.id)
ConversionRoom.conversion_id == conversion.id
)
) )
existing_rooms = { existing_rooms = {
room.pms_hotel_reservation_id: room room.pms_hotel_reservation_id: room
@@ -841,7 +879,6 @@ class ConversionService:
# Check if room reservation already exists using batch-loaded data # Check if room reservation already exists using batch-loaded data
existing_room_reservation = existing_rooms.get(pms_hotel_reservation_id) existing_room_reservation = existing_rooms.get(pms_hotel_reservation_id)
if existing_room_reservation: if existing_room_reservation:
# Update existing room reservation with all fields # Update existing room reservation with all fields
existing_room_reservation.arrival_date = arrival_date existing_room_reservation.arrival_date = arrival_date
@@ -910,7 +947,6 @@ class ConversionService:
return stats return stats
async def _match_by_advertising( async def _match_by_advertising(
self, self,
advertising_campagne: str, advertising_campagne: str,
@@ -1026,9 +1062,7 @@ class ConversionService:
session = self.session session = self.session
# Query all hashed customers that match the guest details # Query all hashed customers that match the guest details
query = select(HashedCustomer).options( query = select(HashedCustomer).options(selectinload(HashedCustomer.customer))
selectinload(HashedCustomer.customer)
)
# Build filter conditions # Build filter conditions
conditions = [] conditions = []
@@ -1165,6 +1199,7 @@ class ConversionService:
Returns: Returns:
Dictionary mapping guest_id to matched HashedCustomer (or None if no match) Dictionary mapping guest_id to matched HashedCustomer (or None if no match)
""" """
# Find all conversions that either: # Find all conversions that either:
# - Have no match at all (reservation_id IS NULL AND customer_id IS NULL), OR # - Have no match at all (reservation_id IS NULL AND customer_id IS NULL), OR
@@ -1246,6 +1281,7 @@ class ConversionService:
guest_to_hashed_customer: Mapping from guest_id to matched HashedCustomer guest_to_hashed_customer: Mapping from guest_id to matched HashedCustomer
session: AsyncSession for database queries session: AsyncSession for database queries
stats: Shared stats dictionary to update stats: Shared stats dictionary to update
""" """
for guest_id, matched_hashed_customer in guest_to_hashed_customer.items(): for guest_id, matched_hashed_customer in guest_to_hashed_customer.items():
if not matched_hashed_customer or not matched_hashed_customer.customer_id: if not matched_hashed_customer or not matched_hashed_customer.customer_id:
@@ -1259,7 +1295,10 @@ class ConversionService:
(Conversion.guest_id == guest_id) (Conversion.guest_id == guest_id)
& (Conversion.reservation_id.is_(None)) & (Conversion.reservation_id.is_(None))
) )
.options(selectinload(Conversion.conversion_rooms), selectinload(Conversion.guest)) .options(
selectinload(Conversion.conversion_rooms),
selectinload(Conversion.guest),
)
) )
conversions = result.scalars().all() conversions = result.scalars().all()
@@ -1275,7 +1314,10 @@ class ConversionService:
# Try to link each conversion to a reservation for this customer # Try to link each conversion to a reservation for this customer
for conversion in conversions: for conversion in conversions:
matched_reservation, is_attributable = await self._check_if_attributable( (
matched_reservation,
is_attributable,
) = await self._check_if_attributable(
matched_hashed_customer.customer_id, conversion, session matched_hashed_customer.customer_id, conversion, session
) )
@@ -1329,6 +1371,7 @@ class ConversionService:
Args: Args:
session: AsyncSession for database queries session: AsyncSession for database queries
""" """
# Get all ConversionGuests that have ANY customer link # Get all ConversionGuests that have ANY customer link
# This includes: # This includes:
@@ -1345,7 +1388,9 @@ class ConversionService:
_LOGGER.debug("Phase 3d: No matched guests to check for regularity") _LOGGER.debug("Phase 3d: No matched guests to check for regularity")
return return
_LOGGER.debug("Phase 3d: Checking regularity for %d matched guests", len(matched_guests)) _LOGGER.debug(
"Phase 3d: Checking regularity for %d matched guests", len(matched_guests)
)
for conversion_guest in matched_guests: for conversion_guest in matched_guests:
if not conversion_guest.hashed_customer_id: if not conversion_guest.hashed_customer_id:
@@ -1528,12 +1573,15 @@ class ConversionService:
pms_reservation_id: PMS reservation ID to match pms_reservation_id: PMS reservation ID to match
session: AsyncSession to use session: AsyncSession to use
stats: Shared stats dictionary to update (optional) stats: Shared stats dictionary to update (optional)
""" """
if session is None: if session is None:
session = self.session session = self.session
if not self.hotel_id: if not self.hotel_id:
_LOGGER.error("Cannot match conversion: hotel_id not set in ConversionService") _LOGGER.error(
"Cannot match conversion: hotel_id not set in ConversionService"
)
return return
# Get the conversion from the database with related data # Get the conversion from the database with related data
@@ -1541,9 +1589,12 @@ class ConversionService:
select(Conversion) select(Conversion)
.where( .where(
Conversion.hotel_id == self.hotel_id, Conversion.hotel_id == self.hotel_id,
Conversion.pms_reservation_id == pms_reservation_id Conversion.pms_reservation_id == pms_reservation_id,
)
.options(
selectinload(Conversion.guest),
selectinload(Conversion.conversion_rooms),
) )
.options(selectinload(Conversion.guest), selectinload(Conversion.conversion_rooms))
) )
conversion = result.scalar_one_or_none() conversion = result.scalar_one_or_none()
@@ -1601,9 +1652,7 @@ class ConversionService:
conversion.reservation_id = ( conversion.reservation_id = (
matched_reservation.id if matched_reservation else None matched_reservation.id if matched_reservation else None
) )
conversion.customer_id = ( conversion.customer_id = matched_customer.id if matched_customer else None
matched_customer.id if matched_customer else None
)
conversion.hashed_customer_id = ( conversion.hashed_customer_id = (
matched_hashed_customer.id if matched_hashed_customer else None matched_hashed_customer.id if matched_hashed_customer else None
) )
@@ -1647,6 +1696,7 @@ class ConversionService:
guest_id: The guest ID to evaluate guest_id: The guest ID to evaluate
customer_id: The matched customer ID customer_id: The matched customer ID
session: AsyncSession for database queries session: AsyncSession for database queries
""" """
# Get the ConversionGuest record # Get the ConversionGuest record
guest_result = await session.execute( guest_result = await session.execute(
@@ -1670,7 +1720,9 @@ class ConversionService:
.order_by(Conversion.reservation_date.asc()) .order_by(Conversion.reservation_date.asc())
.limit(1) .limit(1)
) )
earliest_paying_conversion = earliest_paying_conversion_result.scalar_one_or_none() earliest_paying_conversion = (
earliest_paying_conversion_result.scalar_one_or_none()
)
if not earliest_paying_conversion: if not earliest_paying_conversion:
# No paying conversions found for this guest # No paying conversions found for this guest
@@ -1695,7 +1747,10 @@ class ConversionService:
# (meaning they were already a customer before we sent them a reservation) # (meaning they were already a customer before we sent them a reservation)
# Compare against the reservation's creation date (when WE created/sent it), not check-in date # Compare against the reservation's creation date (when WE created/sent it), not check-in date
# Convert created_at to date for comparison with reservation_date (both are dates) # Convert created_at to date for comparison with reservation_date (both are dates)
is_regular = earliest_paying_conversion.reservation_date < earliest_reservation.created_at.date() is_regular = (
earliest_paying_conversion.reservation_date
< earliest_reservation.created_at.date()
)
conversion_guest.is_regular = is_regular conversion_guest.is_regular = is_regular
if is_regular: if is_regular:
@@ -1735,6 +1790,7 @@ class ConversionService:
Tuple of (matched_reservation, is_attributable) where: Tuple of (matched_reservation, is_attributable) where:
- matched_reservation: The Reservation that matches (if any) - matched_reservation: The Reservation that matches (if any)
- is_attributable: True if the reservation's dates match this conversion - is_attributable: True if the reservation's dates match this conversion
""" """
# Check if conversion_room dates exist (criterion for attributability) # Check if conversion_room dates exist (criterion for attributability)
if not conversion.conversion_rooms: if not conversion.conversion_rooms:
@@ -1763,12 +1819,12 @@ class ConversionService:
and reservation.end_date and reservation.end_date
): ):
# Check if dates match or mostly match (within 7 day tolerance) # Check if dates match or mostly match (within 7 day tolerance)
arrival_match = abs( arrival_match = (
(room.arrival_date - reservation.start_date).days abs((room.arrival_date - reservation.start_date).days) <= 7
) <= 7 )
departure_match = abs( departure_match = (
(room.departure_date - reservation.end_date).days abs((room.departure_date - reservation.end_date).days) <= 7
) <= 7 )
if arrival_match and departure_match: if arrival_match and departure_match:
_LOGGER.info( _LOGGER.info(

76
src/alpine_bits_python/schemas.py
View File

@@ -455,6 +455,82 @@ class WebhookRequestData(BaseModel):
# Example usage in a service layer # Example usage in a service layer
class ConversionGuestData(BaseModel):
"""Validated conversion guest data from PMS XML.
Handles validation and hashing for guest records extracted from
hotel PMS conversion XML files.
"""
hotel_id: str = Field(..., min_length=1, max_length=50)
guest_id: int = Field(..., gt=0)
guest_first_name: str | None = Field(None, max_length=100)
guest_last_name: str | None = Field(None, max_length=100)
guest_email: str | None = Field(None, max_length=200)
guest_country_code: str | None = Field(None, max_length=10)
guest_birth_date: date | None = None
# Auto-calculated hashed fields
hashed_first_name: str | None = Field(None, max_length=64)
hashed_last_name: str | None = Field(None, max_length=64)
hashed_email: str | None = Field(None, max_length=64)
hashed_country_code: str | None = Field(None, max_length=64)
hashed_birth_date: str | None = Field(None, max_length=64)
# Timestamps
first_seen: datetime = Field(default_factory=lambda: datetime.now(UTC))
last_seen: datetime = Field(default_factory=lambda: datetime.now(UTC))
@staticmethod
def _normalize_and_hash(value: str | None) -> str | None:
"""Normalize and hash a value for privacy-preserving matching.
Uses the same logic as ConversionGuest._normalize_and_hash.
"""
if value is None or value == "":
return None
# Normalize: lowercase, strip whitespace
normalized = value.lower().strip()
if not normalized:
return None
# Hash with SHA256
return hashlib.sha256(normalized.encode("utf-8")).hexdigest()
@model_validator(mode="after")
def calculate_hashes(self) -> "ConversionGuestData":
"""Auto-calculate hashed fields from plain text fields."""
if self.hashed_first_name is None:
self.hashed_first_name = self._normalize_and_hash(self.guest_first_name)
if self.hashed_last_name is None:
self.hashed_last_name = self._normalize_and_hash(self.guest_last_name)
if self.hashed_email is None:
self.hashed_email = self._normalize_and_hash(self.guest_email)
if self.hashed_country_code is None:
self.hashed_country_code = self._normalize_and_hash(self.guest_country_code)
if self.hashed_birth_date is None and self.guest_birth_date is not None:
self.hashed_birth_date = self._normalize_and_hash(
self.guest_birth_date.isoformat()
)
return self
@field_validator("guest_id", mode="before")
@classmethod
def convert_guest_id_to_int(cls, v: Any) -> int:
"""Convert guest_id to integer (handles string input from XML)."""
if v is None:
raise ValueError("guest_id cannot be None")
if isinstance(v, int):
return v
if isinstance(v, str):
try:
return int(v)
except ValueError as e:
raise ValueError(f"guest_id must be a valid integer, got: {v}") from e
raise ValueError(f"guest_id must be int or str, got: {type(v)}")
model_config = {"from_attributes": True}
class ReservationService: class ReservationService:
"""Example service showing how to use Pydantic models with SQLAlchemy.""" """Example service showing how to use Pydantic models with SQLAlchemy."""

107
tests/test_conversion_service.py
View File

@@ -29,7 +29,6 @@ from alpine_bits_python.db import (
ConversionGuest, ConversionGuest,
ConversionRoom, ConversionRoom,
Customer, Customer,
HashedCustomer,
Reservation, Reservation,
) )
@@ -130,9 +129,9 @@ class TestConversionServiceWithImportedData:
print(f"\nCSV Import Stats: {csv_stats}") print(f"\nCSV Import Stats: {csv_stats}")
assert csv_stats["total_rows"] > 0, "CSV import should have processed rows" assert csv_stats["total_rows"] > 0, "CSV import should have processed rows"
assert ( assert csv_stats["created_reservations"] > 0, (
csv_stats["created_reservations"] > 0 "CSV import should create reservations"
), "CSV import should create reservations" )
# Step 2: Load and process conversion XML # Step 2: Load and process conversion XML
with xml_file.open(encoding="utf-8") as f: with xml_file.open(encoding="utf-8") as f:
@@ -166,30 +165,36 @@ class TestConversionServiceWithImportedData:
EXPECTED_MATCHED_TO_CUSTOMER = 0 EXPECTED_MATCHED_TO_CUSTOMER = 0
print(f"\nBaseline Match Counts:") print("\nBaseline Match Counts:")
print(f" Total reservations in XML: {EXPECTED_TOTAL_RESERVATIONS}") print(f" Total reservations in XML: {EXPECTED_TOTAL_RESERVATIONS}")
print(f" Total daily sales records: {EXPECTED_TOTAL_DAILY_SALES}") print(f" Total daily sales records: {EXPECTED_TOTAL_DAILY_SALES}")
print(f" Total conversion room records: {EXPECTED_TOTAL_ROOMS}") print(f" Total conversion room records: {EXPECTED_TOTAL_ROOMS}")
print(f" Matched to reservation: {EXPECTED_MATCHED_TO_RESERVATION}") print(f" Matched to reservation: {EXPECTED_MATCHED_TO_RESERVATION}")
match_rate = (EXPECTED_MATCHED_TO_RESERVATION / EXPECTED_TOTAL_RESERVATIONS * 100) if EXPECTED_TOTAL_RESERVATIONS > 0 else 0 match_rate = (
(EXPECTED_MATCHED_TO_RESERVATION / EXPECTED_TOTAL_RESERVATIONS * 100)
if EXPECTED_TOTAL_RESERVATIONS > 0
else 0
)
print(f" Match rate: {match_rate:.1f}%") print(f" Match rate: {match_rate:.1f}%")
print(f" Matched to customer: {EXPECTED_MATCHED_TO_CUSTOMER}") print(f" Matched to customer: {EXPECTED_MATCHED_TO_CUSTOMER}")
print(f" Match rate (to customer): {(EXPECTED_MATCHED_TO_CUSTOMER / EXPECTED_TOTAL_RESERVATIONS * 100) if EXPECTED_TOTAL_RESERVATIONS > 0 else 0:.1f}%") print(
f" Match rate (to customer): {(EXPECTED_MATCHED_TO_CUSTOMER / EXPECTED_TOTAL_RESERVATIONS * 100) if EXPECTED_TOTAL_RESERVATIONS > 0 else 0:.1f}%"
)
# Verify baseline stability on subsequent runs # Verify baseline stability on subsequent runs
assert ( assert stats["total_reservations"] == EXPECTED_TOTAL_RESERVATIONS, (
stats["total_reservations"] == EXPECTED_TOTAL_RESERVATIONS f"Total reservations should be {EXPECTED_TOTAL_RESERVATIONS}, got {stats['total_reservations']}"
), f"Total reservations should be {EXPECTED_TOTAL_RESERVATIONS}, got {stats['total_reservations']}" )
assert ( assert stats["total_daily_sales"] == EXPECTED_TOTAL_DAILY_SALES, (
stats["total_daily_sales"] == EXPECTED_TOTAL_DAILY_SALES f"Total daily sales should be {EXPECTED_TOTAL_DAILY_SALES}, got {stats['total_daily_sales']}"
), f"Total daily sales should be {EXPECTED_TOTAL_DAILY_SALES}, got {stats['total_daily_sales']}" )
assert ( assert stats["matched_to_reservation"] == EXPECTED_MATCHED_TO_RESERVATION, (
stats["matched_to_reservation"] == EXPECTED_MATCHED_TO_RESERVATION f"Matched reservations should be {EXPECTED_MATCHED_TO_RESERVATION}, got {stats['matched_to_reservation']}"
), f"Matched reservations should be {EXPECTED_MATCHED_TO_RESERVATION}, got {stats['matched_to_reservation']}" )
assert ( assert stats["matched_to_customer"] == EXPECTED_MATCHED_TO_CUSTOMER, (
stats["matched_to_customer"] == EXPECTED_MATCHED_TO_CUSTOMER f"Matched customers should be {EXPECTED_MATCHED_TO_CUSTOMER}, got {stats['matched_to_customer']}"
), f"Matched customers should be {EXPECTED_MATCHED_TO_CUSTOMER}, got {stats['matched_to_customer']}" )
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_conversion_room_revenue_aggregation( async def test_conversion_room_revenue_aggregation(
@@ -237,23 +242,25 @@ class TestConversionServiceWithImportedData:
# Note: Test data may not have revenue values in the XML # Note: Test data may not have revenue values in the XML
# The important thing is that we're capturing room-level data # The important thing is that we're capturing room-level data
print(f"\nRevenue Aggregation Stats:") print("\nRevenue Aggregation Stats:")
print(f" Total conversion rooms: {len(all_rooms)}") print(f" Total conversion rooms: {len(all_rooms)}")
print(f" Rooms with revenue: {len(rooms_with_revenue)}") print(f" Rooms with revenue: {len(rooms_with_revenue)}")
if rooms_with_revenue: if rooms_with_revenue:
# Verify revenue values are numeric and positive # Verify revenue values are numeric and positive
for room in rooms_with_revenue: for room in rooms_with_revenue:
assert isinstance( assert isinstance(room.total_revenue, (int, float)), (
room.total_revenue, (int, float) f"Revenue should be numeric, got {type(room.total_revenue)}"
), f"Revenue should be numeric, got {type(room.total_revenue)}" )
assert ( assert room.total_revenue > 0, (
room.total_revenue > 0 f"Revenue should be positive, got {room.total_revenue}"
), f"Revenue should be positive, got {room.total_revenue}" )
total_revenue = sum(room.total_revenue for room in rooms_with_revenue) total_revenue = sum(room.total_revenue for room in rooms_with_revenue)
print(f" Total aggregated revenue: {total_revenue}") print(f" Total aggregated revenue: {total_revenue}")
print(f" Average revenue per room: {total_revenue / len(rooms_with_revenue)}") print(
f" Average revenue per room: {total_revenue / len(rooms_with_revenue)}"
)
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_conversion_matching_by_guest_details( async def test_conversion_matching_by_guest_details(
@@ -282,7 +289,9 @@ class TestConversionServiceWithImportedData:
dryrun=False, dryrun=False,
) )
assert csv_stats["created_reservations"] > 0, "Should have imported reservations" assert csv_stats["created_reservations"] > 0, (
"Should have imported reservations"
)
# Process conversions # Process conversions
with xml_file.open(encoding="utf-8") as f: with xml_file.open(encoding="utf-8") as f:
@@ -307,14 +316,14 @@ class TestConversionServiceWithImportedData:
) )
conversions_with_customers = result.scalars().all() conversions_with_customers = result.scalars().all()
print(f"\nGuest Detail Matching:") print("\nGuest Detail Matching:")
print(f" Total conversions: {len(all_conversions)}") print(f" Total conversions: {len(all_conversions)}")
print(f" Conversions matched to customer: {len(conversions_with_customers)}") print(f" Conversions matched to customer: {len(conversions_with_customers)}")
print(f" Stats matched_to_customer: {stats['matched_to_customer']}") print(f" Stats matched_to_customer: {stats['matched_to_customer']}")
# With this test data, matches may be 0 if guest names/emails don't align # With this test data, matches may be 0 if guest names/emails don't align
# The important thing is that the matching logic runs without errors # The important thing is that the matching logic runs without errors
print(f" Note: Matches depend on data alignment between CSV and XML files") print(" Note: Matches depend on data alignment between CSV and XML files")
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_conversion_service_error_handling( async def test_conversion_service_error_handling(
@@ -354,7 +363,7 @@ class TestConversionServiceWithImportedData:
with room_number='201', second has status='request' with room_number='202' with room_number='201', second has status='request' with room_number='202'
4. The old room entries (101, 102) should no longer exist in the database 4. The old room entries (101, 102) should no longer exist in the database
""" """
from tests.helpers import ReservationXMLBuilder, MultiReservationXMLBuilder from tests.helpers import MultiReservationXMLBuilder, ReservationXMLBuilder
# First batch: Process two reservations # First batch: Process two reservations
multi_builder1 = MultiReservationXMLBuilder() multi_builder1 = MultiReservationXMLBuilder()
@@ -533,7 +542,6 @@ class TestConversionServiceWithImportedData:
) )
class TestXMLBuilderUsage: class TestXMLBuilderUsage:
"""Demonstrate usage of XML builder helpers for creating test data.""" """Demonstrate usage of XML builder helpers for creating test data."""
@@ -563,7 +571,7 @@ class TestXMLBuilderUsage:
room_type="DZV", room_type="DZV",
room_number="101", room_number="101",
revenue_logis_per_day=150.0, revenue_logis_per_day=150.0,
adults=2 adults=2,
) )
.build_xml() .build_xml()
) )
@@ -576,9 +584,7 @@ class TestXMLBuilderUsage:
assert stats["total_daily_sales"] == 5 # 4 nights + departure day assert stats["total_daily_sales"] == 5 # 4 nights + departure day
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_using_xml_builder_for_multi_room_reservation( async def test_using_xml_builder_for_multi_room_reservation(self, test_db_session):
self, test_db_session
):
"""Example: Create a reservation with multiple rooms.""" """Example: Create a reservation with multiple rooms."""
from tests.helpers import ReservationXMLBuilder from tests.helpers import ReservationXMLBuilder
@@ -620,7 +626,7 @@ class TestXMLBuilderUsage:
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_using_multi_reservation_builder(self, test_db_session): async def test_using_multi_reservation_builder(self, test_db_session):
"""Example: Create multiple reservations in one XML document.""" """Example: Create multiple reservations in one XML document."""
from tests.helpers import ReservationXMLBuilder, MultiReservationXMLBuilder from tests.helpers import MultiReservationXMLBuilder, ReservationXMLBuilder
multi_builder = MultiReservationXMLBuilder() multi_builder = MultiReservationXMLBuilder()
@@ -683,14 +689,12 @@ class TestHashedMatchingLogic:
"""Test the hashed matching logic used in ConversionService.""" """Test the hashed matching logic used in ConversionService."""
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_conversion_guest_hashed_fields_are_populated( async def test_conversion_guest_hashed_fields_are_populated(self, test_db_session):
self, test_db_session
):
"""Test that ConversionGuest properly stores hashed versions of guest data.""" """Test that ConversionGuest properly stores hashed versions of guest data."""
# Create a conversion guest # Create a conversion guest
conversion_guest = ConversionGuest.create_from_conversion_data( conversion_guest = ConversionGuest.create_from_conversion_data(
hotel_id="test_hotel", hotel_id="test_hotel",
guest_id="guest_123", guest_id=123,
guest_first_name="Margaret", guest_first_name="Margaret",
guest_last_name="Brown", guest_last_name="Brown",
guest_email="margaret@example.com", guest_email="margaret@example.com",
@@ -721,7 +725,6 @@ class TestHashedMatchingLogic:
assert conversion_guest.hashed_last_name == expected_hashed_last assert conversion_guest.hashed_last_name == expected_hashed_last
assert conversion_guest.hashed_email == expected_hashed_email assert conversion_guest.hashed_email == expected_hashed_email
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_conversion_records_created_before_matching( async def test_conversion_records_created_before_matching(
self, test_db_session, test_config self, test_db_session, test_config
@@ -750,10 +753,10 @@ class TestHashedMatchingLogic:
await test_db_session.commit() await test_db_session.commit()
# Create conversion XML with matching hashed data # Create conversion XML with matching hashed data
xml_content = f"""<?xml version="1.0"?> xml_content = """<?xml version="1.0"?>
<root> <root>
<reservation id="pms_123" hotelID="hotel_1" number="RES001" date="2025-01-15"> <reservation id="pms_123" hotelID="hotel_1" number="RES001" date="2025-01-15">
<guest id="guest_001" firstName="David" lastName="Miller" email="david@example.com"/> <guest id="123" firstName="David" lastName="Miller" email="david@example.com"/>
<roomReservations> <roomReservations>
<roomReservation roomNumber="101" arrival="2025-01-15" departure="2025-01-17" status="confirmed"> <roomReservation roomNumber="101" arrival="2025-01-15" departure="2025-01-17" status="confirmed">
<dailySales> <dailySales>
@@ -764,7 +767,7 @@ class TestHashedMatchingLogic:
</reservation> </reservation>
</root>""" </root>"""
service = ConversionService(test_db_session) service = ConversionService(test_db_session, hotel_id="hotel_1")
stats = await service.process_conversion_xml(xml_content) stats = await service.process_conversion_xml(xml_content)
# Verify conversion was created # Verify conversion was created
@@ -779,22 +782,23 @@ class TestHashedMatchingLogic:
# Verify conversion_guest was created with the correct data # Verify conversion_guest was created with the correct data
from sqlalchemy.orm import selectinload from sqlalchemy.orm import selectinload
result_with_guest = await test_db_session.execute( result_with_guest = await test_db_session.execute(
select(Conversion) select(Conversion)
.where(Conversion.pms_reservation_id == "pms_123") .where(Conversion.pms_reservation_id == "pms_123")
.options(selectinload(Conversion.guest)) .options(selectinload(Conversion.guest))
) )
conversion_with_guest = result_with_guest.scalar_one_or_none() conversion_with_guest = result_with_guest.scalar_one_or_none()
assert conversion_with_guest.guest is not None, "ConversionGuest relationship should exist" assert conversion_with_guest.guest is not None, (
"ConversionGuest relationship should exist"
)
assert conversion_with_guest.guest.guest_first_name == "David" assert conversion_with_guest.guest.guest_first_name == "David"
assert conversion_with_guest.guest.guest_last_name == "Miller" assert conversion_with_guest.guest.guest_last_name == "Miller"
assert conversion_with_guest.guest.guest_email == "david@example.com" assert conversion_with_guest.guest.guest_email == "david@example.com"
# Verify conversion_room was created # Verify conversion_room was created
room_result = await test_db_session.execute( room_result = await test_db_session.execute(
select(ConversionRoom).where( select(ConversionRoom).where(ConversionRoom.conversion_id == conversion.id)
ConversionRoom.conversion_id == conversion.id
)
) )
rooms = room_result.scalars().all() rooms = room_result.scalars().all()
assert len(rooms) > 0, "ConversionRoom should be created" assert len(rooms) > 0, "ConversionRoom should be created"
@@ -804,8 +808,6 @@ class TestHashedMatchingLogic:
assert stats["total_reservations"] == 1 assert stats["total_reservations"] == 1
assert stats["total_daily_sales"] == 1 assert stats["total_daily_sales"] == 1
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_conversion_guest_composite_key_prevents_duplicates( async def test_conversion_guest_composite_key_prevents_duplicates(
self, test_db_session self, test_db_session
@@ -819,7 +821,7 @@ class TestHashedMatchingLogic:
Now the database itself enforces uniqueness at the PK level. Now the database itself enforces uniqueness at the PK level.
""" """
hotel_id = "test_hotel" hotel_id = "test_hotel"
guest_id = "guest_123" guest_id = 123
# Create and commit first conversion guest # Create and commit first conversion guest
guest1 = ConversionGuest.create_from_conversion_data( guest1 = ConversionGuest.create_from_conversion_data(
@@ -862,6 +864,7 @@ class TestHashedMatchingLogic:
# The composite PK constraint prevents the duplicate insert # The composite PK constraint prevents the duplicate insert
from sqlalchemy.exc import IntegrityError from sqlalchemy.exc import IntegrityError
with pytest.raises(IntegrityError): with pytest.raises(IntegrityError):
await test_db_session.commit() await test_db_session.commit()