fix: extra seats query returning wrong count for non-Seats subscriptions

Author: kof

apps/builder/app/services/workspace-router.server.ts

@@ -6,7 +6,7 @@ import {
 } from "@webstudio-is/trpc-interface/index.server";
 import { workspace as workspaceApi } from "@webstudio-is/project/index.server";
 import { roles } from "@webstudio-is/trpc-interface/authorize";
-import { getPaidSeats } from "@webstudio-is/plans/index.server";
+import { getExtraPaidSeats } from "@webstudio-is/plans/index.server";
 import env from "~/env/env.server";
 
 const Name = z.string().min(2).max(100);
@@ -318,15 +318,18 @@ export const workspaceRouter = router({
     .query(async ({ input, ctx }) => {
       try {
         const members = await workspaceApi.listMembers(input, ctx);
-        const paidSeats = await getPaidSeats(members.owner.userId, ctx);
+        const extraPaidSeats = await getExtraPaidSeats(
+          members.owner.userId,
+          ctx
+        );
         return {
           success: true as const,
           data: {
             ...members,
             // seatsIncluded = seats covered by the Team plan.
-            // paidSeats = extra seats from the Seats subscription.
+            // extraPaidSeats = extra seats from the Seats subscription.
             // Total capacity = included + extras.
-            maxSeats: ctx.planFeatures.seatsIncluded + (paidSeats ?? 0),
+            maxSeats: ctx.planFeatures.seatsIncluded + (extraPaidSeats ?? 0),
           },
         };
       } catch (error) {

packages/plans/src/index.server.ts

@@ -1,7 +1,7 @@
 export * from "./index";
 export {
   getPlanInfo,
-  getPaidSeats,
+  getExtraPaidSeats,
   getAuthorizationOwnerId,
   parsePlansEnv,
   parseProductMeta,

packages/plans/src/plan-client.server.ts

@@ -206,14 +206,30 @@ export const getPlanInfo = async (
 };
 
 /**
- * Returns the Stripe subscription item quantity for the given user, derived
- * from the latest customer.subscription.updated/created event in TransactionLog.
- * Returns null when no subscription event exists yet (free plan, AppSumo, etc.).
+ * Returns the extra-seat subscription quantity for the given user, derived
+ * from the latest customer.subscription.updated/created event in TransactionLog
+ * whose product is an extra-seat plan (maxSeatsPerWorkspace > 0, maxWorkspaces <= 1).
+ *
+ * Returns null when no matching event exists (free plan, no extra seats, etc.).
  */
-export const getPaidSeats = async (
+export const getExtraPaidSeats = async (
   userId: string,
   context: { postgrest: PostgrestContext }
 ): Promise<number | null> => {
+  const productResult = await context.postgrest.client
+    .from("Product")
+    .select("id")
+    .eq("name", "Seats");
+
+  if (productResult.error) {
+    throw productResult.error;
+  }
+
+  const seatProductIds = (productResult.data ?? []).map((p) => p.id);
+  if (seatProductIds.length === 0) {
+    return null;
+  }
+
   const result = await context.postgrest.client
     .from("TransactionLog")
     .select("eventData")
@@ -222,6 +238,7 @@ export const getPaidSeats = async (
       "customer.subscription.updated",
       "customer.subscription.created",
     ])
+    .in("productId", seatProductIds)
     .order("eventCreated", { ascending: false })
     .limit(1)
     .maybeSingle();

packages/project/src/db/workspace.ts

@@ -11,7 +11,7 @@ import {
   NOTIFICATION_TTL_MS,
 } from "../shared/notification-schema";
 import { create as createNotification } from "./notification";
-import { getPaidSeats } from "@webstudio-is/plans/index.server";
+import { getExtraPaidSeats } from "@webstudio-is/plans/index.server";
 
 export type Workspace = Database["public"]["Tables"]["Workspace"]["Row"];
 
@@ -253,7 +253,7 @@ export const findMany = async (userId: string, context: AppContext) => {
         }
         const [memberCount, extraSeats] = await Promise.all([
           countAllMembers(ownerId, context),
-          getPaidSeats(ownerId, context),
+          getExtraPaidSeats(ownerId, context),
         ]);
         // seatsIncluded is the number of non-owner member slots included in
         // the plan. The owner is not counted — consistent with the billing