Holy db migrations batman

src/alpine_bits_python/db.py

@@ -27,7 +27,7 @@ from sqlalchemy.ext.asyncio import (
     async_sessionmaker,
     create_async_engine,
 )
-from sqlalchemy.orm import backref, declarative_base, relationship
+from sqlalchemy.orm import backref, declarative_base, foreign, relationship
 
 from .const import WebhookStatus
 from .logging_config import get_logger
@@ -435,7 +435,13 @@ class ConversionGuest(Base):
     last_seen = Column(DateTime(timezone=True))
 
     # Relationships
-    conversions = relationship("Conversion", back_populates="guest")
+    conversions = relationship(
+        "Conversion",
+        back_populates="guest",
+        foreign_keys="[Conversion.hotel_id, Conversion.guest_id]",
+        primaryjoin="and_(ConversionGuest.hotel_id == foreign(Conversion.hotel_id), "
+                    "ConversionGuest.guest_id == foreign(Conversion.guest_id))",
+    )
     hashed_customer = relationship("HashedCustomer", backref="conversion_guests")
 
     @staticmethod
@@ -541,8 +547,8 @@ class Reservation(Base):
     # Advertising account IDs (stored conditionally based on fbclid/gclid presence)
     meta_account_id = Column(String)
     google_account_id = Column(String)
-    # Add hotel_code and hotel_name for XML
-    hotel_code = Column(String)
+    # Add hotel_id and hotel_name for XML
+    hotel_id = Column(String, ForeignKey("hotels.hotel_id", ondelete="CASCADE"))
     hotel_name = Column(String)
     # RoomTypes fields (optional)
     room_type_code = Column(String)
@@ -569,7 +575,7 @@ class AckedRequest(Base):
     )  # Username of the client making the request
     unique_id = Column(
         String, index=True
-    )  # Should match Reservation.form_id or another unique field
+    )  # Matches the md5_unique_id in Reservation
     timestamp = Column(DateTime(timezone=True))
 
 
@@ -646,13 +652,10 @@ class Conversion(Base):
     created_at = Column(DateTime(timezone=True))  # When this record was imported
     updated_at = Column(DateTime(timezone=True))  # When this record was last updated
 
-    # Composite foreign key constraint for ConversionGuest (hotel_id, guest_id)
+    # Table constraints
+    # Note: The relationship to ConversionGuest is handled via SQLAlchemy ORM
+    # by matching (hotel_id, guest_id) pairs, no DB-level FK constraint needed
     __table_args__ = (
-        ForeignKeyConstraint(
-            ["hotel_id", "guest_id"],
-            ["conversion_guests.hotel_id", "conversion_guests.guest_id"],
-            ondelete="SET NULL",
-        ),
         UniqueConstraint(
             "hotel_id", "pms_reservation_id", name="uq_conversion_hotel_reservation"
         ),
@@ -662,7 +665,13 @@ class Conversion(Base):
     reservation = relationship("Reservation", backref="conversions")
     customer = relationship("Customer", backref="conversions")
     hashed_customer = relationship("HashedCustomer", backref="conversions")
-    guest = relationship("ConversionGuest", back_populates="conversions")
+    guest = relationship(
+        "ConversionGuest",
+        back_populates="conversions",
+        foreign_keys="[Conversion.hotel_id, Conversion.guest_id]",
+        primaryjoin="and_(Conversion.hotel_id == ConversionGuest.hotel_id, "
+                    "Conversion.guest_id == ConversionGuest.guest_id)",
+    )
     conversion_rooms = relationship(
         "ConversionRoom", back_populates="conversion", cascade="all, delete-orphan"
     )