Enhance project management with stored procedures; update project retrieval and modification methods, and add comprehensive test scripts for validation

app/controllers/projects.py

@@ -57,9 +57,17 @@ def create_project(project_in: ProjectCreate, db: Session = Depends(get_db)):
 
 @router.put("/{project_no}", response_model=ProjectOut)
 def update_project(project_no: int, project_in: ProjectCreate, db: Session = Depends(get_db)):
-    """Update an existing project"""
+    """
+    Update an existing project using stored procedure
+    
+    Updates an existing project record using the spProjectsUpdate stored procedure.
+    All project fields including billing, shipping, payment, and project details
+    can be updated in the request body.
+    
+    Returns the updated project data.
+    """
     service = ProjectService(db)
-    return service.update(project_no, project_in.dict())
+    return service.update(project_no, project_in.model_dump())
 
 @router.delete("/{project_no}", status_code=status.HTTP_204_NO_CONTENT)
 def delete_project(project_no: int, db: Session = Depends(get_db)):

app/db/repositories/project_repo.py

@@ -16,6 +16,44 @@ class ProjectRepository:
         """Get a single project by ProjectNo"""
         return self.db.query(Project).filter(Project.project_no == project_no).first()
 
+    def get_via_sp(self, project_no: int) -> Dict[str, Any]:
+        """
+        Get a single project using the spProjectsGet stored procedure
+        
+        Args:
+            project_no: The ProjectNo to retrieve
+            
+        Returns:
+            Dict containing project data or None if not found
+        """
+        try:
+            # Call the stored procedure
+            sp_query = text("""
+                EXEC spProjectsGet @ProjectNo = :project_no
+            """)
+            
+            result = self.db.execute(sp_query, {'project_no': project_no})
+            
+            if result.returns_rows:
+                project_row = result.fetchone()
+                if project_row:
+                    project_data = dict(project_row._mapping)
+                    logger.info(f"Retrieved project {project_no} via stored procedure")
+                    return project_data
+                    
+            logger.info(f"Project {project_no} not found via stored procedure")
+            return None
+            
+        except Exception as e:
+            logger.error(f"Error calling spProjectsGet stored procedure: {e}")
+            # Fallback to ORM method
+            logger.info(f"Falling back to ORM method for project {project_no}")
+            project = self.get(project_no)
+            if project:
+                # Convert SQLAlchemy model to dict for consistency
+                return {column.name: getattr(project, column.name) for column in project.__table__.columns}
+            return None
+
     def create_via_sp(self, project_data: ProjectCreate) -> int:
         """
         Create a new project using the spProjectsInsert stored procedure
@@ -178,6 +216,161 @@ class ProjectRepository:
             logger.error(f"Error calling spProjectsInsert stored procedure: {e}")
             raise RepositoryException(f"Failed to create project: {e}")
 
+    def update_via_sp(self, project_no: int, project_data: ProjectCreate) -> bool:
+        """
+        Update an existing project using the spProjectsUpdate stored procedure
+        
+        Args:
+            project_no: The ProjectNo to update
+            project_data: ProjectCreate schema containing updated project fields
+            
+        Returns:
+            bool: True if update was successful
+        """
+        try:
+            # Prepare the stored procedure call with all parameters
+            sp_query = text("""
+                EXEC spProjectsUpdate
+                    @ProjectNo = :project_no,
+                    @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,
+                    @EngineerCompany = :engineer_company,
+                    @_FasDam = :fas_dam,
+                    @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
+            """)
+            
+            # Execute the stored procedure with parameters
+            self.db.execute(sp_query, {
+                'project_no': project_no,
+                '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,
+                'engineer_company': project_data.engineer_company,
+                'fas_dam': project_data.fas_dam,
+                '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
+            })
+            
+            # Commit the transaction
+            self.db.commit()
+            logger.info(f"Successfully updated project {project_no} via stored procedure")
+            return True
+                
+        except Exception as e:
+            self.db.rollback()
+            logger.error(f"Error calling spProjectsUpdate stored procedure: {e}")
+            raise RepositoryException(f"Failed to update 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/services/project_service.py

@@ -27,11 +27,32 @@ class ProjectService:
         self.repo = ProjectRepository(db)
 
     def get(self, project_no: int):
-        """Get a single project by ProjectNo"""
-        project = self.repo.get(project_no)
-        if not project:
+        """
+        Get a single project by ProjectNo using stored procedure
+        
+        Args:
+            project_no: The ProjectNo to retrieve
+            
+        Returns:
+            ProjectOut: The project data as a Pydantic model
+        """
+        # Get project data via stored procedure
+        project_data = self.repo.get_via_sp(project_no)
+        
+        if not project_data:
             raise NotFoundException("Project not found")
-        return project
+        
+        # Transform database row data to match ProjectOut schema
+        transformed_data = self._transform_db_row_to_schema(project_data)
+        
+        # Create and return ProjectOut instance
+        try:
+            project_out = ProjectOut(**transformed_data)
+            return project_out
+        except Exception as e:
+            logger.error(f"Error creating ProjectOut from data: {e}")
+            logger.debug(f"Transformed data: {transformed_data}")
+            raise NotFoundException("Error processing project data")
 
     def list_projects(self, customer_type: int = 0, order_by: str = "project_no", 
                      order_direction: str = "asc", page: int = 1, page_size: int = 10) -> PaginatedResponse[ProjectOut]:
@@ -140,13 +161,29 @@ class ProjectService:
             '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',
             'Commission': 'commission',
             'CrewMembers': 'crew_members',
-            'InstallDate': 'install_date',
+            'TackHoes': 'tack_hoes',
+            'WaterPump': 'water_pump',
+            'WaterPump2': 'water_pump2',
+            'Pipes': 'pipes',
+            'Timpers': 'timpers',
+            'EstInstalationTime': 'est_installation_time',  # Note: SP has typo "Instalation"
+            'RepairKits': 'repair_kits',
+            'InstallationAdvisor': 'installation_advisor',
             'EmployeeId': 'employee_id',
+            'InstallDate': 'install_date',
             'AdvisorId': 'advisor_id',
+            'ShipVia': 'ship_via',
+            'ValidFor': 'valid_for',
+            '_FasDam': 'fas_dam',
             'IsInternational': 'is_international',
             'OrderNumber': 'order_number'
         }
@@ -188,13 +225,41 @@ class ProjectService:
             
         return created_project
 
-    def update(self, project_no: int, data):
-        project = self.repo.get(project_no)
-        if not project:
+    def update(self, project_no: int, project_data: dict):
+        """
+        Update an existing project using stored procedure
+        
+        Args:
+            project_no: The ProjectNo to update
+            project_data: Dictionary containing updated project data
+            
+        Returns:
+            ProjectOut: The updated project data
+        """
+        from app.schemas.project import ProjectCreate
+        
+        # First check if project exists
+        existing_project_data = self.repo.get_via_sp(project_no)
+        if not existing_project_data:
             raise NotFoundException("Project not found")
-        for k, v in data.items():
-            setattr(project, k, v)
-        return self.repo.update(project)
+        
+        # Validate input data using Pydantic schema
+        project_update = ProjectCreate(**project_data)
+        
+        # Update project via stored procedure
+        success = self.repo.update_via_sp(project_no, project_update)
+        
+        if not success:
+            raise NotFoundException("Failed to update project")
+        
+        # Retrieve the updated project to return as ProjectOut
+        updated_project_data = self.repo.get_via_sp(project_no)
+        if not updated_project_data:
+            raise NotFoundException("Failed to retrieve updated project")
+        
+        # Transform and return the updated project
+        transformed_data = self._transform_db_row_to_schema(updated_project_data)
+        return ProjectOut(**transformed_data)
 
     def delete(self, project_no: int):
         project = self.repo.get(project_no)

test_get_project.sh

@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# Test script for the get_project endpoint using curl
+
+echo "Testing get_project endpoint via stored procedure..."
+
+echo ""
+echo "=== Test 1: Get existing project (ID: 2) ==="
+echo "GET /api/v1/projects/2"
+
+response1=$(curl -s -w "\nHTTP_STATUS:%{http_code}\n" \
+    -X GET \
+    -H "Content-Type: application/json" \
+    http://localhost:8000/api/v1/projects/2)
+
+# Parse response
+http_status1=$(echo "$response1" | grep "HTTP_STATUS" | cut -d: -f2)
+response_body1=$(echo "$response1" | sed '/HTTP_STATUS/d')
+
+echo "HTTP Status: $http_status1"
+if [ "$http_status1" = "200" ]; then
+    echo "✅ Project retrieved successfully!"
+    echo "Project Name: $(echo "$response_body1" | grep -o '"project_name":"[^"]*"' | cut -d'"' -f4)"
+    echo "Project Location: $(echo "$response_body1" | grep -o '"project_location":"[^"]*"' | cut -d'"' -f4)"
+else
+    echo "❌ Error retrieving project"
+    echo "$response_body1"
+fi
+
+echo ""
+echo "=== Test 2: Get non-existent project (ID: 999999) ==="
+echo "GET /api/v1/projects/999999"
+
+response2=$(curl -s -w "\nHTTP_STATUS:%{http_code}\n" \
+    -X GET \
+    -H "Content-Type: application/json" \
+    http://localhost:8000/api/v1/projects/999999)
+
+# Parse response
+http_status2=$(echo "$response2" | grep "HTTP_STATUS" | cut -d: -f2)
+response_body2=$(echo "$response2" | sed '/HTTP_STATUS/d')
+
+echo "HTTP Status: $http_status2"
+if [ "$http_status2" = "404" ]; then
+    echo "✅ Correctly returned 404 for non-existent project"
+    echo "Error message: $response_body2"
+else
+    echo "❌ Unexpected response for non-existent project"
+    echo "$response_body2"
+fi
+
+echo ""
+echo "=== Test 3: Test our created project (ID: 15865) ==="
+echo "GET /api/v1/projects/15865"
+
+response3=$(curl -s -w "\nHTTP_STATUS:%{http_code}\n" \
+    -X GET \
+    -H "Content-Type: application/json" \
+    http://localhost:8000/api/v1/projects/15865)
+
+# Parse response
+http_status3=$(echo "$response3" | grep "HTTP_STATUS" | cut -d: -f2)
+response_body3=$(echo "$response3" | sed '/HTTP_STATUS/d')
+
+echo "HTTP Status: $http_status3"
+if [ "$http_status3" = "200" ]; then
+    echo "✅ Our created project retrieved successfully!"
+    echo "Project Name: $(echo "$response_body3" | grep -o '"project_name":"[^"]*"' | cut -d'"' -f4)"
+    echo "Project Location: $(echo "$response_body3" | grep -o '"project_location":"[^"]*"' | cut -d'"' -f4)"
+    echo "Response (formatted):"
+    echo "$response_body3" | python -m json.tool 2>/dev/null || echo "$response_body3"
+else
+    echo "❌ Error retrieving our created project"
+    echo "$response_body3"
+fi
+
+echo ""
+echo "🎉 Get project tests completed!"

test_update_project.sh

@@ -0,0 +1,155 @@
+#!/bin/bash
+
+# Test script for the update_project endpoint using curl
+
+echo "Testing update_project endpoint via stored procedure..."
+
+PROJECT_ID=15865
+
+echo ""
+echo "=== Test 1: Get current project data (ID: $PROJECT_ID) ==="
+echo "GET /api/v1/projects/$PROJECT_ID"
+
+current_project=$(curl -s -X GET -H "Content-Type: application/json" \
+    http://localhost:8000/api/v1/projects/$PROJECT_ID)
+
+echo "Current project name: $(echo "$current_project" | grep -o '"project_name":"[^"]*"' | cut -d'"' -f4)"
+echo "Current project location: $(echo "$current_project" | grep -o '"project_location":"[^"]*"' | cut -d'"' -f4)"
+
+echo ""
+echo "=== Test 2: Update project (ID: $PROJECT_ID) ==="
+echo "PUT /api/v1/projects/$PROJECT_ID"
+
+# Create update payload with some changes
+cat > update_project.json << 'EOF'
+{
+    "project_name": "UPDATED: Test Aqua Barrier Project",
+    "project_location": "UPDATED: San Francisco, CA", 
+    "project_type": "Commercial - Updated",
+    "bid_date": "2024-01-20T10:00:00",
+    "start_date": "2024-02-05T08:00:00",
+    "is_awarded": true,
+    "notes": "UPDATED: Test project for SP validation",
+    "barrier_size": "UPDATED: 60ft x 120ft",
+    "lease_term": "18 months",
+    "purchase_option": false,
+    "lead_source": "Website - Updated",
+    "rep": "Jane Doe",
+    "engineer_company_id": 2,
+    "engineer_notes": "UPDATED: Advanced installation required",
+    "engineer_company": "XYZ Engineering",
+    "status": 2,
+    "customer_type_id": 1,
+    "bill_name": "UPDATED: Test Company Inc",
+    "bill_address1": "456 Updated Street",
+    "bill_address2": "Suite 200",
+    "bill_city": "San Francisco",
+    "bill_state": "CA",
+    "bill_zip": "94102",
+    "bill_email": "updated-billing@testcompany.com",
+    "bill_phone": "555-999-8888",
+    "ship_name": "UPDATED: Test Company Inc",
+    "ship_address1": "789 New Avenue",
+    "ship_city": "San Francisco",
+    "ship_state": "CA", 
+    "ship_zip": "94103",
+    "ship_email": "updated-shipping@testcompany.com",
+    "ship_phone": "555-888-7777",
+    "ship_office_phone": "555-777-6666",
+    "acct_payable": "Updated AP Department",
+    "payment_term_id": 2,
+    "payment_note": "Net 45",
+    "rental_price_id": 2,
+    "purchase_price_id": 2,
+    "est_ship_date_id": 2,
+    "fob_id": 2,
+    "expedite_fee": "750.00",
+    "est_freight_id": 2,
+    "est_freight_fee": "350.00",
+    "tax_rate": "9.50",
+    "weekly_charge": "2000.00",
+    "crew_members": 4,
+    "tack_hoes": 3,
+    "water_pump": 2,
+    "water_pump2": 2,
+    "pipes": 15,
+    "timpers": 8,
+    "est_installation_time": 12,
+    "repair_kits": "Premium Kit",
+    "installation_advisor": "UPDATED: Special installation notes here...",
+    "employee_id": "EMP002",
+    "install_date": "2024-02-20T09:00:00",
+    "commission": "1500.00",
+    "advisor_id": "ADV002",
+    "ship_via": "FedEx Express",
+    "valid_for": "Quote valid for 60 days",
+    "fas_dam": true
+}
+EOF
+
+echo "Making PUT request to update project..."
+
+response=$(curl -s -w "\nHTTP_STATUS:%{http_code}\n" \
+    -X PUT \
+    -H "Content-Type: application/json" \
+    -d @update_project.json \
+    http://localhost:8000/api/v1/projects/$PROJECT_ID)
+
+# 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"
+
+if [ "$http_status" = "200" ]; then
+    echo "✅ Project updated successfully!"
+    echo "Updated project name: $(echo "$response_body" | grep -o '"project_name":"[^"]*"' | cut -d'"' -f4)"
+    echo "Updated project location: $(echo "$response_body" | grep -o '"project_location":"[^"]*"' | cut -d'"' -f4)"
+    echo "Updated barrier size: $(echo "$response_body" | grep -o '"barrier_size":"[^"]*"' | cut -d'"' -f4)"
+    echo ""
+    echo "Full Response (formatted):"
+    echo "$response_body" | python -m json.tool 2>/dev/null || echo "$response_body"
+else
+    echo "❌ Error updating project"
+    echo "Response:"
+    echo "$response_body"
+fi
+
+echo ""
+echo "=== Test 3: Verify update by fetching project again ==="
+echo "GET /api/v1/projects/$PROJECT_ID"
+
+updated_project=$(curl -s -X GET -H "Content-Type: application/json" \
+    http://localhost:8000/api/v1/projects/$PROJECT_ID)
+
+echo "Verified project name: $(echo "$updated_project" | grep -o '"project_name":"[^"]*"' | cut -d'"' -f4)"
+echo "Verified project location: $(echo "$updated_project" | grep -o '"project_location":"[^"]*"' | cut -d'"' -f4)"
+
+echo ""
+echo "=== Test 4: Update non-existent project (ID: 999999) ==="
+echo "PUT /api/v1/projects/999999"
+
+response_not_found=$(curl -s -w "\nHTTP_STATUS:%{http_code}\n" \
+    -X PUT \
+    -H "Content-Type: application/json" \
+    -d @update_project.json \
+    http://localhost:8000/api/v1/projects/999999)
+
+# Parse response
+http_status_not_found=$(echo "$response_not_found" | grep "HTTP_STATUS" | cut -d: -f2)
+response_body_not_found=$(echo "$response_not_found" | sed '/HTTP_STATUS/d')
+
+echo "HTTP Status: $http_status_not_found"
+if [ "$http_status_not_found" = "404" ]; then
+    echo "✅ Correctly returned 404 for non-existent project"
+    echo "Error message: $response_body_not_found"
+else
+    echo "❌ Unexpected response for non-existent project"
+    echo "$response_body_not_found"
+fi
+
+# Clean up
+rm -f update_project.json
+
+echo ""
+echo "🎉 Update project tests completed!"