Scheduling infrastructure for absolutely everyone.
fix: credit balance issues (#21904)
Carina Wollendorferc215dc58641b
diff --git a/apps/web/pages/api/twilio/webhook.ts b/apps/web/pages/api/twilio/webhook.tsindex 5b669f3a886..18f909ae0b6 100644--- a/apps/web/pages/api/twilio/webhook.ts+++ b/apps/web/pages/api/twilio/webhook.ts@@ -121,7 +121,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {if (!orgId) {orgId = await getOrgIdFromMemberOrTeamId({- memberId: parsedUserId,+ ...(!parsedTeamId ? { memberId: parsedUserId } : {}),teamId: parsedTeamId,});}diff --git a/packages/features/ee/billing/credit-service.test.ts b/packages/features/ee/billing/credit-service.test.tsindex 3e79225250e..a11ad985acc 100644--- a/packages/features/ee/billing/credit-service.test.ts+++ b/packages/features/ee/billing/credit-service.test.ts@@ -191,6 +191,7 @@ describe("CreditService", () => {teamId: 1,availableCredits: 0,creditType: CreditType.ADDITIONAL,+ limitReached: true,});});});diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.tsindex 9c181c3d11f..9166e49ae5d 100644--- a/packages/features/ee/billing/credit-service.ts+++ b/packages/features/ee/billing/credit-service.ts@@ -130,6 +130,9 @@ export class CreditService {});}+ /*+ also returns true if team has no available credits but limitReachedAt is not yet set+ */async hasAvailableCredits({ userId, teamId }: { userId?: number | null; teamId?: number | null }) {return await prisma.$transaction(async (tx) => {if (!IS_SMS_CREDITS_ENABLED) return true;@@ -160,12 +163,14 @@ export class CreditService {);return true;}+ // limtReachedAt is set and still no available credits+ return false;}if (userId) {const teamWithAvailableCredits = await this._getTeamWithAvailableCredits({ userId, tx });- if (teamWithAvailableCredits && teamWithAvailableCredits?.availableCredits > 0) return true;+ if (teamWithAvailableCredits && !teamWithAvailableCredits.limitReached) return true;const userCredits = await this._getAllCredits({ userId, tx });@@ -182,6 +187,9 @@ export class CreditService {});}+ /*+ If user has memberships, it always returns a team, even if all have limit reached. In that case, limitReached: true is returned+ */protected async _getTeamWithAvailableCredits({ userId, tx }: { userId: number; tx: PrismaTransaction }) {const memberships = await MembershipRepository.findAllAcceptedMemberships(userId, tx);@@ -226,6 +234,7 @@ export class CreditService {teamId: memberships[0].teamId,availableCredits: 0,creditType: CreditType.ADDITIONAL,+ limitReached: true,};}diff --git a/packages/lib/server/repository/credits.ts b/packages/lib/server/repository/credits.tsindex 59883a2f4cc..603ec50b66f 100644--- a/packages/lib/server/repository/credits.ts+++ b/packages/lib/server/repository/credits.ts@@ -180,8 +180,17 @@ export class CreditsRepository {}static async createCreditBalance(data: Prisma.CreditBalanceUncheckedCreateInput, tx?: PrismaTransaction) {+ const { teamId, userId } = data;++ if (!teamId && !userId) {+ throw new Error("Team or user ID is required");+ }+return (tx ?? prisma).creditBalance.create({- data,+ data: {+ ...data,+ ...(!teamId ? { userId } : {}),+ },});}