Implement project creation via stored procedure; update ProjectCreate schema, ProjectService, and add test scripts for validation

app/controllers/projects.py

@@ -1,12 +1,3 @@
-from fastapi import APIRouter, Depends, status
-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 typing import List
-
-router = APIRouter(prefix="/api/v1/projects", tags=["projects"])
-
 from fastapi import APIRouter, Depends, status, Query
 from sqlalchemy.orm import Session
 from app.db.session import get_db
@@ -52,9 +43,17 @@ def get_project(project_no: int, db: Session = Depends(get_db)):
 
 @router.post("/", response_model=ProjectOut, status_code=status.HTTP_201_CREATED)
 def create_project(project_in: ProjectCreate, db: Session = Depends(get_db)):
-    """Create a new project"""
+    """
+    Create a new project using stored procedure
+    
+    Creates a new project record using the spProjectsInsert stored procedure.
+    All project fields including billing, shipping, payment, and project details
+    can be provided in the request body.
+    
+    Returns the created project with the generated ProjectNo.
+    """
     service = ProjectService(db)
-    return service.create(project_in.dict())
+    return service.create(project_in.model_dump())
 
 @router.put("/{project_no}", response_model=ProjectOut)
 def update_project(project_no: int, project_in: ProjectCreate, db: Session = Depends(get_db)):

app/db/repositories/project_repo.py

@@ -3,6 +3,7 @@ from sqlalchemy import text, Row
 from app.db.models.project import Project
 from typing import List, Tuple, Dict, Any
 from app.core.exceptions import RepositoryException
+from app.schemas.project import ProjectCreate
 import logging
 
 logger = logging.getLogger(__name__)
@@ -15,6 +16,168 @@ class ProjectRepository:
         """Get a single project by ProjectNo"""
         return self.db.query(Project).filter(Project.project_no == project_no).first()
 
+    def create_via_sp(self, project_data: ProjectCreate) -> int:
+        """
+        Create a new project using the spProjectsInsert stored procedure
+        
+        Args:
+            project_data: ProjectCreate schema containing all project fields
+            
+        Returns:
+            int: The new ProjectNo (project ID) generated by the stored procedure
+        """
+        try:
+            # Prepare the stored procedure call with all parameters
+            sp_query = text("""
+                DECLARE @ProjectNo INT;
+                EXEC spProjectsInsert
+                    @ProjectName = :project_name,
+                    @ProjectLocation = :project_location,
+                    @ProjectType = :project_type,
+                    @BidDate = :bid_date,
+                    @StartDate = :start_date,
+                    @IsAwarded = :is_awarded,
+                    @Notes = :notes,
+                    @BarrierSize = :barrier_size,
+                    @LeaseTerm = :lease_term,
+                    @PurchaseOption = :purchase_option,
+                    @LeadSource = :lead_source,
+                    @rep = :rep,
+                    @EngineerCompanyId = :engineer_company_id,
+                    @EngineerNotes = :engineer_notes,
+                    @Status = :status,
+                    @Bill_Name = :bill_name,
+                    @Bill_Address1 = :bill_address1,
+                    @Bill_Address2 = :bill_address2,
+                    @Bill_City = :bill_city,
+                    @Bill_State = :bill_state,
+                    @Bill_Zip = :bill_zip,
+                    @Ship_Name = :ship_name,
+                    @Ship_Address1 = :ship_address1,
+                    @Ship_Address2 = :ship_address2,
+                    @Ship_City = :ship_city,
+                    @Ship_State = :ship_state,
+                    @Ship_Zip = :ship_zip,
+                    @Acct_Payable = :acct_payable,
+                    @Bill_Email = :bill_email,
+                    @Bill_Phone = :bill_phone,
+                    @Ship_Email = :ship_email,
+                    @Ship_Phone = :ship_phone,
+                    @Ship_OfficePhone = :ship_office_phone,
+                    @_FasDam = :fas_dam,
+                    @EngineerCompany = :engineer_company,
+                    @CustomerTypeID = :customer_type_id,
+                    @PaymentTermId = :payment_term_id,
+                    @PaymentNote = :payment_note,
+                    @RentalPriceId = :rental_price_id,
+                    @PurchasePriceId = :purchase_price_id,
+                    @EstShipDateId = :est_ship_date_id,
+                    @FOBId = :fob_id,
+                    @ExpediteFee = :expedite_fee,
+                    @EstFreightId = :est_freight_id,
+                    @EstFreightFee = :est_freight_fee,
+                    @TaxRate = :tax_rate,
+                    @WeeklyCharge = :weekly_charge,
+                    @CrewMembers = :crew_members,
+                    @TackHoes = :tack_hoes,
+                    @WaterPump = :water_pump,
+                    @WaterPump2 = :water_pump2,
+                    @Pipes = :pipes,
+                    @Timpers = :timpers,
+                    @EstInstalationTime = :est_installation_time,
+                    @RepairKits = :repair_kits,
+                    @InstallationAdvisor = :installation_advisor,
+                    @EmployeeId = :employee_id,
+                    @InstallDate = :install_date,
+                    @Commission = :commission,
+                    @AdvisorId = :advisor_id,
+                    @ShipVia = :ship_via,
+                    @ValidFor = :valid_for,
+                    @ProjectNo = @ProjectNo OUTPUT;
+                SELECT @ProjectNo AS ProjectNo;
+            """)
+            
+            # Execute the stored procedure with parameters
+            result = self.db.execute(sp_query, {
+                'project_name': project_data.project_name,
+                'project_location': project_data.project_location,
+                'project_type': project_data.project_type,
+                'bid_date': project_data.bid_date,
+                'start_date': project_data.start_date,
+                'is_awarded': project_data.is_awarded,
+                'notes': project_data.notes,
+                'barrier_size': project_data.barrier_size,
+                'lease_term': project_data.lease_term,
+                'purchase_option': project_data.purchase_option,
+                'lead_source': project_data.lead_source,
+                'rep': project_data.rep,
+                'engineer_company_id': project_data.engineer_company_id,
+                'engineer_notes': project_data.engineer_notes,
+                'status': project_data.status,
+                'bill_name': project_data.bill_name,
+                'bill_address1': project_data.bill_address1,
+                'bill_address2': project_data.bill_address2,
+                'bill_city': project_data.bill_city,
+                'bill_state': project_data.bill_state,
+                'bill_zip': project_data.bill_zip,
+                'ship_name': project_data.ship_name,
+                'ship_address1': project_data.ship_address1,
+                'ship_address2': project_data.ship_address2,
+                'ship_city': project_data.ship_city,
+                'ship_state': project_data.ship_state,
+                'ship_zip': project_data.ship_zip,
+                'acct_payable': project_data.acct_payable,
+                'bill_email': project_data.bill_email,
+                'bill_phone': project_data.bill_phone,
+                'ship_email': project_data.ship_email,
+                'ship_phone': project_data.ship_phone,
+                'ship_office_phone': project_data.ship_office_phone,
+                'fas_dam': project_data.fas_dam,
+                'engineer_company': project_data.engineer_company,
+                'customer_type_id': project_data.customer_type_id,
+                'payment_term_id': project_data.payment_term_id,
+                'payment_note': project_data.payment_note,
+                'rental_price_id': project_data.rental_price_id,
+                'purchase_price_id': project_data.purchase_price_id,
+                'est_ship_date_id': project_data.est_ship_date_id,
+                'fob_id': project_data.fob_id,
+                'expedite_fee': project_data.expedite_fee,
+                'est_freight_id': project_data.est_freight_id,
+                'est_freight_fee': project_data.est_freight_fee,
+                'tax_rate': project_data.tax_rate,
+                'weekly_charge': project_data.weekly_charge,
+                'crew_members': project_data.crew_members,
+                'tack_hoes': project_data.tack_hoes,
+                'water_pump': project_data.water_pump,
+                'water_pump2': project_data.water_pump2,
+                'pipes': project_data.pipes,
+                'timpers': project_data.timpers,
+                'est_installation_time': project_data.est_installation_time,
+                'repair_kits': project_data.repair_kits,
+                'installation_advisor': project_data.installation_advisor,
+                'employee_id': project_data.employee_id,
+                'install_date': project_data.install_date,
+                'commission': project_data.commission,
+                'advisor_id': project_data.advisor_id,
+                'ship_via': project_data.ship_via,
+                'valid_for': project_data.valid_for
+            })
+            
+            # Get the generated ProjectNo from the output
+            project_row = result.fetchone()
+            if project_row and hasattr(project_row, 'ProjectNo'):
+                project_no = project_row.ProjectNo
+                self.db.commit()
+                logger.info(f"Successfully created project with ProjectNo: {project_no}")
+                return project_no
+            else:
+                raise RepositoryException("Failed to get ProjectNo from stored procedure")
+                
+        except Exception as e:
+            self.db.rollback()
+            logger.error(f"Error calling spProjectsInsert stored procedure: {e}")
+            raise RepositoryException(f"Failed to create project: {e}")
+
     def list_via_sp(self, customer_type: int = 0, order_by: str = "ProjectNo", 
                    order_direction: str = "ASC", page: int = 1, page_size: int = 10) -> Tuple[List[Dict[str, Any]], int]:
         """

app/schemas/project.py

@@ -42,6 +42,40 @@ class ProjectCreate(BaseModel):
     ship_email: Optional[str] = None
     ship_phone: Optional[str] = None
     ship_office_phone: Optional[str] = None
+    
+    # Accounts and payment information
+    acct_payable: Optional[str] = None
+    payment_term_id: Optional[int] = None
+    payment_note: Optional[str] = None
+    rental_price_id: Optional[int] = None
+    purchase_price_id: Optional[int] = None
+    est_ship_date_id: Optional[int] = None
+    fob_id: Optional[int] = None
+    expedite_fee: Optional[Decimal] = None
+    est_freight_id: Optional[int] = None
+    est_freight_fee: Optional[Decimal] = None
+    tax_rate: Optional[Decimal] = None
+    weekly_charge: Optional[Decimal] = None
+    
+    # Project details
+    crew_members: Optional[int] = None
+    tack_hoes: Optional[int] = None
+    water_pump: Optional[int] = None
+    water_pump2: Optional[int] = None
+    pipes: Optional[int] = None
+    timpers: Optional[int] = None
+    est_installation_time: Optional[int] = None
+    repair_kits: Optional[str] = None
+    installation_advisor: Optional[str] = None
+    employee_id: Optional[str] = None
+    install_date: Optional[datetime] = None
+    commission: Optional[Decimal] = None
+    advisor_id: Optional[str] = None
+    ship_via: Optional[str] = None
+    valid_for: Optional[str] = None
+    
+    # Special fields
+    fas_dam: Optional[bool] = False
 
 class ProjectOut(BaseModel):
     project_no: int
@@ -84,25 +118,41 @@ class ProjectOut(BaseModel):
     ship_phone: Optional[str] = None
     ship_office_phone: Optional[str] = None
     
-    # Payment and pricing info
+    # Accounts and payment information
     acct_payable: Optional[str] = None
     payment_term_id: Optional[int] = None
     payment_note: Optional[str] = None
     rental_price_id: Optional[int] = None
     purchase_price_id: Optional[int] = None
-    
-    # Financial info
+    est_ship_date_id: Optional[int] = None
+    fob_id: Optional[int] = None
+    expedite_fee: Optional[Decimal] = None
+    est_freight_id: Optional[int] = None
+    est_freight_fee: Optional[Decimal] = None
     tax_rate: Optional[Decimal] = None
     weekly_charge: Optional[Decimal] = None
-    commission: Optional[Decimal] = None
     
     # Project details
     crew_members: Optional[int] = None
-    install_date: Optional[datetime] = None
+    tack_hoes: Optional[int] = None
+    water_pump: Optional[int] = None
+    water_pump2: Optional[int] = None
+    pipes: Optional[int] = None
+    timpers: Optional[int] = None
+    est_installation_time: Optional[int] = None
+    repair_kits: Optional[str] = None
+    installation_advisor: Optional[str] = None
     employee_id: Optional[str] = None
+    install_date: Optional[datetime] = None
+    commission: Optional[Decimal] = None
     advisor_id: Optional[str] = None
+    ship_via: Optional[str] = None
+    valid_for: Optional[str] = None
+    
+    # Special fields
+    fas_dam: Optional[bool] = False
     
-    # Flags
+    # Legacy compatibility fields
     is_international: Optional[bool] = None
     order_number: Optional[str] = None
 

app/services/project_service.py

@@ -163,9 +163,30 @@ class ProjectService:
         """Legacy list method for backward compatibility"""
         return self.repo.list(customer_id, status, skip, limit)
 
-    def create(self, data):
-        project = Project(**data)
-        return self.repo.create(project)
+    def create(self, project_data: dict):
+        """
+        Create a new project using stored procedure
+        
+        Args:
+            project_data: Dictionary containing project creation data
+            
+        Returns:
+            ProjectOut: The created project data
+        """
+        from app.schemas.project import ProjectCreate
+        
+        # Validate input data using Pydantic schema
+        project_create = ProjectCreate(**project_data)
+        
+        # Create project via stored procedure
+        project_no = self.repo.create_via_sp(project_create)
+        
+        # Retrieve the created project to return as ProjectOut
+        created_project = self.repo.get(project_no)
+        if not created_project:
+            raise NotFoundException("Failed to retrieve created project")
+            
+        return created_project
 
     def update(self, project_no: int, data):
         project = self.repo.get(project_no)

test_create_curl.sh

@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Test script for the create_project endpoint using curl
+
+echo "Testing project creation via stored procedure..."
+
+# Create test payload
+cat > test_project.json << 'EOF'
+{
+    "project_name": "Test Aqua Barrier Project",
+    "project_location": "Los Angeles, CA", 
+    "project_type": "Commercial",
+    "bid_date": "2024-01-15T10:00:00",
+    "start_date": "2024-02-01T08:00:00",
+    "is_awarded": true,
+    "notes": "Test project for SP validation",
+    "barrier_size": "50ft x 100ft",
+    "lease_term": "12 months",
+    "purchase_option": false,
+    "lead_source": "Website",
+    "rep": "John Doe",
+    "engineer_company_id": 1,
+    "engineer_notes": "Standard installation required",
+    "engineer_company": "ABC Engineering",
+    "status": 1,
+    "customer_type_id": 1,
+    "bill_name": "Test Company Inc",
+    "bill_address1": "123 Main Street",
+    "bill_address2": "Suite 100",
+    "bill_city": "Los Angeles",
+    "bill_state": "CA",
+    "bill_zip": "90210",
+    "bill_email": "billing@testcompany.com",
+    "bill_phone": "555-123-4567",
+    "ship_name": "Test Company Inc",
+    "ship_address1": "456 Oak Avenue",
+    "ship_city": "Los Angeles",
+    "ship_state": "CA", 
+    "ship_zip": "90211",
+    "ship_email": "shipping@testcompany.com",
+    "ship_phone": "555-234-5678",
+    "ship_office_phone": "555-345-6789",
+    "acct_payable": "AP Department",
+    "payment_term_id": 1,
+    "payment_note": "Net 30",
+    "rental_price_id": 1,
+    "purchase_price_id": 1,
+    "est_ship_date_id": 1,
+    "fob_id": 1,
+    "expedite_fee": "500.00",
+    "est_freight_id": 1,
+    "est_freight_fee": "250.00",
+    "tax_rate": "8.25",
+    "weekly_charge": "1500.00",
+    "crew_members": 3,
+    "tack_hoes": 2,
+    "water_pump": 1,
+    "water_pump2": 1,
+    "pipes": 10,
+    "timpers": 5,
+    "est_installation_time": 8,
+    "repair_kits": "Standard Kit",
+    "installation_advisor": "Installation notes here...",
+    "employee_id": "EMP001",
+    "install_date": "2024-02-15T09:00:00",
+    "commission": "1000.00",
+    "advisor_id": "ADV001",
+    "ship_via": "UPS Ground",
+    "valid_for": "Quote valid for 30 days",
+    "fas_dam": false
+}
+EOF
+
+echo "Making POST request to create project..."
+echo ""
+
+# Make the API call
+response=$(curl -s -w "\nHTTP_STATUS:%{http_code}\n" \
+    -X POST \
+    -H "Content-Type: application/json" \
+    -d @test_project.json \
+    http://localhost:8000/api/v1/projects/)
+
+# Parse response
+http_status=$(echo "$response" | grep "HTTP_STATUS" | cut -d: -f2)
+response_body=$(echo "$response" | sed '/HTTP_STATUS/d')
+
+echo "HTTP Status: $http_status"
+echo ""
+
+if [ "$http_status" = "201" ]; then
+    echo "✅ Project created successfully!"
+    echo "Response:"
+    echo "$response_body" | python -m json.tool 2>/dev/null || echo "$response_body"
+else
+    echo "❌ Error creating project"
+    echo "Response:"
+    echo "$response_body"
+fi
+
+# Clean up
+rm -f test_project.json
+
+echo ""
+echo "Test completed."

test_create_project.py

@@ -0,0 +1,127 @@
+#!/usr/bin/env python3
+"""
+Test script for the create_project endpoint using the spProjectsInsert stored procedure
+"""
+import requests
+import json
+from datetime import datetime
+from decimal import Decimal
+
+# API endpoint
+BASE_URL = "http://localhost:8000"
+ENDPOINT = f"{BASE_URL}/api/v1/projects/"
+
+def test_create_project():
+    """Test creating a project with the new stored procedure implementation"""
+    
+    # Sample project data matching the stored procedure parameters
+    project_data = {
+        "project_name": "Test Aqua Barrier Project",
+        "project_location": "Los Angeles, CA", 
+        "project_type": "Commercial",
+        "bid_date": "2024-01-15T10:00:00",
+        "start_date": "2024-02-01T08:00:00",
+        "is_awarded": True,
+        "notes": "Test project for SP validation",
+        "barrier_size": "50ft x 100ft",
+        "lease_term": "12 months",
+        "purchase_option": False,
+        "lead_source": "Website",
+        "rep": "John Doe",
+        "engineer_company_id": 1,
+        "engineer_notes": "Standard installation required",
+        "engineer_company": "ABC Engineering",
+        "status": 1,
+        "customer_type_id": 1,
+        
+        # Billing address
+        "bill_name": "Test Company Inc",
+        "bill_address1": "123 Main Street",
+        "bill_address2": "Suite 100",
+        "bill_city": "Los Angeles",
+        "bill_state": "CA",
+        "bill_zip": "90210",
+        "bill_email": "billing@testcompany.com",
+        "bill_phone": "555-123-4567",
+        
+        # Shipping address
+        "ship_name": "Test Company Inc",
+        "ship_address1": "456 Oak Avenue",
+        "ship_city": "Los Angeles",
+        "ship_state": "CA", 
+        "ship_zip": "90211",
+        "ship_email": "shipping@testcompany.com",
+        "ship_phone": "555-234-5678",
+        "ship_office_phone": "555-345-6789",
+        
+        # Payment and project details
+        "acct_payable": "AP Department",
+        "payment_term_id": 1,
+        "payment_note": "Net 30",
+        "rental_price_id": 1,
+        "purchase_price_id": 1,
+        "est_ship_date_id": 1,
+        "fob_id": 1,
+        "expedite_fee": "500.00",
+        "est_freight_id": 1,
+        "est_freight_fee": "250.00",
+        "tax_rate": "8.25",
+        "weekly_charge": "1500.00",
+        "crew_members": 3,
+        "tack_hoes": 2,
+        "water_pump": 1,
+        "water_pump2": 1,
+        "pipes": 10,
+        "timpers": 5,
+        "est_installation_time": 8,
+        "repair_kits": "Standard Kit",
+        "installation_advisor": "Installation notes here...",
+        "employee_id": "EMP001",
+        "install_date": "2024-02-15T09:00:00",
+        "commission": "1000.00",
+        "advisor_id": "ADV001",
+        "ship_via": "UPS Ground",
+        "valid_for": "Quote valid for 30 days",
+        "fas_dam": False
+    }
+    
+    print("Testing project creation via stored procedure...")
+    print(f"POST {ENDPOINT}")
+    print(f"Payload: {json.dumps(project_data, indent=2)}")
+    
+    try:
+        # Make the API call
+        response = requests.post(
+            ENDPOINT,
+            json=project_data,
+            headers={"Content-Type": "application/json"}
+        )
+        
+        print(f"\nResponse Status: {response.status_code}")
+        print(f"Response Headers: {dict(response.headers)}")
+        
+        if response.status_code == 201:
+            result = response.json()
+            print(f"\n✅ Project created successfully!")
+            print(f"ProjectNo: {result.get('project_no')}")
+            print(f"Project Name: {result.get('project_name')}")
+            print(f"Response: {json.dumps(result, indent=2, default=str)}")
+            return True
+        else:
+            print(f"\n❌ Error creating project")
+            print(f"Error: {response.text}")
+            return False
+            
+    except requests.exceptions.RequestException as e:
+        print(f"\n❌ Network error: {e}")
+        return False
+    except Exception as e:
+        print(f"\n❌ Unexpected error: {e}")
+        return False
+
+if __name__ == "__main__":
+    success = test_create_project()
+    if success:
+        print("\n🎉 Test completed successfully!")
+    else:
+        print("\n💥 Test failed!")