feat(contact): add ContactAddress model and repository for managing contact addresses

feat(contact): update ContactRepository to handle address_id linking
feat(contact): enhance ContactCreate and ContactOut schemas with address_id field
refactor(report): update ForeignKey reference for project_id in Report model
refactor(barrier_sizes): remove extend_existing table argument for clarity
refactor(bidders_barrier_sizes): remove extend_existing table argument for clarity

app/db/models/barrier_size.py

@@ -3,7 +3,6 @@ from app.db.base import Base
 
 class BarrierSizes(Base):
     __tablename__ = "BarrierSizes"
-    __table_args__ = {'extend_existing': True}
 
     Id = Column(Integer, primary_key=True, index=True, autoincrement=True)
     Height = Column(Float, nullable=True)

app/db/models/bidders_barrier_sizes.py

@@ -4,7 +4,6 @@ from app.db.base import Base
 
 class BiddersBarrierSizes(Base):
     __tablename__ = "BiddersBarrierSizes"
-    __table_args__ = {'extend_existing': True}
 
     Id = Column(Integer, primary_key=True, index=True, autoincrement=True)
     InventoryId = Column(Integer, nullable=True)  # Added InventoryId field

app/db/models/contact_address.py

@@ -0,0 +1,11 @@
+from sqlalchemy import Column, Integer, Boolean
+from app.db.base import Base
+
+
+class ContactAddress(Base):
+    __tablename__ = "ContactAddress"
+
+    Id = Column(Integer, primary_key=True, index=True)
+    AddressId = Column(Integer, nullable=False)
+    ContactId = Column(Integer, nullable=False)
+    Enabled = Column(Boolean, nullable=False, default=True)

app/db/models/report.py

@@ -5,7 +5,7 @@ from datetime import datetime
 class Report(Base):
     __tablename__ = "reports"
     id = Column(Integer, primary_key=True, index=True)
-    project_id = Column(Integer, ForeignKey("projects.id"), nullable=False)
+    project_id = Column(Integer, ForeignKey("Projects.ProjectNo"), nullable=False)
     type = Column(String(50), nullable=False)
     status = Column(String(50), nullable=False, default="pending")
     file_path = Column(String(255), nullable=True)

app/db/repositories/contact_address_repo.py

@@ -0,0 +1,45 @@
+from sqlalchemy.orm import Session
+from sqlalchemy.exc import SQLAlchemyError
+from typing import Optional
+import logging
+
+from app.db.models.contact_address import ContactAddress
+
+logger = logging.getLogger(__name__)
+
+
+class ContactAddressRepository:
+    def __init__(self, db: Session):
+        self.db = db
+
+    def upsert_for_contact(self, contact_id: int, address_id: int, enabled: Optional[bool] = True) -> ContactAddress:
+        """Create or update ContactAddress for a given contact.
+
+        - If a record exists for `ContactId`, update `AddressId` and `Enabled`.
+        - Otherwise, insert a new row.
+        """
+        try:
+            ca: Optional[ContactAddress] = (
+                self.db.query(ContactAddress)
+                .filter(ContactAddress.ContactId == contact_id)
+                .first()
+            )
+            if ca:
+                ca.AddressId = address_id
+                if enabled is not None:
+                    ca.Enabled = enabled
+            else:
+                ca = ContactAddress(AddressId=address_id, ContactId=contact_id, Enabled=bool(enabled))
+                self.db.add(ca)
+
+            self.db.commit()
+            self.db.refresh(ca)
+            return ca
+        except SQLAlchemyError as e:
+            logger.error(f"Database error upserting ContactAddress for contact {contact_id}: {e}")
+            self.db.rollback()
+            raise
+        except Exception as e:
+            logger.error(f"Unexpected error upserting ContactAddress for contact {contact_id}: {e}")
+            self.db.rollback()
+            raise

app/db/repositories/contact_repo.py

@@ -3,6 +3,7 @@ from sqlalchemy.orm import Session
 from sqlalchemy.exc import SQLAlchemyError
 from app.db.models.contact import Contact
 from app.schemas.contact import ContactCreate, ContactOut
+from app.db.repositories.contact_address_repo import ContactAddressRepository
 from app.schemas.paginated_response import PaginatedResponse
 from app.core.exceptions import NotFoundException
 from typing import List, Optional
@@ -19,7 +20,7 @@ class ContactRepository:
         try:
             contact = self.db.query(Contact).filter(Contact.ContactID == contact_id).first()
             if contact:
-                return self._map_contact_data(contact.__dict__)
+                return self._map_contact_data(contact)
             return None
         except SQLAlchemyError as e:
             logger.error(f"Database error getting contact {contact_id}: {e}")
@@ -44,7 +45,7 @@ class ContactRepository:
         query = query.order_by(order_col)
         total_records = query.count()
         contacts = query.offset((page - 1) * page_size).limit(page_size).all()
-        contact_out_list = [self._map_contact_data(contact.__dict__) for contact in contacts]
+        contact_out_list = [self._map_contact_data(contact) for contact in contacts]
         return PaginatedResponse[ContactOut](
             items=contact_out_list,
             page=page,
@@ -67,7 +68,7 @@ class ContactRepository:
             query = query.order_by(order_col)
             total_records = query.count()
             contacts = query.offset((page - 1) * page_size).limit(page_size).all()
-            contact_out_list = [self._map_contact_data(contact.__dict__) for contact in contacts]
+            contact_out_list = [self._map_contact_data(contact) for contact in contacts]
             return PaginatedResponse[ContactOut](
                 items=contact_out_list,
                 page=page,
@@ -111,7 +112,14 @@ class ContactRepository:
             self.db.add(new_contact)
             self.db.commit()
             self.db.refresh(new_contact)
-            return self._map_contact_data(new_contact.__dict__)
+            # If address_id provided by UI, upsert ContactAddress link
+            if contact_data.address_id is not None:
+                ContactAddressRepository(self.db).upsert_for_contact(
+                    contact_id=new_contact.ContactID,
+                    address_id=contact_data.address_id,
+                    enabled=True,
+                )
+            return self._map_contact_data(new_contact)
         except SQLAlchemyError as e:
             logger.error(f"Database error creating contact: {e}")
             self.db.rollback()
@@ -149,7 +157,14 @@ class ContactRepository:
             contact.Exported = contact_data.exported or False
             self.db.commit()
             self.db.refresh(contact)
-            return self._map_contact_data(contact.__dict__)
+            # If address_id provided by UI, upsert ContactAddress link
+            if contact_data.address_id is not None:
+                ContactAddressRepository(self.db).upsert_for_contact(
+                    contact_id=contact.ContactID,
+                    address_id=contact_data.address_id,
+                    enabled=True,
+                )
+            return self._map_contact_data(contact)
         except SQLAlchemyError as e:
             logger.error(f"Database error updating contact {contact_id}: {e}")
             self.db.rollback()
@@ -177,30 +192,37 @@ class ContactRepository:
             self.db.rollback()
             raise
 
-    def _map_contact_data(self, contact_data: dict) -> ContactOut:
+    def _map_contact_data(self, contact_data) -> ContactOut:
         """Map database contact data to ContactOut schema"""
+        # Handle both dict and SQLAlchemy object
+        if isinstance(contact_data, dict):
+            contact_obj = type('ContactObj', (), contact_data)()
+        else:
+            contact_obj = contact_data
+            
         return ContactOut(
-            contact_id=contact_data.get('ContactID'),
-            customer_id=contact_data.get('CustomerID'),
-            first_name=contact_data.get('FirstName'),
-            last_name=contact_data.get('LastName'),
-            title=contact_data.get('Title'),
-            address=contact_data.get('Address'),
-            city=contact_data.get('City'),
-            postal_code=contact_data.get('PostalCode'),
-            work_phone=contact_data.get('WorkPhone'),
-            work_extension=contact_data.get('WorkExtension'),
-            fax_number=contact_data.get('FaxNumber'),
-            referred_to=contact_data.get('ReferredTo'),
-            mobile_phone=contact_data.get('MobilePhone'),
-            christmas_card=contact_data.get('ChristmasCard'),
-            email_address=contact_data.get('EmailAddress'),
-            web_address=contact_data.get('WebAddress'),
-            customer_type_id=contact_data.get('CustomerTypeID'),
-            state_id=contact_data.get('StateID'),
-            country_id=contact_data.get('CountryID'),
-            temp_address=contact_data.get('TempAddress'),
-            exported=contact_data.get('Exported'),
-            enabled=contact_data.get('Enabled'),
-            send_literature=contact_data.get('SendLiterature')
+            contact_id=getattr(contact_obj, 'ContactID', None),
+            customer_id=getattr(contact_obj, 'CustomerID', None),
+            first_name=getattr(contact_obj, 'FirstName', None),
+            last_name=getattr(contact_obj, 'LastName', None),
+            title=getattr(contact_obj, 'Title', None),
+            address=getattr(contact_obj, 'Address', None),
+            address_id=None,  # Not stored in Contacts table
+            city=getattr(contact_obj, 'City', None),
+            postal_code=getattr(contact_obj, 'PostalCode', None),
+            work_phone=getattr(contact_obj, 'WorkPhone', None),
+            work_extension=getattr(contact_obj, 'WorkExtension', None),
+            fax_number=getattr(contact_obj, 'FaxNumber', None),
+            referred_to=getattr(contact_obj, 'ReferredTo', None),
+            mobile_phone=getattr(contact_obj, 'MobilePhone', None),
+            christmas_card=getattr(contact_obj, 'ChristmasCard', None),
+            email_address=getattr(contact_obj, 'EmailAddress', None),
+            web_address=getattr(contact_obj, 'WebAddress', None),
+            customer_type_id=getattr(contact_obj, 'CustomerTypeID', None),
+            state_id=getattr(contact_obj, 'StateID', None),
+            country_id=getattr(contact_obj, 'CountryID', None),
+            temp_address=getattr(contact_obj, 'TempAddress', None),
+            exported=getattr(contact_obj, 'Exported', None),
+            enabled=getattr(contact_obj, 'Enabled', None),
+            send_literature=getattr(contact_obj, 'SendLiterature', None)
         )

app/schemas/contact.py

@@ -9,6 +9,7 @@ class ContactCreate(BaseModel):
     last_name: Optional[str] = Field(None, max_length=200, description="Contact last name")
     title: Optional[str] = Field(None, max_length=40, description="Contact title/position")
     address: Optional[str] = Field(None, max_length=200, description="Contact address")
+    address_id: Optional[int] = Field(None, description="Linked address ID (ContactAddress)")
     city: Optional[str] = Field(None, max_length=30, description="Contact city")
     postal_code: Optional[str] = Field(None, max_length=70, description="Contact postal code")
     work_phone: Optional[str] = Field(None, max_length=50, description="Work phone number")
@@ -34,6 +35,7 @@ class ContactOut(BaseModel):
     last_name: Optional[str] = Field(None, description="Contact last name")
     title: Optional[str] = Field(None, description="Contact title/position")
     address: Optional[str] = Field(None, description="Contact address")
+    address_id: Optional[int] = Field(None, description="Linked address ID (ContactAddress)")
     city: Optional[str] = Field(None, description="Contact city")
     postal_code: Optional[str] = Field(None, description="Contact postal code")
     work_phone: Optional[str] = Field(None, description="Work phone number")

tests/unit/conftest.py

@@ -6,6 +6,20 @@ from app.db.base import Base
 
 # Ensure models are imported so metadata is populated for create_all
 import app.db.models.address  # noqa: F401
+import app.db.models.barrier_size  # noqa: F401
+import app.db.models.bidder  # noqa: F401
+import app.db.models.bidder_contact  # noqa: F401
+import app.db.models.bidders_barrier_sizes  # noqa: F401
+import app.db.models.contact  # noqa: F401
+import app.db.models.contact_address  # noqa: F401
+import app.db.models.customer  # noqa: F401
+import app.db.models.distributor  # noqa: F401
+import app.db.models.employee  # noqa: F401
+import app.db.models.project  # noqa: F401
+import app.db.models.project_related  # noqa: F401
+import app.db.models.reference  # noqa: F401
+import app.db.models.report  # noqa: F401
+import app.db.models.user  # noqa: F401
 
 
 @pytest.fixture