Added soft deletes to all deletion functions and added deleted_at filters as required

gatehouse_app/services/billing_service.py

@@ -50,8 +50,8 @@ class BillingService:
         if not plan:
             raise ValueError("Plan not found")
         
-        # Check if subscription already exists
-        existing = Subscription.query.filter_by(organization_id=organization_id).first()
+                # Check if subscription already exists
+        existing = Subscription.query.filter_by(organization_id=organization_id, deleted_at=None).first()
         if existing:
             raise ValueError("Organization already has a subscription")
         
@@ -88,7 +88,7 @@ class BillingService:
         Returns:
             Updated subscription
         """
-        subscription = Subscription.query.filter_by(organization_id=organization_id).first()
+        subscription = Subscription.query.filter_by(organization_id=organization_id, deleted_at=None).first()
         if not subscription:
             raise ValueError("No subscription found for organization")
         
@@ -111,7 +111,7 @@ class BillingService:
         Returns:
             Updated subscription
         """
-        subscription = Subscription.query.filter_by(organization_id=organization_id).first()
+        subscription = Subscription.query.filter_by(organization_id=organization_id, deleted_at=None).first()
         if not subscription:
             raise ValueError("No subscription found for organization")
         
@@ -132,7 +132,7 @@ class BillingService:
         Returns:
             Updated subscription
         """
-        subscription = Subscription.query.filter_by(organization_id=organization_id).first()
+        subscription = Subscription.query.filter_by(organization_id=organization_id, deleted_at=None).first()
         if not subscription:
             raise ValueError("No subscription found for organization")
         
@@ -158,7 +158,7 @@ class BillingService:
         Returns:
             Overage calculation with details
         """
-        subscription = Subscription.query.filter_by(organization_id=organization_id).first()
+        subscription = Subscription.query.filter_by(organization_id=organization_id, deleted_at=None).first()
         if not subscription:
             return {"has_overage": False, "overage_cost": 0, "user_count": 0, "included_users": 0}