Skip to content
Open
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
41 changes: 35 additions & 6 deletions packages/features/ee/workflows/api/scheduleSMSReminders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,19 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
//delete all scheduled sms reminders where scheduled date is past current date
await prisma.workflowReminder.deleteMany({
where: {
method: WorkflowMethods.SMS,
scheduledDate: {
lte: dayjs().toISOString(),
},
OR: [
{
method: WorkflowMethods.SMS,
scheduledDate: {
lte: dayjs().toISOString(),
},
},
{
retryCount: {
gt: 1,
Comment on lines +39 to +40
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: hardcoded threshold of 1 retry - no constant or config

the gt: 1 means reminders are deleted after 2 failures, but there's no named constant or explanation for why this specific value

Prompt To Fix With AI
This is a comment left during a code review.
Path: packages/features/ee/workflows/api/scheduleSMSReminders.ts
Line: 39:40

Comment:
**style:** hardcoded threshold of 1 retry - no constant or config

the `gt: 1` means reminders are deleted after 2 failures, but there's no named constant or explanation for why this specific value

How can I resolve this? If you propose a fix, please make it concise.

},
},
Comment on lines +38 to +42
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: deletion logic will remove ALL workflow reminders across different methods

the OR condition deletes reminders where retryCount > 1 WITHOUT checking method: WorkflowMethods.SMS, affecting EMAIL and WHATSAPP reminders too

Suggested change
{
retryCount: {
gt: 1,
},
},
{
method: WorkflowMethods.SMS,
retryCount: {
gt: 1,
},
},
Prompt To Fix With AI
This is a comment left during a code review.
Path: packages/features/ee/workflows/api/scheduleSMSReminders.ts
Line: 38:42

Comment:
**logic:** deletion logic will remove ALL workflow reminders across different methods

the OR condition deletes reminders where `retryCount > 1` WITHOUT checking `method: WorkflowMethods.SMS`, affecting EMAIL and WHATSAPP reminders too

```suggestion
        {
          method: WorkflowMethods.SMS,
          retryCount: {
            gt: 1,
          },
        },
```

How can I resolve this? If you propose a fix, please make it concise.

],
},
});

Expand All @@ -44,8 +53,11 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
lte: dayjs().add(7, "day").toISOString(),
},
},
select,
})) as PartialWorkflowReminder[];
select: {
...select,
retryCount: true,
},
})) as (PartialWorkflowReminder & { retryCount: number })[];

if (!unscheduledReminders.length) {
res.json({ ok: true });
Expand Down Expand Up @@ -163,9 +175,26 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
referenceId: scheduledSMS.sid,
},
});
} else {
await prisma.workflowReminder.update({
where: {
id: reminder.id,
},
data: {
retryCount: reminder.retryCount + 1,
},
});
}
}
} catch (error) {
await prisma.workflowReminder.update({
where: {
id: reminder.id,
},
data: {
retryCount: reminder.retryCount + 1,
},
});
console.log(`Error scheduling SMS with error ${error}`);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "WorkflowReminder" ADD COLUMN "retryCount" INTEGER NOT NULL DEFAULT 0;
1 change: 1 addition & 0 deletions packages/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -997,6 +997,7 @@ model WorkflowReminder {
cancelled Boolean?
seatReferenceId String?
isMandatoryReminder Boolean? @default(false)
retryCount Int @default(0)

@@index([bookingUid])
@@index([workflowStepId])
Expand Down