feat(cloud): improved upgrade journey

apps/web/src/pages/api/partner/webhook.ts

@@ -7,6 +7,7 @@ import { withApiLogging } from "@kan/api/utils/apiLogging";
 import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
 import * as workspaceRepo from "@kan/db/repository/workspace.repo";
 import { createLogger } from "@kan/logger";
+import { getActiveSubscriptions } from "@kan/shared/utils";
 
 import { tierConfig } from "./_utils";
 
@@ -122,17 +123,18 @@ export default withApiLogging(
           license_key,
         );
         if (sub) {
-          await subscriptionRepo.updateById(db, sub.id, {
-            plan: "free",
-            status: "inactive",
-          });
+          const [, allSubs] = await Promise.all([
+            subscriptionRepo.updateById(db, sub.id, {
+              plan: "free",
+              status: "inactive",
+            }),
+            sub.referenceId
+              ? subscriptionRepo.getByReferenceId(db, sub.referenceId)
+              : Promise.resolve([]),
+          ]);
           if (sub.referenceId) {
-            const allSubs = await subscriptionRepo.getByReferenceId(
-              db,
-              sub.referenceId,
-            );
-            const hasActiveSub = allSubs.some(
-              (s) => s.id !== sub.id && s.status === "active",
+            const hasActiveSub = getActiveSubscriptions(allSubs).some(
+              (s) => s.id !== sub.id,
             );
             if (!hasActiveSub) {
               await workspaceRepo.update(db, sub.referenceId, { plan: "free" });

apps/web/src/pages/api/stripe/webhook.ts

@@ -64,7 +64,10 @@ export default async function handler(
           meta.userId &&
           meta.userEmail
         ) {
-          const existing = await workspaceRepo.getByPublicId(db, meta.workspacePublicId);
+          const existing = await workspaceRepo.getByPublicId(
+            db,
+            meta.workspacePublicId,
+          );
 
           if (!existing) {
             const slug = meta.workspaceSlug ?? meta.workspacePublicId;
@@ -90,10 +93,10 @@ export default async function handler(
             });
           }
         } else {
-          // Existing workspace upgrade — update plan (and slug for pro)
           await workspaceRepo.update(db, meta.workspacePublicId, {
             plan,
-            ...(plan === "pro" && meta.workspaceSlug && { slug: meta.workspaceSlug }),
+            ...(plan === "pro" &&
+              meta.workspaceSlug && { slug: meta.workspaceSlug }),
           });
         }