Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions packages/features/ee/billing/credit-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { TFunction } from "i18next";

import dayjs from "@calcom/dayjs";
import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
import { cancelScheduledMessagesAndScheduleEmails } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler";
import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
import { IS_SMS_CREDITS_ENABLED } from "@calcom/lib/constants";
import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
Expand Down Expand Up @@ -601,15 +602,35 @@ export class CreditService {
];

if (!result.creditFor || result.creditFor === CreditUsageType.SMS) {
const { cancelScheduledMessagesAndScheduleEmails } = await import(
"@calcom/features/ee/workflows/lib/reminders/reminderScheduler"
);
let userIdsWithoutCredits: number[] = [];

if (result.teamId) {
const membershipRepo = new MembershipRepository();
const teamMemberIds = await membershipRepo.listAcceptedTeamMemberIds({ teamId: result.teamId });

if (teamMemberIds && teamMemberIds.length > 0) {
const creditChecks = await Promise.all(
teamMemberIds.map(async (userId) => {
const hasCredits = await this.hasAvailableCredits({ userId });
return { userId, hasCredits };
})
);

userIdsWithoutCredits = creditChecks
.filter(({ hasCredits }) => !hasCredits)
.map(({ userId }) => userId);
}
} else if (result.userId) {
userIdsWithoutCredits = [result.userId];
}

promises.push(
cancelScheduledMessagesAndScheduleEmails({ teamId: result.teamId, userId: result.userId }).catch(
(error) => {
log.error("Failed to cancel scheduled messages", error, { result });
}
)
cancelScheduledMessagesAndScheduleEmails({
teamId: result.teamId,
userIdsWithoutCredits,
}).catch((error) => {
log.error("Failed to cancel scheduled messages", error, { result });
})
);
}

Expand Down
34 changes: 25 additions & 9 deletions packages/features/ee/workflows/lib/reminders/messageDispatcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ import * as twilio from "./providers/twilioProvider";

const log = logger.getSubLogger({ prefix: ["[reminderScheduler]"] });

export type CreditCheckFn = (params: {
userId?: number | null;
teamId?: number | null;
}) => Promise<boolean>;

export async function sendSmsOrFallbackEmail(props: {
twilioData: {
phoneNumber: string;
Expand All @@ -27,13 +32,18 @@ export async function sendSmsOrFallbackEmail(props: {
t: TFunction;
replyTo: string;
};
creditCheckFn?: CreditCheckFn;
}) {
const { userId, teamId } = props.twilioData;
const { CreditService } = await import("@calcom/features/ee/billing/credit-service");

const creditService = new CreditService();

const hasCredits = await creditService.hasAvailableCredits({ userId, teamId });

let hasCredits: boolean;
if (props.creditCheckFn) {
hasCredits = await props.creditCheckFn({ userId, teamId });
} else {
const { CreditService } = await import("@calcom/features/ee/billing/credit-service");
const creditService = new CreditService();
hasCredits = await creditService.hasAvailableCredits({ userId, teamId });
}

if (!hasCredits) {
const { fallbackData, twilioData } = props;
Expand Down Expand Up @@ -75,12 +85,18 @@ export async function scheduleSmsOrFallbackEmail(props: {
replyTo: string;
workflowStepId?: number;
};
creditCheckFn?: CreditCheckFn;
}) {
const { userId, teamId } = props.twilioData;
const { CreditService } = await import("@calcom/features/ee/billing/credit-service");
const creditService = new CreditService();

const hasCredits = await creditService.hasAvailableCredits({ userId, teamId });

let hasCredits: boolean;
if (props.creditCheckFn) {
hasCredits = await props.creditCheckFn({ userId, teamId });
} else {
const { CreditService } = await import("@calcom/features/ee/billing/credit-service");
const creditService = new CreditService();
hasCredits = await creditService.hasAvailableCredits({ userId, teamId });
}

if (!hasCredits) {
const { fallbackData, twilioData } = props;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ describe("reminderScheduler", () => {

describe("cancelScheduledMessagesAndScheduleEmails", () => {
it("should cancel SMS messages and schedule emails for team", async () => {
prismaMock.membership.findMany.mockResolvedValue([]);

const mockScheduledMessages = [
{
id: 1,
Expand Down Expand Up @@ -63,7 +61,7 @@ describe("reminderScheduler", () => {

prismaMock.workflowReminder.updateMany.mockResolvedValue({ count: 1 });

await cancelScheduledMessagesAndScheduleEmails({ teamId: 10 });
await cancelScheduledMessagesAndScheduleEmails({ teamId: 10, userIdsWithoutCredits: [1, 2, 3] });

expect(twilioProvider.cancelSMS).toHaveBeenCalledWith("sms-123");

Expand All @@ -76,12 +74,13 @@ describe("reminderScheduler", () => {
);

const callArgs = prismaMock.workflowReminder.findMany.mock.calls[0][0];
expect(callArgs.where.workflowStep.workflow.OR).toEqual([{ userId: { in: [] } }, { teamId: 10 }]);
expect(callArgs.where.workflowStep.workflow.OR).toEqual([
{ userId: { in: [1, 2, 3] } },
{ teamId: 10 },
]);
});

it("should cancel SMS messages and schedule emails for user", async () => {
prismaMock.membership.findMany.mockResolvedValue([]);

const mockScheduledMessages = [
{
id: 1,
Expand Down Expand Up @@ -109,7 +108,7 @@ describe("reminderScheduler", () => {

prismaMock.workflowReminder.updateMany.mockResolvedValue({ count: 1 });

await cancelScheduledMessagesAndScheduleEmails({ userId: 11 });
await cancelScheduledMessagesAndScheduleEmails({ userIdsWithoutCredits: [11] });

const callArgs = prismaMock.workflowReminder.findMany.mock.calls[0][0];
expect(callArgs.where.workflowStep.workflow.OR).toEqual([{ userId: { in: [11] } }]);
Expand Down
124 changes: 29 additions & 95 deletions packages/features/ee/workflows/lib/reminders/reminderScheduler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ import { withReporting } from "@calcom/lib/sentryWrapper";
import { getTranslation } from "@calcom/lib/server/i18n";
import prisma from "@calcom/prisma";
import { SchedulingType } from "@calcom/prisma/enums";
import { WorkflowActions, WorkflowMethods, WorkflowTriggerEvents } from "@calcom/prisma/enums";
import { WorkflowActions, WorkflowTriggerEvents } from "@calcom/prisma/enums";
import type { CalendarEvent } from "@calcom/types/Calendar";

import { scheduleAIPhoneCall } from "./aiPhoneCallManager";
import { scheduleEmailReminder } from "./emailReminderManager";
import type { CreditCheckFn } from "./messageDispatcher";
import type { BookingInfo } from "./smsReminderManager";
import { scheduleSMSReminder, type ScheduleTextReminderAction } from "./smsReminderManager";
import { scheduleWhatsappReminder } from "./whatsappReminderManager";
Expand Down Expand Up @@ -72,6 +73,7 @@ type ProcessWorkflowStepParams = (
export type ScheduleWorkflowRemindersArgs = ProcessWorkflowStepParams & {
workflows: Workflow[];
isDryRun?: boolean;
creditCheckFn?: CreditCheckFn;
};

const processWorkflowStep = async (
Expand All @@ -84,7 +86,8 @@ const processWorkflowStep = async (
hideBranding,
seatReferenceUid,
formData,
}: ProcessWorkflowStepParams
}: ProcessWorkflowStepParams,
creditCheckFn?: CreditCheckFn
) => {
if (!step?.verifiedAt) return;

Expand Down Expand Up @@ -114,6 +117,7 @@ const processWorkflowStep = async (
teamId: workflow.teamId,
seatReferenceUid,
verifiedAt: step.verifiedAt,
creditCheckFn,
};

if (isSMSAction(step.action)) {
Expand Down Expand Up @@ -243,20 +247,26 @@ const _scheduleWorkflowReminders = async (args: ScheduleWorkflowRemindersArgs) =
seatReferenceUid,
isDryRun = false,
formData,
creditCheckFn,
} = args;
if (isDryRun || !workflows.length) return;

for (const workflow of workflows) {
if (workflow.steps.length === 0) continue;

for (const step of workflow.steps) {
await processWorkflowStep(workflow, step, {
emailAttendeeSendToOverride,
smsReminderNumber,
hideBranding,
seatReferenceUid,
...(evt ? { calendarEvent: evt } : { formData }),
});
await processWorkflowStep(
workflow,
step,
{
emailAttendeeSendToOverride,
smsReminderNumber,
hideBranding,
seatReferenceUid,
...(evt ? { calendarEvent: evt } : { formData }),
},
creditCheckFn
);
}
}
};
Expand Down Expand Up @@ -288,86 +298,18 @@ const _sendCancelledReminders = async (args: SendCancelledRemindersArgs) => {

const _cancelScheduledMessagesAndScheduleEmails = async ({
teamId,
userId,
userIdsWithoutCredits,
}: {
teamId?: number | null;
userId?: number | null;
userIdsWithoutCredits: number[];
}) => {
const { CreditService } = await import("@calcom/features/ee/billing/credit-service");

let userIdsWithNoCredits: number[] = userId ? [userId] : [];

if (teamId) {
const teamMembers = await prisma.membership.findMany({
where: {
teamId,
accepted: true,
},
});

const creditService = new CreditService();

userIdsWithNoCredits = (
await Promise.all(
teamMembers.map(async (member) => {
const hasCredits = await creditService.hasAvailableCredits({ userId: member.userId });
return { userId: member.userId, hasCredits };
})
)
)
.filter(({ hasCredits }) => !hasCredits)
.map(({ userId }) => userId);
}
const { WorkflowReminderRepository } = await import(
"@calcom/features/ee/workflows/repositories/WorkflowReminderRepository"
);

const scheduledMessages = await prisma.workflowReminder.findMany({
where: {
workflowStep: {
workflow: {
OR: [
{
userId: {
in: userIdsWithNoCredits,
},
},
...(teamId ? [{ teamId }] : []),
],
},
},
scheduled: true,
OR: [{ cancelled: false }, { cancelled: null }],
referenceId: {
not: null,
},
method: {
in: [WorkflowMethods.SMS, WorkflowMethods.WHATSAPP],
},
},
select: {
referenceId: true,
workflowStep: {
select: {
action: true,
},
},
scheduledDate: true,
uuid: true,
id: true,
booking: {
select: {
attendees: {
select: {
email: true,
locale: true,
},
},
user: {
select: {
email: true,
},
},
},
},
},
const scheduledMessages = await WorkflowReminderRepository.findScheduledMessagesToCancel({
teamId,
userIdsWithoutCredits,
});

await Promise.allSettled(scheduledMessages.map((msg) => twilio.cancelSMS(msg.referenceId ?? "")));
Expand All @@ -393,16 +335,8 @@ const _cancelScheduledMessagesAndScheduleEmails = async ({
})
);

await prisma.workflowReminder.updateMany({
where: {
id: {
in: scheduledMessages.map((msg) => msg.id),
},
},
data: {
method: WorkflowMethods.EMAIL,
referenceId: null,
},
await WorkflowReminderRepository.updateRemindersToEmail({
reminderIds: scheduledMessages.map((msg) => msg.id),
});
};
// Export functions wrapped with withReporting
Expand Down
Loading
Loading