changes of rate model of sub-cont and there functions

app/services/subcontractor_rate_service.py

@@ -1,28 +1,66 @@
 from app.services.db_service import db
 from app.models.subcontractor_rate_model import SubcontractorRate
+from sqlalchemy import func
 
 
 class SubcontractorRateService:
 
     @staticmethod
-    def save_rate(form):
+    def save_or_update(form):
 
-        rate = SubcontractorRate(
-            subcontractor_id=form.get("subcontractor_id"),
-            category=form.get("category"),
-            item_code=form.get("item_code"),
-            item_name=form.get("item_name"),
-            unit=form.get("unit"),
-            rate=form.get("rate"),
-            effective_from=form.get("effective_from"),
-            effective_to=form.get("effective_to") or None,
-            status=form.get("status")
+        rate_id = form.get("id")
+
+        subcontractor_id = form.get("subcontractor_id")
+        category = form.get("category")
+        item_name = form.get("item_name").strip()
+
+        # -----------------------------
+        # Duplicate Validation
+        # -----------------------------
+        duplicate = (
+            SubcontractorRate.query
+            .filter(
+                SubcontractorRate.subcontractor_id == subcontractor_id,
+                SubcontractorRate.category == category,
+                func.lower(SubcontractorRate.item_name) == item_name.lower()
+            )
+            .first()
         )
 
-        db.session.add(rate)
+        # Ignore current record while editing
+        if duplicate and (not rate_id or duplicate.id != int(rate_id)):
+            return {
+                "success": False,
+                "message": "Category and Rate already exists for this Subcontractor."
+            }
+
+        # -----------------------------
+        # Insert / Update
+        # -----------------------------
+        if rate_id:
+            rate = SubcontractorRate.query.get_or_404(rate_id)
+        else:
+            rate = SubcontractorRate()
+
+        rate.subcontractor_id = subcontractor_id
+        rate.category = category
+        rate.item_code = form.get("item_code")
+        rate.item_name = item_name
+        rate.unit = form.get("unit")
+        rate.rate = form.get("rate")
+        rate.effective_from = form.get("effective_from")
+        rate.effective_to = form.get("effective_to") or None
+        rate.status = form.get("status")
+
+        if not rate_id:
+            db.session.add(rate)
+
         db.session.commit()
-        return rate
-    
+
+        return {
+            "success": True,
+            "message": "Saved Successfully."
+        }
     
     @staticmethod
     def get_all_rates():
@@ -32,34 +70,33 @@ class SubcontractorRateService:
             .order_by(SubcontractorRate.created_at.desc())
             .all()
         )
+        
+        
     @staticmethod
     def get_rate(rate_id):
 
         return SubcontractorRate.query.get_or_404(rate_id)
     
-    @staticmethod
-    def update_rate(rate_id, form):
-
-        rate = SubcontractorRate.query.get_or_404(rate_id)
-
-        rate.subcontractor_id = form.get("subcontractor_id")
-        rate.category = form.get("category")
-        rate.item_code = form.get("item_code")
-        rate.item_name = form.get("item_name")
-        rate.unit = form.get("unit")
-        rate.rate = form.get("rate")
-        rate.effective_from = form.get("effective_from")
-        rate.effective_to = form.get("effective_to") or None
-        rate.status = form.get("status")
-
-        db.session.commit()
-        return rate
-    
-    @staticmethod
     def delete_rate(rate_id):
-
         rate = SubcontractorRate.query.get_or_404(rate_id)
-
         db.session.delete(rate)
+        db.session.commit()
+        
 
-        db.session.commit()
+    @staticmethod
+    def check_duplicate(subcontractor_id, category, item_name, rate_id=None):
+
+        query = SubcontractorRate.query.filter(
+            SubcontractorRate.subcontractor_id == subcontractor_id,
+            SubcontractorRate.category == category,
+            func.lower(SubcontractorRate.item_name) == item_name.strip().lower()
+        )
+
+        if rate_id:
+            query = query.filter(SubcontractorRate.id != int(rate_id))
+
+        return query.first() is not None
+    
+    
+    
+