Fixed up the damm tests

This commit is contained in:
Jonas Linter
2025-12-02 15:24:30 +01:00
parent 56d67984cf
commit c0e601e308
4 changed files with 179 additions and 84 deletions

View File

@@ -372,13 +372,13 @@ class TestConversionServiceWithImportedData:
res1_v1 = (
ReservationXMLBuilder(
hotel_id="39054_001",
reservation_id="res_001",
reservation_number="RES-001",
reservation_id="100",
reservation_number="100",
reservation_date="2025-11-14",
reservation_type="request",
)
.set_guest(
guest_id="guest_001",
guest_id="100",
first_name="Alice",
last_name="Johnson",
email="alice@example.com",
@@ -397,13 +397,13 @@ class TestConversionServiceWithImportedData:
res2_v1 = (
ReservationXMLBuilder(
hotel_id="39054_001",
reservation_id="res_002",
reservation_number="RES-002",
reservation_id="101",
reservation_number="101",
reservation_date="2025-11-15",
reservation_type="reservation",
)
.set_guest(
guest_id="guest_002",
guest_id="101",
first_name="Bob",
last_name="Smith",
email="bob@example.com",
@@ -446,13 +446,13 @@ class TestConversionServiceWithImportedData:
res1_v2 = (
ReservationXMLBuilder(
hotel_id="39054_001",
reservation_id="res_001", # Same ID
reservation_number="RES-001", # Same number
reservation_id="100", # Same ID
reservation_number="100", # Same number
reservation_date="2025-11-14",
reservation_type="reservation", # Changed from request
)
.set_guest(
guest_id="guest_001",
guest_id="100",
first_name="Alice",
last_name="Johnson",
email="alice@example.com",
@@ -471,13 +471,13 @@ class TestConversionServiceWithImportedData:
res2_v2 = (
ReservationXMLBuilder(
hotel_id="39054_001",
reservation_id="res_002", # Same ID
reservation_number="RES-002", # Same number
reservation_id="101", # Same ID
reservation_number="101", # Same number
reservation_date="2025-11-15",
reservation_type="request", # Changed from reservation
)
.set_guest(
guest_id="guest_002",
guest_id="101",
first_name="Bob",
last_name="Smith",
email="bob@example.com",
@@ -554,12 +554,12 @@ class TestXMLBuilderUsage:
xml_content = (
ReservationXMLBuilder(
hotel_id="39054_001",
reservation_id="test_123",
reservation_number="RES-123",
reservation_id="123",
reservation_number="123",
reservation_date="2025-11-14",
)
.set_guest(
guest_id="guest_001",
guest_id="157",
first_name="John",
last_name="Doe",
email="john@example.com",
@@ -591,12 +591,12 @@ class TestXMLBuilderUsage:
xml_content = (
ReservationXMLBuilder(
hotel_id="39054_001",
reservation_id="test_456",
reservation_number="RES-456",
reservation_id="456",
reservation_number="456",
reservation_date="2025-11-14",
)
.set_guest(
guest_id="guest_002",
guest_id="157",
first_name="Jane",
last_name="Smith",
email="jane@example.com",
@@ -634,12 +634,12 @@ class TestXMLBuilderUsage:
res1 = (
ReservationXMLBuilder(
hotel_id="39054_001",
reservation_id="test_001",
reservation_number="RES-001",
reservation_id="175",
reservation_number="175",
reservation_date="2025-11-14",
)
.set_guest(
guest_id="guest_001",
guest_id="157",
first_name="Alice",
last_name="Johnson",
email="alice@example.com",
@@ -656,12 +656,12 @@ class TestXMLBuilderUsage:
res2 = (
ReservationXMLBuilder(
hotel_id="39054_001",
reservation_id="test_002",
reservation_id="2725",
reservation_number="RES-002",
reservation_date="2025-11-15",
)
.set_guest(
guest_id="guest_002",
guest_id="2525",
first_name="Bob",
last_name="Williams",
email="bob@example.com",
@@ -752,10 +752,12 @@ class TestHashedMatchingLogic:
test_db_session.add(reservation)
await test_db_session.commit()
PMS_RESERVATION_ID = 157
# Create conversion XML with matching hashed data
xml_content = """<?xml version="1.0"?>
xml_content = f"""<?xml version="1.0"?>
<root>
<reservation id="pms_123" hotelID="hotel_1" number="RES001" date="2025-01-15">
<reservation id="{PMS_RESERVATION_ID}" hotelID="hotel_1" number="378" date="2025-01-15">
<guest id="123" firstName="David" lastName="Miller" email="david@example.com"/>
<roomReservations>
<roomReservation roomNumber="101" arrival="2025-01-15" departure="2025-01-17" status="confirmed">
@@ -772,7 +774,9 @@ class TestHashedMatchingLogic:
# Verify conversion was created
result = await test_db_session.execute(
select(Conversion).where(Conversion.pms_reservation_id == "pms_123")
select(Conversion).where(
Conversion.pms_reservation_id == PMS_RESERVATION_ID
)
)
conversion = result.scalar_one_or_none()
@@ -785,7 +789,7 @@ class TestHashedMatchingLogic:
result_with_guest = await test_db_session.execute(
select(Conversion)
.where(Conversion.pms_reservation_id == "pms_123")
.where(Conversion.pms_reservation_id == PMS_RESERVATION_ID)
.options(selectinload(Conversion.guest))
)
conversion_with_guest = result_with_guest.scalar_one_or_none()