fix(bidder, distributor, project): change EmployeeId type to string and update related schemas

app/controllers/projects.py

@@ -3,7 +3,7 @@ from sqlalchemy.orm import Session
 from app.db.session import get_db
 from app.services.project_service import ProjectService
 from app.schemas.project import ProjectCreate, ProjectOut
-from app.schemas.project_detail import ProjectDetailOut, ProjectCustomerOut
+from app.schemas.project_detail import ProjectDetailOut, ProjectCustomerOut, ProjectDetailNoCustomersOut
 from app.schemas.paginated_response import PaginatedResponse
 from typing import List, Optional
 
@@ -36,9 +36,12 @@ def list_projects(
         page_size=page_size
     )
 
-@router.get("/{project_no}", response_model=ProjectDetailOut)
+@router.get("/{project_no}", response_model=ProjectDetailNoCustomersOut)
 def get_project(project_no: int, db: Session = Depends(get_db)):
-    """Get a specific project by ProjectNo with full detailed information"""
+    """Get a specific project by ProjectNo without customers collection
+
+    For customer data, use `/api/v1/projects/{project_no}/customers` instead.
+    """
     service = ProjectService(db)
     return service.get_detailed(project_no)
 

app/db/models/bidder.py

@@ -28,4 +28,4 @@ class Bidder(Base):
     InvoiceDate = Column(DateTime, nullable=True)
     LessPayment = Column(String(50), nullable=True)
     Enabled = Column(Boolean, nullable=False, default=True)
-    EmployeeId = Column(Integer, nullable=True)
+    EmployeeId = Column(String(5), nullable=True)

app/db/models/distributor.py

@@ -23,4 +23,4 @@ class Distributor(Base):
     DateCreated = Column(DateTime, nullable=True)
     DateModified = Column(DateTime, nullable=True)
     Enabled = Column(Boolean, nullable=False, default=True)
-    EmployeeId = Column(Integer, nullable=True)
+    EmployeeId = Column(String(5), nullable=True)

app/db/repositories/bidder_repo.py

@@ -68,36 +68,39 @@ class BidderRepository:
         """
         try:
             with self.db.get_bind().connect() as conn:
-                bidders_query = text(f"""
+                bidders_query = text(
+                    """
                     SELECT 
-                        ProjNo as proj_no,
-                        CustId as cust_id, 
-                        Quote as quote,
-                        Contact as contact,
-                        Phone as phone,
-                        Notes as notes,
-                        DateLastContact as date_last_contact,
-                        DateFollowup as date_followup,
-                        [Primary] as is_primary,
-                        CustType as cust_type,
-                        EmailAddress as email_address,
-                        Id,
-                        Fax as fax,
-                        OrderNr as order_nr,
-                        CustomerPO as customer_po,
-                        ShipDate as ship_date,
-                        DeliverDate as deliver_date,
-                        ReplacementCost as replacement_cost,
-                        QuoteDate as quote_date,
-                        InvoiceDate as invoice_date,
-                        LessPayment as less_payment,
-                        Enabled as enabled,
-                        EmployeeId as employee_id
-                    FROM Bidders 
-                    WHERE ProjNo = :project_no
-                    ORDER BY [Primary] DESC, Id
+                        b.ProjNo as proj_no,
+                        b.CustId as cust_id,
+                        c.CompanyName as customer_name,
+                        b.Quote as quote,
+                        b.Contact as contact,
+                        b.Phone as phone,
+                        b.Notes as notes,
+                        b.DateLastContact as date_last_contact,
+                        b.DateFollowup as date_followup,
+                        b.[Primary] as is_primary,
+                        b.CustType as cust_type,
+                        b.EmailAddress as email_address,
+                        b.Id,
+                        b.Fax as fax,
+                        b.OrderNr as order_nr,
+                        b.CustomerPO as customer_po,
+                        b.ShipDate as ship_date,
+                        b.DeliverDate as deliver_date,
+                        b.ReplacementCost as replacement_cost,
+                        b.QuoteDate as quote_date,
+                        b.InvoiceDate as invoice_date,
+                        b.LessPayment as less_payment,
+                        b.Enabled as enabled,
+                        b.EmployeeId as employee_id
+                    FROM Bidders b
+                    LEFT JOIN Customers c ON b.CustId = CAST(c.CustomerID AS nvarchar)
+                    WHERE b.ProjNo = :project_no
+                    ORDER BY b.[Primary] DESC, b.Id
                     OFFSET :offset ROWS FETCH NEXT :limit ROWS ONLY
-                """,
+                    """
                 )
 
                 offset = max(0, (page - 1) * page_size)
@@ -117,34 +120,38 @@ class BidderRepository:
         """
         try:
             with self.db.get_bind().connect() as conn:
-                bidder_query = text("""
+                bidder_query = text(
+                    """
                     SELECT 
-                        ProjNo as proj_no,
-                        CustId as cust_id, 
-                        Quote as quote,
-                        Contact as contact,
-                        Phone as phone,
-                        Notes as notes,
-                        DateLastContact as date_last_contact,
-                        DateFollowup as date_followup,
-                        [Primary] as is_primary,
-                        CustType as cust_type,
-                        EmailAddress as email_address,
-                        Id,
-                        Fax as fax,
-                        OrderNr as order_nr,
-                        CustomerPO as customer_po,
-                        ShipDate as ship_date,
-                        DeliverDate as deliver_date,
-                        ReplacementCost as replacement_cost,
-                        QuoteDate as quote_date,
-                        InvoiceDate as invoice_date,
-                        LessPayment as less_payment,
-                        Enabled as enabled,
-                        EmployeeId as employee_id
-                    FROM Bidders 
-                    WHERE ProjNo = :project_no AND CustId = :customer_id
-                """)
+                        b.ProjNo as proj_no,
+                        b.CustId as cust_id,
+                        c.CompanyName as customer_name,
+                        b.Quote as quote,
+                        b.Contact as contact,
+                        b.Phone as phone,
+                        b.Notes as notes,
+                        b.DateLastContact as date_last_contact,
+                        b.DateFollowup as date_followup,
+                        b.[Primary] as is_primary,
+                        b.CustType as cust_type,
+                        b.EmailAddress as email_address,
+                        b.Id,
+                        b.Fax as fax,
+                        b.OrderNr as order_nr,
+                        b.CustomerPO as customer_po,
+                        b.ShipDate as ship_date,
+                        b.DeliverDate as deliver_date,
+                        b.ReplacementCost as replacement_cost,
+                        b.QuoteDate as quote_date,
+                        b.InvoiceDate as invoice_date,
+                        b.LessPayment as less_payment,
+                        b.Enabled as enabled,
+                        b.EmployeeId as employee_id
+                    FROM Bidders b
+                    LEFT JOIN Customers c ON b.CustId = CAST(c.CustomerID AS nvarchar)
+                    WHERE b.ProjNo = :project_no AND b.CustId = :customer_id
+                    """
+                )
                 
                 result = conn.execute(bidder_query, {"project_no": project_no, "customer_id": customer_id})
                 row = result.fetchone()
@@ -163,36 +170,40 @@ class BidderRepository:
         """
         try:
             with self.db.get_bind().connect() as conn:
-                bidders_query = text("""
+                bidders_query = text(
+                    """
                     SELECT 
-                        ProjNo as proj_no,
-                        CustId as cust_id, 
-                        Quote as quote,
-                        Contact as contact,
-                        Phone as phone,
-                        Notes as notes,
-                        DateLastContact as date_last_contact,
-                        DateFollowup as date_followup,
-                        [Primary] as is_primary,
-                        CustType as cust_type,
-                        EmailAddress as email_address,
-                        Id,
-                        Fax as fax,
-                        OrderNr as order_nr,
-                        CustomerPO as customer_po,
-                        ShipDate as ship_date,
-                        DeliverDate as deliver_date,
-                        ReplacementCost as replacement_cost,
-                        QuoteDate as quote_date,
-                        InvoiceDate as invoice_date,
-                        LessPayment as less_payment,
-                        Enabled as enabled,
-                        EmployeeId as employee_id
-                    FROM Bidders 
-                    WHERE CustId = :customer_id
-                    ORDER BY ProjNo DESC, Id
+                        b.ProjNo as proj_no,
+                        b.CustId as cust_id,
+                        c.CompanyName as customer_name,
+                        b.Quote as quote,
+                        b.Contact as contact,
+                        b.Phone as phone,
+                        b.Notes as notes,
+                        b.DateLastContact as date_last_contact,
+                        b.DateFollowup as date_followup,
+                        b.[Primary] as is_primary,
+                        b.CustType as cust_type,
+                        b.EmailAddress as email_address,
+                        b.Id,
+                        b.Fax as fax,
+                        b.OrderNr as order_nr,
+                        b.CustomerPO as customer_po,
+                        b.ShipDate as ship_date,
+                        b.DeliverDate as deliver_date,
+                        b.ReplacementCost as replacement_cost,
+                        b.QuoteDate as quote_date,
+                        b.InvoiceDate as invoice_date,
+                        b.LessPayment as less_payment,
+                        b.Enabled as enabled,
+                        b.EmployeeId as employee_id
+                    FROM Bidders b
+                    LEFT JOIN Customers c ON b.CustId = CAST(c.CustomerID AS nvarchar)
+                    WHERE b.CustId = :customer_id
+                    ORDER BY b.ProjNo DESC, b.Id
                     OFFSET :offset ROWS FETCH NEXT :limit ROWS ONLY
-                """)
+                    """
+                )
                 
                 offset = max(0, (page - 1) * page_size)
                 limit = max(1, min(page_size, 1000))
@@ -486,6 +497,12 @@ class BidderRepository:
                 return int(value)
             except (ValueError, TypeError):
                 return None
+        
+        # Helper function to safely convert to string, handling None values
+        def safe_string_conversion(value):
+            if value is None or value == 'None':
+                return None
+            return str(value).strip() if value else None
             
         return BidderOut(
             id=bidder_data.get('Id'),
@@ -510,5 +527,5 @@ class BidderRepository:
             invoice_date=bidder_data.get('InvoiceDate'),
             less_payment=safe_float_conversion(bidder_data.get('LessPayment')),
             enabled=bidder_data.get('Enabled'),
-            employee_id=safe_int_conversion(bidder_data.get('EmployeeId'))
+            employee_id=safe_string_conversion(bidder_data.get('EmployeeId'))
         )

app/schemas/bidder.py

@@ -24,7 +24,7 @@ class BidderCreate(BaseModel):
     invoice_date: Optional[datetime] = Field(None, description="Invoice date")
     less_payment: Optional[float] = Field(None, description="Less payment")
     enabled: Optional[bool] = Field(True, description="Enabled status")
-    employee_id: Optional[int] = Field(None, description="Employee ID")
+    employee_id: Optional[str] = Field(None, description="Employee ID")
 
 class BidderOut(BaseModel):
     id: int = Field(..., description="Bidder ID")
@@ -49,7 +49,7 @@ class BidderOut(BaseModel):
     invoice_date: Optional[datetime] = Field(None, description="Invoice date")
     less_payment: Optional[float] = Field(None, description="Less payment")
     enabled: Optional[bool] = Field(None, description="Enabled status")
-    employee_id: Optional[int] = Field(None, description="Employee ID")
+    employee_id: Optional[str] = Field(None, description="Employee ID")
 
     class Config:
         from_attributes = True  # Updated for Pydantic v2

app/schemas/distributor.py

@@ -19,7 +19,7 @@ class DistributorCreate(BaseModel):
     status: Optional[str] = Field("active", description="Distributor status")
     notes: Optional[str] = Field(None, description="Additional notes")
     enabled: Optional[bool] = Field(True, description="Enabled status")
-    employee_id: Optional[int] = Field(None, description="Employee ID")
+    employee_id: Optional[str] = Field(None, description="Employee ID")
 
 class DistributorOut(BaseModel):
     id: int = Field(..., description="Distributor ID")
@@ -41,7 +41,7 @@ class DistributorOut(BaseModel):
     date_created: Optional[datetime] = Field(None, description="Date created")
     date_modified: Optional[datetime] = Field(None, description="Date modified")
     enabled: Optional[bool] = Field(None, description="Enabled status")
-    employee_id: Optional[int] = Field(None, description="Employee ID")
+    employee_id: Optional[str] = Field(None, description="Employee ID")
 
     class Config:
         from_attributes = True  # Updated for Pydantic v2

app/schemas/project_detail.py

@@ -39,6 +39,7 @@ class BidderNoteOut(BaseModel):
 class ProjectCustomerOut(BaseModel):
     proj_no: int = Field(0, description="Project number")
     cust_id: str = Field(..., description="Customer ID")
+    customer_name: Optional[str] = Field(None, description="Customer company name")
     quote: Optional[Decimal] = Field(None, description="Quote amount")
     contact: Optional[str] = Field(None, description="Contact person")
     phone: Optional[str] = Field(None, description="Phone number")
@@ -159,6 +160,97 @@ class ProjectDetailOut(BaseModel):
     customers: List[ProjectCustomerOut] = Field(default_factory=list, description="Project customers")
     project_notes: List[ProjectNoteDetailOut] = Field(default_factory=list, alias="projectNotes", description="Project notes")
 
+    class Config:
+        allow_population_by_field_name = True
+        populate_by_name = True
+
+
+class ProjectDetailNoCustomersOut(BaseModel):
+    """Project detail schema without the customers collection.
+
+    Use this for endpoints where we don't want to include the potentially
+    large customers payload. Keeps project_notes for context.
+    """
+
+    # Basic project fields (using camelCase to match legacy API)
+    project_no: int = Field(..., alias="projectNo", description="Project number")
+    project_name: str = Field(..., alias="projectName", description="Project name")
+    project_location: Optional[str] = Field(None, alias="projectLocation", description="Project location")
+    project_type: Optional[str] = Field(None, alias="projectType", description="Project type")
+    bid_date: Optional[datetime] = Field(None, alias="bidDate", description="Bid date")
+    start_date: Optional[datetime] = Field(None, alias="startDate", description="Start date")
+    is_awarded: bool = Field(False, alias="isAwarded", description="Awarded status")
+    install: bool = Field(False, description="Install option")
+    notes: Optional[str] = Field(None, description="Project notes")
+    barrier_size: Optional[str] = Field(None, alias="barrierSize", description="Barrier size")
+    lease_term: Optional[str] = Field(None, alias="leaseTerm", description="Lease term")
+    purchase_option: bool = Field(False, alias="purchaseOption", description="Purchase option")
+    lead_source: Optional[str] = Field(None, alias="leadSource", description="Lead source")
+    rep: Optional[str] = Field(None, description="Representative")
+    engineer_company_id: Optional[str] = Field(None, alias="engineerCompanyId", description="Engineer company ID")
+    engineer_notes: Optional[str] = Field(None, alias="engineerNotes", description="Engineer notes")
+    status: Optional[int] = Field(None, description="Project status")
+
+    # Billing information
+    bill_name: Optional[str] = Field(None, alias="billName", description="Billing name")
+    bill_address1: Optional[str] = Field(None, alias="billAddress1", description="Billing address 1")
+    bill_address2: Optional[str] = Field(None, alias="billAddress2", description="Billing address 2")
+    bill_city: Optional[str] = Field(None, alias="billCity", description="Billing city")
+    bill_state: Optional[str] = Field(None, alias="billState", description="Billing state")
+    bill_zip: Optional[str] = Field(None, alias="billZip", description="Billing ZIP")
+    bill_email: Optional[str] = Field(None, alias="billEmail", description="Billing email")
+    bill_phone: Optional[str] = Field(None, alias="billPhone", description="Billing phone")
+
+    # Shipping information
+    ship_name: Optional[str] = Field(None, alias="shipName", description="Shipping name")
+    ship_address1: Optional[str] = Field(None, alias="shipAddress1", description="Shipping address 1")
+    ship_address2: Optional[str] = Field(None, alias="shipAddress2", description="Shipping address 2")
+    ship_city: Optional[str] = Field(None, alias="shipCity", description="Shipping city")
+    ship_state: Optional[str] = Field(None, alias="shipState", description="Shipping state")
+    ship_zip: Optional[str] = Field(None, alias="shipZip", description="Shipping ZIP")
+    ship_email: Optional[str] = Field(None, alias="shipEmail", description="Shipping email")
+    ship_phone: Optional[str] = Field(None, alias="shipPhone", description="Shipping phone")
+    ship_office_phone: Optional[str] = Field(None, alias="shipOfficePhone", description="Shipping office phone")
+
+    # Additional fields from legacy API
+    fas_dam: bool = Field(False, alias="fasDam", description="FAS DAM flag")
+    engineer_company: Optional[str] = Field(None, alias="engineerCompany", description="Engineer company")
+    customer_type_id: Optional[int] = Field(None, alias="customertTypeId", description="Customer type ID")
+    acct_payable: Optional[str] = Field(None, alias="acctPayable", description="Account payable")
+    payment_term_id: Optional[int] = Field(None, alias="paymentTermId", description="Payment term ID")
+    payment_note: Optional[str] = Field(None, alias="paymentNote", description="Payment note")
+    rental_price_id: Optional[int] = Field(None, alias="rentalPriceId", description="Rental price ID")
+    purchase_price_id: Optional[int] = Field(None, alias="purchasePriceId", description="Purchase price ID")
+    est_ship_date_id: Optional[int] = Field(None, alias="estShipDateId", description="Estimated ship date ID")
+    fob_id: Optional[int] = Field(None, alias="fobId", description="FOB ID")
+    expedite_fee: Optional[Decimal] = Field(None, alias="expediteFee", description="Expedite fee")
+    est_freight_id: Optional[int] = Field(None, alias="estFreightId", description="Estimated freight ID")
+    est_freight_fee: Optional[Decimal] = Field(None, alias="estFreightFee", description="Estimated freight fee")
+    tax_rate: Optional[Decimal] = Field(None, alias="taxRate", description="Tax rate")
+    weekly_charge: Optional[Decimal] = Field(None, alias="weeklyCharge", description="Weekly charge")
+    crew_members: Optional[int] = Field(None, alias="crewMembers", description="Crew members")
+    tack_hoes: Optional[int] = Field(None, alias="tackHoes", description="Tack hoes")
+    water_pump: Optional[str] = Field(None, alias="waterPump", description="Water pump")
+    water_pump2: Optional[str] = Field(None, alias="waterPump2", description="Water pump 2")
+    est_installation_time: Optional[int] = Field(None, alias="estInstalationTime", description="Estimated installation time")  # Note: legacy has typo
+    repair_kits: Optional[int] = Field(None, alias="repairKits", description="Repair kits")
+    installation_advisor: Optional[str] = Field(None, alias="installationAdvisor", description="Installation advisor")
+    employee_id: Optional[str] = Field(None, alias="employeeId", description="Employee ID")
+    install_date: Optional[datetime] = Field(None, alias="installDate", description="Install date")
+    commission: Optional[Decimal] = Field(None, description="Commission")
+    advisor_id: Optional[str] = Field(None, alias="advisorId", description="Advisor ID")
+    pipes: Optional[int] = Field(None, description="Pipes")
+    timpers: Optional[int] = Field(None, description="Timpers")
+    ship_via: Optional[str] = Field(None, alias="shipVia", description="Ship via")
+    valid_for: Optional[str] = Field(None, alias="validFor", description="Valid for")
+    same_bill_address: bool = Field(False, alias="sameBillAddress", description="Same billing address")
+    order_number: Optional[str] = Field(None, alias="orderNumber", description="Order number")
+    order_status: Optional[str] = Field(None, alias="orderStatus", description="Order status")
+    is_international: Optional[bool] = Field(None, alias="isInternational", description="International flag")
+
+    # Only keep project notes; omit customers
+    project_notes: List[ProjectNoteDetailOut] = Field(default_factory=list, alias="projectNotes", description="Project notes")
+
     class Config:
         allow_population_by_field_name = True
         populate_by_name = True

app/services/project_service.py

@@ -210,6 +210,7 @@ class ProjectService:
         customer = ProjectCustomerOut(
             proj_no=bidder_data.get('proj_no', 0),
             cust_id=str(bidder_data.get('cust_id', '')),
+            customer_name=bidder_data.get('customer_name'),
             quote=bidder_data.get('quote'),
             contact=bidder_data.get('contact'),
             phone=bidder_data.get('phone'),
@@ -324,6 +325,7 @@ class ProjectService:
             customer = ProjectCustomerOut(
                 proj_no=bidder_data.get('proj_no', 0),
                 cust_id=str(bidder_data.get('cust_id', '')),
+                customer_name=bidder_data.get('customer_name'),
                 quote=bidder_data.get('quote'),
                 contact=bidder_data.get('contact'),
                 phone=bidder_data.get('phone'),
@@ -889,6 +891,7 @@ class ProjectService:
                 customer = ProjectCustomerOut(
                     proj_no=bidder_data.get('proj_no', 0),
                     cust_id=str(bidder_data.get('cust_id', '')),
+                    customer_name=bidder_data.get('customer_name'),
                     quote=bidder_data.get('quote'),
                     contact=bidder_data.get('contact'),
                     phone=bidder_data.get('phone'),