feat: add appointment notification sharing functionality via WhatsApp, email, and system clipboard
This commit is contained in:
@@ -9,6 +9,7 @@ const BASE_RETRY_DELAY_MS = 5000;
|
||||
const MAX_JITTER_MS = 3000;
|
||||
const THROTTLE_RETRY_DELAY_MS = 8000;
|
||||
const DEFAULT_CLEANUP_INTERVAL_MS = 60 * 60 * 1000;
|
||||
const CLEANUP_RETENTION_DAYS = 7;
|
||||
const SUPPORTED_APPOINTMENT_NOTIFICATION_TYPES = new Set(["creation", "reminder", "cancellation"]);
|
||||
|
||||
function resolveCleanupIntervalMs(): number {
|
||||
@@ -41,6 +42,12 @@ export function buildStartOfDay(date: Date): Date {
|
||||
return new Date(date.getFullYear(), date.getMonth(), date.getDate());
|
||||
}
|
||||
|
||||
export function buildCleanupCutoff(now: Date): Date {
|
||||
const cutoff = buildStartOfDay(now);
|
||||
cutoff.setDate(cutoff.getDate() - CLEANUP_RETENTION_DAYS);
|
||||
return cutoff;
|
||||
}
|
||||
|
||||
function getJobId(job: { id?: unknown; _id?: unknown; appointmentId?: unknown; channel?: unknown; get?: (path: string) => unknown }): string {
|
||||
const value = job.id || job._id || job.get?.("_id");
|
||||
if (value) return String(value);
|
||||
@@ -91,7 +98,7 @@ export class JobProcessor {
|
||||
}
|
||||
|
||||
private async cleanupOldJobs(now = new Date()): Promise<void> {
|
||||
const cutoff = buildStartOfDay(now);
|
||||
const cutoff = buildCleanupCutoff(now);
|
||||
|
||||
try {
|
||||
const deletedCount = await this.jobModel.deleteBeforeScheduledAt(cutoff);
|
||||
|
||||
@@ -147,7 +147,7 @@ export function buildNotificationText(params: {
|
||||
}
|
||||
|
||||
export async function resolveNotificationContent(job: INotificationJobDocument): Promise<ResolvedNotificationContent> {
|
||||
if ((job.type === "creation" || job.type === "reminder" || job.type === "cancellation") && job.payload) {
|
||||
if ((job.type === "creation" || job.type === "reminder" || job.type === "update" || job.type === "cancellation") && job.payload) {
|
||||
const { email, phoneNumber, userId, companyOwnerId } = job.payload;
|
||||
const subject = job.channel === "email"
|
||||
? job.payload.emailSubject
|
||||
|
||||
@@ -4,6 +4,8 @@ export type NotificationChannel = "whatsapp" | "email" | "system";
|
||||
export type NotificationJobStatus = "pending" | "processing" | "sent" | "failed" | "cancelled";
|
||||
export type NotificationJobType = "creation" | "reminder" | "update" | "cancellation";
|
||||
|
||||
export const DELETABLE_NOTIFICATION_JOB_STATUSES: NotificationJobStatus[] = ["sent", "failed", "cancelled"];
|
||||
|
||||
export interface NotificationJobPayload {
|
||||
email?: string;
|
||||
phoneNumber?: string;
|
||||
@@ -106,6 +108,7 @@ export class NotificationJobModel {
|
||||
async deleteBeforeScheduledAt(cutoff: Date): Promise<number> {
|
||||
const result = await this.notificationJobList.deleteMany({
|
||||
scheduledAt: { $lt: cutoff },
|
||||
status: { $in: DELETABLE_NOTIFICATION_JOB_STATUSES },
|
||||
}).exec();
|
||||
|
||||
return result.deletedCount || 0;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { dispatchEmail, dispatchWhatsApp } from "../ChannelDispatchers.js";
|
||||
import { buildPendingJobQuery, buildStartOfDay, calculateNextRetryAt, JobProcessor } from "../JobProcessor.js";
|
||||
import { buildCleanupCutoff, buildPendingJobQuery, buildStartOfDay, calculateNextRetryAt, JobProcessor } from "../JobProcessor.js";
|
||||
import { DELETABLE_NOTIFICATION_JOB_STATUSES, NotificationJobModel } from "../NotificationJob.Adapter.Mongoose.js";
|
||||
import { resolveNotificationContent } from "../NotificationContentResolver.js";
|
||||
|
||||
jest.mock("../ChannelDispatchers.js", () => ({
|
||||
@@ -103,7 +104,7 @@ describe("JobProcessor", () => {
|
||||
});
|
||||
|
||||
describe("old job cleanup", () => {
|
||||
it("deletes jobs scheduled before the start of the current day", async () => {
|
||||
it("deletes jobs scheduled before the 7-day retention cutoff", async () => {
|
||||
const deleteBeforeScheduledAt = jest.fn().mockResolvedValue(3);
|
||||
const now = new Date(2026, 6, 21, 15, 30, 0, 0);
|
||||
|
||||
@@ -112,7 +113,30 @@ describe("JobProcessor", () => {
|
||||
now
|
||||
);
|
||||
|
||||
expect(deleteBeforeScheduledAt).toHaveBeenCalledWith(new Date(2026, 6, 21, 0, 0, 0, 0));
|
||||
expect(deleteBeforeScheduledAt).toHaveBeenCalledWith(new Date(2026, 6, 14, 0, 0, 0, 0));
|
||||
});
|
||||
|
||||
it("builds the 7-day retention cutoff from the start of the local day", () => {
|
||||
expect(buildCleanupCutoff(new Date(2026, 6, 21, 15, 30, 0, 0))).toEqual(
|
||||
new Date(2026, 6, 14, 0, 0, 0, 0)
|
||||
);
|
||||
});
|
||||
|
||||
it("deletes only terminal statuses and never pending or processing jobs", async () => {
|
||||
const exec = jest.fn().mockResolvedValue({ deletedCount: 3 });
|
||||
const deleteMany = jest.fn(() => ({ exec }));
|
||||
const model = Object.create(NotificationJobModel.prototype) as NotificationJobModel;
|
||||
(model as any).notificationJobList = { deleteMany };
|
||||
const cutoff = new Date("2026-07-14T00:00:00.000Z");
|
||||
|
||||
await model.deleteBeforeScheduledAt(cutoff);
|
||||
|
||||
expect(deleteMany).toHaveBeenCalledWith({
|
||||
scheduledAt: { $lt: cutoff },
|
||||
status: { $in: ["sent", "failed", "cancelled"] },
|
||||
});
|
||||
expect(DELETABLE_NOTIFICATION_JOB_STATUSES).not.toContain("pending");
|
||||
expect(DELETABLE_NOTIFICATION_JOB_STATUSES).not.toContain("processing");
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -158,6 +158,111 @@ describe("NotificationContentResolver", () => {
|
||||
});
|
||||
});
|
||||
|
||||
it("uses update payload content for email jobs without requiring appointment lookup", async () => {
|
||||
const appointmentLookup = jest.spyOn(mongoose.models.Appointment, "findOne");
|
||||
|
||||
const result = await resolveNotificationContent({
|
||||
appointmentId: "appointment-1",
|
||||
clientId: "client-1",
|
||||
companyId: "company-1",
|
||||
channel: "email",
|
||||
type: "update",
|
||||
payload: {
|
||||
email: "client@example.com",
|
||||
phoneNumber: "5491112345678",
|
||||
userId: "user-1",
|
||||
companyOwnerId: "owner-1",
|
||||
subject: "Generic update subject",
|
||||
message: "Generic update body.",
|
||||
emailSubject: "Email update subject",
|
||||
emailMessage: "Email update body.",
|
||||
wapMessage: "WAP update body.",
|
||||
systemSubject: "System update subject",
|
||||
systemMessage: "System update body.",
|
||||
},
|
||||
} as any);
|
||||
|
||||
expect(appointmentLookup).not.toHaveBeenCalled();
|
||||
expect(result).toEqual({
|
||||
email: "client@example.com",
|
||||
phoneNumber: "5491112345678",
|
||||
userId: "user-1",
|
||||
companyOwnerId: "owner-1",
|
||||
subject: "Email update subject",
|
||||
message: "Email update body.",
|
||||
});
|
||||
});
|
||||
|
||||
it("uses update payload content for WhatsApp jobs without requiring appointment lookup", async () => {
|
||||
const appointmentLookup = jest.spyOn(mongoose.models.Appointment, "findOne");
|
||||
|
||||
const result = await resolveNotificationContent({
|
||||
appointmentId: "appointment-1",
|
||||
clientId: "client-1",
|
||||
companyId: "company-1",
|
||||
channel: "whatsapp",
|
||||
type: "update",
|
||||
payload: {
|
||||
email: "client@example.com",
|
||||
phoneNumber: "5491112345678",
|
||||
userId: "user-1",
|
||||
companyOwnerId: "owner-1",
|
||||
subject: "Generic update subject",
|
||||
message: "Generic update body.",
|
||||
emailSubject: "Email update subject",
|
||||
emailMessage: "Email update body.",
|
||||
wapMessage: "WAP update body.",
|
||||
systemSubject: "System update subject",
|
||||
systemMessage: "System update body.",
|
||||
},
|
||||
} as any);
|
||||
|
||||
expect(appointmentLookup).not.toHaveBeenCalled();
|
||||
expect(result).toEqual({
|
||||
email: "client@example.com",
|
||||
phoneNumber: "5491112345678",
|
||||
userId: "user-1",
|
||||
companyOwnerId: "owner-1",
|
||||
subject: "Generic update subject",
|
||||
message: "WAP update body.",
|
||||
});
|
||||
});
|
||||
|
||||
it("uses update payload content for system jobs without requiring appointment lookup", async () => {
|
||||
const appointmentLookup = jest.spyOn(mongoose.models.Appointment, "findOne");
|
||||
|
||||
const result = await resolveNotificationContent({
|
||||
appointmentId: "appointment-1",
|
||||
clientId: "client-1",
|
||||
companyId: "company-1",
|
||||
channel: "system",
|
||||
type: "update",
|
||||
payload: {
|
||||
email: "client@example.com",
|
||||
phoneNumber: "5491112345678",
|
||||
userId: "user-1",
|
||||
companyOwnerId: "owner-1",
|
||||
subject: "Generic update subject",
|
||||
message: "Generic update body.",
|
||||
emailSubject: "Email update subject",
|
||||
emailMessage: "Email update body.",
|
||||
wapMessage: "WAP update body.",
|
||||
systemSubject: "System update subject",
|
||||
systemMessage: "System update body.",
|
||||
},
|
||||
} as any);
|
||||
|
||||
expect(appointmentLookup).not.toHaveBeenCalled();
|
||||
expect(result).toEqual({
|
||||
email: "client@example.com",
|
||||
phoneNumber: "5491112345678",
|
||||
userId: "user-1",
|
||||
companyOwnerId: "owner-1",
|
||||
subject: "System update subject",
|
||||
message: "System update body.",
|
||||
});
|
||||
});
|
||||
|
||||
it("uses WhatsApp cancellation payload content for WhatsApp jobs", async () => {
|
||||
const result = await resolveNotificationContent({
|
||||
appointmentId: "deleted-appointment-1",
|
||||
|
||||
Reference in New Issue
Block a user