Use plan-period session usage counter

src/admin.ts

@@ -64,7 +64,7 @@ export function registerAdminRoutes(app: Express) {
     if (error) throw new Error(`Unable to load user directory: ${error.message}`);
     const ids = (data ?? []).map((row) => row.user_id);
     const [subs, counts] = ids.length ? await Promise.all([
-      supabaseAdmin.from("users_subscriptions").select("user_id,subscription_id,startdate,enddate,num_players,num_sessions,num_sessions_month").in("user_id", ids),
+      supabaseAdmin.from("users_subscriptions").select("user_id,subscription_id,startdate,enddate,num_players,num_sessions").in("user_id", ids),
       supabaseAdmin.from("sessions").select("user_id").in("user_id", ids),
     ]) : [{ data: [], error: null }, { data: [], error: null }];
     if (subs.error) throw new Error(`Unable to load user plans: ${subs.error.message}`);
@@ -85,7 +85,7 @@ export function registerAdminRoutes(app: Express) {
         id: row.user_id, fname: row.fname, lname: row.lname, name: `${row.fname} ${row.lname}`.trim(),
         email: row.email, academy: row.academy, role: row.role, imagePath: row.image_path, accountRole: row.account_role,
         subscription: plan ? { id: plan.subscription_id, name: plan.plan, startDate: assignment?.startdate, endDate: assignment?.enddate, playerLimit: plan.player_limit, sessionLimit: plan.monthly_session_limit } : null,
-        usage: { players: assignment?.num_players ?? 0, sessions: assignment?.num_sessions_month ?? assignment?.num_sessions ?? 0, totalSessions: sessionCounts.get(row.user_id) ?? 0 },
+        usage: { players: assignment?.num_players ?? 0, sessions: assignment?.num_sessions ?? 0, totalSessions: sessionCounts.get(row.user_id) ?? 0 },
       };
     }) });
   }));
@@ -102,7 +102,7 @@ export function registerAdminRoutes(app: Express) {
     const id = uuid.safeParse(req.params.userId); if (!id.success) return res.sendStatus(404);
     const [{ data: user, error }, { data: assignment, error: subError }] = await Promise.all([
       supabaseAdmin.from("users").select("user_id,fname,lname,email,academy,role,image_path,account_role").eq("user_id", id.data).maybeSingle(),
-      supabaseAdmin.from("users_subscriptions").select("subscription_id,startdate,enddate,num_players,num_sessions,num_sessions_month").eq("user_id", id.data).maybeSingle(),
+      supabaseAdmin.from("users_subscriptions").select("subscription_id,startdate,enddate,num_players,num_sessions").eq("user_id", id.data).maybeSingle(),
     ]);
     if (error) throw new Error(`Unable to load user: ${error.message}`);
     if (subError) throw new Error(`Unable to load user plan: ${subError.message}`);
@@ -135,8 +135,8 @@ export function registerAdminRoutes(app: Express) {
     if (!plan) return fail(res, 404, "Plan not found.");
     const { data: row, error } = await supabaseAdmin.from("users_subscriptions").upsert({
       user_id: id.data, subscription_id: plan.subscription_id, startdate: input.data.startDate, enddate: input.data.endDate,
-      num_players: 0, num_sessions: 0, num_sessions_month: 0,
-    }, { onConflict: "user_id" }).select("user_id,subscription_id,startdate,enddate,num_players,num_sessions,num_sessions_month").single();
+      num_players: 0, num_sessions: 0,
+    }, { onConflict: "user_id" }).select("user_id,subscription_id,startdate,enddate,num_players,num_sessions").single();
     if (error) throw new Error(`Unable to assign plan: ${error.message}`);
     invalidateSubscriptionCache(id.data);
     return res.json({ subscription: row });
@@ -145,7 +145,7 @@ export function registerAdminRoutes(app: Express) {
   app.delete("/api/admin/users/:userId/subscription", asyncRoute(async (req, res) => {
     if (!await admin(req, res)) return;
     const id = uuid.safeParse(req.params.userId); if (!id.success) return res.sendStatus(404);
-    const { error } = await supabaseAdmin.from("users_subscriptions").update({ subscription_id: null, num_players: 0, num_sessions: 0, num_sessions_month: 0 })
+    const { error } = await supabaseAdmin.from("users_subscriptions").update({ subscription_id: null, num_players: 0, num_sessions: 0 })
       .eq("user_id", id.data);
     if (error) throw new Error(`Unable to cancel plan: ${error.message}`);
     invalidateSubscriptionCache(id.data);

src/analysis.ts

@@ -54,9 +54,9 @@ export function analysisRouter(db: SupabaseClient, secret: string) {
       }
       if (!isAdmin) {
         const { data: usage, error: usageError } = await db.from("users_subscriptions")
-          .select("num_sessions_month").eq("user_id", userId).maybeSingle();
+          .select("num_sessions").eq("user_id", userId).maybeSingle();
         if (usageError) return res.status(503).json({ error: "Unable to check your session quota." });
-        const usedSessions = Number(usage?.num_sessions_month ?? 0);
+        const usedSessions = Number(usage?.num_sessions ?? 0);
         const sessionLimit = subscription?.monthly_session_limit == null ? null : Number(subscription.monthly_session_limit);
         if (sessionLimit !== null && usedSessions >= sessionLimit) {
           return res.status(403).json({

src/server.ts

@@ -201,10 +201,10 @@ app.get("/api/plan-billing", async (req, res, next) => {
     const userId = current.user.id;
     if (await userIsAdmin(userId)) {
       res.set("Cache-Control", "no-store");
-      return res.json({ subscription: null, usage: { players: 0, sessions: 0, monthlySessions: 0 }, billingHistoryAvailable: false, isAdmin: true });
+      return res.json({ subscription: null, usage: { players: 0, sessions: 0 }, billingHistoryAvailable: false, isAdmin: true });
     }
     const assignmentResult = await supabaseAdmin.from("users_subscriptions")
-      .select("subscription_id,startdate,enddate,num_players,num_sessions,num_sessions_month").eq("user_id", userId).maybeSingle();
+      .select("subscription_id,startdate,enddate,num_players,num_sessions").eq("user_id", userId).maybeSingle();
     if (assignmentResult.error) throw new Error(`Unable to load plan assignment: ${assignmentResult.error.message}`);
     const assignment = assignmentResult.data;
     let subscription = null;
@@ -227,8 +227,7 @@ app.get("/api/plan-billing", async (req, res, next) => {
       }
     }
     res.set("Cache-Control", "no-store");
-    const monthlySessionUsage = Number(assignment?.num_sessions_month ?? 0);
-    return res.json({ subscription, usage: { players: assignment?.num_players ?? 0, sessions: assignment?.num_sessions ?? 0, monthlySessions: monthlySessionUsage }, billingHistoryAvailable: false });
+    return res.json({ subscription, usage: { players: assignment?.num_players ?? 0, sessions: Number(assignment?.num_sessions ?? 0) }, billingHistoryAvailable: false });
   } catch (error) { next(error); }
 });