From 8e8053a2311e0a3f6db8bbd082a8ef07d8d56f38 Mon Sep 17 00:00:00 2001 From: KMKoushik Date: Thu, 27 Mar 2025 22:38:39 +1100 Subject: [PATCH] fix monthly usage query --- apps/web/src/server/api/routers/billing.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/web/src/server/api/routers/billing.ts b/apps/web/src/server/api/routers/billing.ts index 52efb2c..2c56208 100644 --- a/apps/web/src/server/api/routers/billing.ts +++ b/apps/web/src/server/api/routers/billing.ts @@ -1,6 +1,6 @@ import { DailyEmailUsage, EmailUsageType, Subscription } from "@prisma/client"; import { TRPCError } from "@trpc/server"; -import { format } from "date-fns"; +import { format, sub } from "date-fns"; import { z } from "zod"; import { @@ -28,15 +28,16 @@ export const billingRouter = createTRPCRouter({ const isPaidPlan = ctx.team.plan !== "FREE"; let subscription: Subscription | null = null; - if (!isPaidPlan) { + if (isPaidPlan) { subscription = await db.subscription.findFirst({ where: { teamId: ctx.team.id }, orderBy: { status: "asc" }, }); } - const isoStartDate = - subscription?.currentPeriodStart || format(new Date(), "yyyy-MM-01"); // First day of current month + const isoStartDate = subscription?.currentPeriodStart + ? format(subscription.currentPeriodStart, "yyyy-MM-dd") + : format(new Date(), "yyyy-MM-01"); // First day of current month const today = format(new Date(), "yyyy-MM-dd"); const [monthUsage, dayUsage] = await Promise.all([