keep subs data after cancellation, just mark status as 'canceled'

Author: ikreymer

backend/btrixcloud/orgs.py

@@ -40,7 +40,6 @@
     OrgCreate,
     SubscriptionData,
     SubscriptionUpdate,
-    SubscriptionCancel,
     RenameOrg,
     UpdateRole,
     RemovePendingInvite,
@@ -365,20 +364,6 @@ async def update_subscription_data(
         )
         return Organization.from_dict(org_data) if org_data else None
 
-    async def cancel_subscription_data(
-        self, cancel: SubscriptionCancel
-    ) -> Optional[Organization]:
-        """Find org by subscription by id and delete subscription data, return org"""
-        org_data = await self.orgs.find_one_and_update(
-            {"subData.subId": cancel.subId},
-            {"$set": {"subData": None}},
-            return_document=ReturnDocument.BEFORE,
-        )
-        if not org_data:
-            return None
-
-        return Organization.from_dict(org_data)
-
     async def update_custom_storages(self, org: Organization) -> bool:
         """Update storage on an existing organization"""
 

backend/btrixcloud/subs.py

@@ -2,7 +2,7 @@
 Subscription API handling
 """
 
-from typing import Callable, Union
+from typing import Callable, Union, Any
 
 from fastapi import Depends, HTTPException, Request
 
@@ -36,7 +36,7 @@ def __init__(self, mdb, org_ops: OrgOps, user_manager: UserManager):
 
     async def create_new_subscription(
         self, create: SubscriptionCreate, user: User, request: Request
-    ):
+    ) -> dict[str, Any]:
         """create org for new subscription"""
         sub_data = SubscriptionData(
             subId=create.subId, status=create.status, details=create.details
@@ -66,7 +66,7 @@ async def create_new_subscription(
 
         return result
 
-    async def update_subscription(self, update: SubscriptionUpdate):
+    async def update_subscription(self, update: SubscriptionUpdate) -> dict[str, bool]:
         """update subs"""
 
         org = await self.org_ops.update_subscription_data(update)
@@ -76,15 +76,15 @@ async def update_subscription(self, update: SubscriptionUpdate):
                 status_code=404, detail="org_for_subscription_not_found"
             )
 
-        print("ORG SUB", org.subData)
-
         await self.add_sub_event(update)
         return {"updated": True}
 
-    async def cancel_subscription(self, cancel: SubscriptionCancel):
+    async def cancel_subscription(self, cancel: SubscriptionCancel) -> dict[str, bool]:
         """delete subscription data, and if readOnlyOnCancel is true, the entire org"""
 
-        org = await self.org_ops.cancel_subscription_data(cancel)
+        org = await self.org_ops.update_subscription_data(
+            SubscriptionUpdate(subId=cancel.subId, status="canceled")
+        )
 
         if not org:
             raise HTTPException(
@@ -125,7 +125,7 @@ def init_subs_api(
     org_ops: OrgOps,
     user_manager: UserManager,
     user_or_shared_secret_dep: Callable,
-):
+) -> SubOps:
     """init subs API"""
     ops = SubOps(mdb, org_ops, user_manager)