* fix: break circular dependency in messageDispatcher via dependency injection Break the 4-file circular dependency chain: credit-service → reminderScheduler → smsReminderManager → messageDispatcher → credit-service Solution: - Add optional creditCheckFn parameter to messageDispatcher functions - Thread creditCheckFn through the call chain: scheduleWorkflowReminders → scheduleSMSReminder/scheduleWhatsappReminder → messageDispatcher - When creditCheckFn is provided, use it; otherwise fall back to dynamic CreditService import for backward compatibility - This breaks the workflows → billing import while preserving immediate fallback behavior Changes: - messageDispatcher: Accept optional creditCheckFn parameter, use it if provided - smsReminderManager: Thread creditCheckFn through scheduleSMSReminder - whatsappReminderManager: Thread creditCheckFn through scheduleWhatsappReminder - reminderScheduler: Add creditCheckFn to ScheduleWorkflowRemindersArgs and pass through processWorkflowStep All type checks, lint checks, and unit tests pass. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * feat: wire creditCheckFn from all callers to complete circular dependency fix - Add creditCheckFn parameter to WorkflowService.scheduleFormWorkflows - Wire creditCheckFn from all 10 entry points that call workflow scheduling: * formSubmissionUtils.ts (form submissions) * roundRobinManualReassignment.ts (round-robin reassignment) * triggerFormSubmittedNoEventWorkflow.ts (form workflow trigger) * handleBookingRequested.ts (booking requests) * RegularBookingService.ts (2 calls - payment initiated & new bookings) * handleSeats.ts (seated bookings) * handleConfirmation.ts (2 calls - confirmation & payment) * handleMarkNoShow.ts (no-show updates) * confirm.handler.ts (booking rejection) - Update test expectations to use expect.objectContaining() - Fix pre-existing lint warning in handleMarkNoShow.ts (any type) - This completes the messageDispatcher circular dependency fix by ensuring creditCheckFn is actually passed through the call chain, breaking the 4-file circular dependency at runtime Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: use generic type with type guard in logFailedResults to fix type check error - Replace constrained type with generic type parameter - Add proper type guard for rejected promises - Fixes CI type check failure in handleMarkNoShow.ts:385 - Avoids 'any' type while accepting any fulfilled value shape Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * wip * wip * wip * revert * revert * feat: wire creditCheckFn from all remaining callers to eliminate fallbacks - Wire creditCheckFn in packages/sms/sms-manager.ts (can safely import CreditService) - Create makeHandler factory pattern for CRON endpoints (scheduleSMSReminders.ts, scheduleWhatsappReminders.ts) - Wire creditCheckFn from apps/web CRON routes to factories - Add warning log in messageDispatcher when fallback is used - Complete creditCheckFn wiring from all direct callers (activateEventType.handler.ts, util.ts) This eliminates all fallbacks to dynamic import except as a safety net for unforeseen call sites. The circular dependency (workflows ↔ billing) remains acceptable as discussed with user (Option C). Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * test: update formSubmissionUtils tests to expect creditCheckFn parameter The scheduleFormWorkflows function now receives creditCheckFn as a parameter. Updated test assertions to use expect.objectContaining() with creditCheckFn: expect.any(Function) to account for the new dependency injection parameter. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * test: update sms-manager test to expect creditCheckFn parameter The sendSmsOrFallbackEmail function now receives creditCheckFn as a parameter. Updated test assertion to use expect.objectContaining() with creditCheckFn: expect.any(Function) to account for the new dependency injection parameter. Also removed teamId: undefined assertion as the key may be omitted entirely from the actual call. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * feat: make creditCheckFn required to fully break circular dependency This commit completes the circular dependency fix by making creditCheckFn required throughout the call chain, eliminating the dynamic import fallback entirely. Changes: - Make creditCheckFn required in messageDispatcher functions (sendSmsOrFallbackEmail, scheduleSmsOrFallbackEmail) - Remove dynamic import fallback and warning log from messageDispatcher - Make creditCheckFn required in ScheduleTextReminderArgs (smsReminderManager) - Make creditCheckFn required in processWorkflowStep and ScheduleWorkflowRemindersArgs (reminderScheduler) - Add creditCheckFn to SendCancelledRemindersArgs and wire from handleCancelBooking The circular dependency is now fully broken - no more dynamic imports of CreditService from within the workflows package. All callers must explicitly provide creditCheckFn via dependency injection. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: make creditCheckFn required in WorkflowService.scheduleFormWorkflows This commit fixes the CI type check error by making creditCheckFn required in WorkflowService.scheduleFormWorkflows. Previously, creditCheckFn was optional in scheduleFormWorkflows but required in scheduleWorkflowReminders, causing a type mismatch. Changes: - Make creditCheckFn required in scheduleFormWorkflows signature - Update WorkflowService.test.ts to pass mock creditCheckFn in all test cases - Add responseId and routedEventTypeId to test calls for completeness All callers of scheduleFormWorkflows already pass creditCheckFn, so this change is safe and completes the circular dependency fix. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * remove * fix * refactor * refactor * refactor * wip * fix * fix * rm --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
166 lines
5.8 KiB
TypeScript
166 lines
5.8 KiB
TypeScript
/* Schedule any workflow reminder that falls within the next 2 hours for WHATSAPP */
|
|
import type { NextRequest } from "next/server";
|
|
import { NextResponse } from "next/server";
|
|
|
|
import dayjs from "@calcom/dayjs";
|
|
import { CreditService } from "@calcom/features/ee/billing/credit-service";
|
|
import { getTranslation } from "@calcom/lib/server/i18n";
|
|
import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
|
|
import prisma from "@calcom/prisma";
|
|
import { WorkflowActions, WorkflowMethods } from "@calcom/prisma/enums";
|
|
|
|
import { getWhatsappTemplateFunction, isAttendeeAction } from "../lib/actionHelperFunctions";
|
|
import type { PartialWorkflowReminder } from "../lib/getWorkflowReminders";
|
|
import { select } from "../lib/getWorkflowReminders";
|
|
import { scheduleSmsOrFallbackEmail } from "../lib/reminders/messageDispatcher";
|
|
import {
|
|
getContentSidForTemplate,
|
|
getContentVariablesForTemplate,
|
|
} from "../lib/reminders/templates/whatsapp/ContentSidMapping";
|
|
|
|
export async function handler(req: NextRequest) {
|
|
const apiKey = req.headers.get("authorization") || req.nextUrl.searchParams.get("apiKey");
|
|
|
|
if (process.env.CRON_API_KEY !== apiKey) {
|
|
return NextResponse.json({ message: "Not authenticated" }, { status: 401 });
|
|
}
|
|
|
|
//find all unscheduled WHATSAPP reminders
|
|
const unscheduledReminders = (await prisma.workflowReminder.findMany({
|
|
where: {
|
|
method: WorkflowMethods.WHATSAPP,
|
|
scheduled: false,
|
|
scheduledDate: {
|
|
gte: new Date(),
|
|
lte: dayjs().add(2, "hour").toISOString(),
|
|
},
|
|
retryCount: {
|
|
lt: 3, // Don't continue retrying if it's already failed 3 times
|
|
},
|
|
},
|
|
select,
|
|
})) as PartialWorkflowReminder[];
|
|
|
|
if (!unscheduledReminders.length) {
|
|
return NextResponse.json({ ok: true });
|
|
}
|
|
|
|
for (const reminder of unscheduledReminders) {
|
|
if (!reminder.workflowStep || !reminder.booking) {
|
|
continue;
|
|
}
|
|
const userId = reminder.workflowStep.workflow.userId;
|
|
const teamId = reminder.workflowStep.workflow.teamId;
|
|
|
|
try {
|
|
const sendTo =
|
|
reminder.workflowStep.action === WorkflowActions.WHATSAPP_NUMBER
|
|
? reminder.workflowStep.sendTo
|
|
: reminder.booking?.smsReminderNumber;
|
|
|
|
const userName =
|
|
reminder.workflowStep.action === WorkflowActions.WHATSAPP_ATTENDEE
|
|
? reminder.booking?.attendees[0].name
|
|
: "";
|
|
|
|
const attendeeName =
|
|
reminder.workflowStep.action === WorkflowActions.WHATSAPP_ATTENDEE
|
|
? reminder.booking?.user?.name
|
|
: reminder.booking?.attendees[0].name;
|
|
|
|
const timeZone =
|
|
reminder.workflowStep.action === WorkflowActions.WHATSAPP_ATTENDEE
|
|
? reminder.booking?.attendees[0].timeZone
|
|
: reminder.booking?.user?.timeZone;
|
|
|
|
const startTime = reminder.booking?.startTime.toISOString();
|
|
const locale = reminder.booking.user?.locale || "en";
|
|
const timeFormat = getTimeFormatStringFromUserTimeFormat(reminder.booking.user?.timeFormat);
|
|
|
|
const templateFunction = getWhatsappTemplateFunction(reminder.workflowStep.template);
|
|
const contentSid = getContentSidForTemplate(reminder.workflowStep.template);
|
|
const contentVariables = getContentVariablesForTemplate({
|
|
name: userName,
|
|
attendeeName: attendeeName || "",
|
|
eventName: reminder.booking?.eventType?.title,
|
|
eventDate: dayjs(startTime).tz(timeZone).locale(locale).format("YYYY MMM D"),
|
|
startTime: dayjs(startTime)
|
|
.tz(timeZone)
|
|
.locale(locale)
|
|
.format(timeFormat || "h:mma"),
|
|
timeZone,
|
|
});
|
|
const message = templateFunction(
|
|
false,
|
|
reminder.booking.user?.locale || "en",
|
|
reminder.workflowStep.action,
|
|
timeFormat,
|
|
startTime || "",
|
|
reminder.booking?.eventType?.title || "",
|
|
timeZone || "",
|
|
attendeeName || "",
|
|
userName
|
|
);
|
|
|
|
if (message?.length && message?.length > 0 && sendTo) {
|
|
const creditService = new CreditService();
|
|
|
|
const scheduledNotification = await scheduleSmsOrFallbackEmail({
|
|
twilioData: {
|
|
phoneNumber: sendTo,
|
|
body: message,
|
|
scheduledDate: reminder.scheduledDate,
|
|
sender: "",
|
|
bookingUid: reminder.booking.uid,
|
|
userId,
|
|
teamId,
|
|
isWhatsapp: true,
|
|
contentSid,
|
|
contentVariables,
|
|
},
|
|
fallbackData:
|
|
reminder.workflowStep.action && isAttendeeAction(reminder.workflowStep.action)
|
|
? {
|
|
email: reminder.booking.attendees[0].email,
|
|
t: await getTranslation(reminder.booking.attendees[0].locale || "en", "common"),
|
|
replyTo: reminder.booking?.user?.email ?? "",
|
|
workflowStepId: reminder.workflowStep.id,
|
|
}
|
|
: undefined,
|
|
creditCheckFn: creditService.hasAvailableCredits.bind(creditService),
|
|
});
|
|
|
|
if (scheduledNotification) {
|
|
if (scheduledNotification.sid) {
|
|
await prisma.workflowReminder.update({
|
|
where: {
|
|
id: reminder.id,
|
|
},
|
|
data: {
|
|
scheduled: true,
|
|
referenceId: scheduledNotification.sid,
|
|
},
|
|
});
|
|
} else if (scheduledNotification.emailReminderId) {
|
|
await prisma.workflowReminder.delete({
|
|
where: {
|
|
id: reminder.id,
|
|
},
|
|
});
|
|
}
|
|
} else {
|
|
await prisma.workflowReminder.delete({
|
|
where: {
|
|
id: reminder.id,
|
|
},
|
|
});
|
|
}
|
|
}
|
|
} catch (error) {
|
|
console.log(`Error scheduling WHATSAPP with error ${error}`);
|
|
}
|
|
}
|
|
|
|
return NextResponse.json({ message: "WHATSAPP scheduled" }, { status: 200 });
|
|
}
|