Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Pass workspace to recomputeWorkspaceUsage for yearly-to-monthly downgrades

Kiran Kcc1c1c24c439
diff --git a/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts b/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts
index 9f6805c3ed..29f957361c 100644
--- a/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts
@@ -24,7 +24,6 @@ import AdvancedPlanDowngradeNotice from "@dub/email/templates/advanced-plan-down
import UpgradeEmail from "@dub/email/templates/upgrade-email";
import {
APP_DOMAIN_WITH_NGROK,
- getBillingStartDate,
getPlanAndTierFromPriceId,
NEW_BUSINESS_PRICE_IDS,
} from "@dub/utils";
@@ -108,10 +107,7 @@ export async function updateWorkspacePlan({
workspace.planPeriod === "yearly" && planPeriod === "monthly";
const recomputedUsage = isYearlyToMonthly
- ? await recomputeWorkspaceUsage({
- workspaceId: workspace.id,
- billingStart: getBillingStartDate(workspace.billingCycleStart),
- })
+ ? await recomputeWorkspaceUsage(workspace)
: null;
// Update workspace plan / limits / subscription details if:
diff --git a/apps/web/lib/api/billing/recompute-workspace-usage.ts b/apps/web/lib/api/billing/recompute-workspace-usage.ts
index 8c2b0500f4..8bf9d0d603 100644
--- a/apps/web/lib/api/billing/recompute-workspace-usage.ts
+++ b/apps/web/lib/api/billing/recompute-workspace-usage.ts
@@ -1,31 +1,27 @@
import { getAnalytics } from "@/lib/analytics/get-analytics";
import { prisma } from "@/lib/prisma";
import { analyticsResponse } from "@/lib/zod/schemas/analytics-response";
+import { getBillingStartDate } from "@dub/utils";
+import { Project } from "@prisma/client";
+
+export async function recomputeWorkspaceUsage(
+ workspace: Pick<Project, "id" | "billingCycleStart">,
+) {
+ const billingStart = getBillingStartDate(workspace.billingCycleStart);
+ const billingEnd = new Date();
-export async function recomputeWorkspaceUsage({
- workspaceId,
- billingStart,
- billingEnd = new Date(),
- dataAvailableFrom,
-}: {
- workspaceId: string;
- billingStart: Date;
- billingEnd?: Date;
- dataAvailableFrom?: Date;
-}) {
const [clicksResponse, linksUsage, payoutsUsage] = await Promise.all([
getAnalytics({
- workspaceId,
+ workspaceId: workspace.id,
event: "clicks",
groupBy: "count",
start: billingStart,
end: billingEnd,
- dataAvailableFrom,
}),
prisma.link.count({
where: {
- projectId: workspaceId,
+ projectId: workspace.id,
createdAt: {
gte: billingStart,
lte: billingEnd,
@@ -35,7 +31,7 @@ export async function recomputeWorkspaceUsage({
prisma.invoice.aggregate({
where: {
- workspaceId,
+ workspaceId: workspace.id,
type: "partnerPayout",
status: "completed",
paidAt: {