Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Address CodeRabbit comments

Kiran K42366bf9c4d5
diff --git a/apps/web/app/(ee)/api/cron/partner-program-summary/process/route.ts b/apps/web/app/(ee)/api/cron/partner-program-summary/process/route.ts
index 09616db3af..f41a4c1b90 100644
--- a/apps/web/app/(ee)/api/cron/partner-program-summary/process/route.ts
+++ b/apps/web/app/(ee)/api/cron/partner-program-summary/process/route.ts
@@ -21,6 +21,7 @@ const queue = qstash.queue({
const schema = z.object({
programId: z.string(),
startingAfter: z.string().nullish(),
+ batchNumber: z.number().nullish(),
});
interface AnalyticsResponse {
@@ -35,7 +36,7 @@ interface AnalyticsResponse {
export const POST = withCron(async ({ rawBody }) => {
const result = schema.parse(JSON.parse(rawBody));
- let { programId, startingAfter } = result;
+ let { programId, startingAfter, batchNumber } = result;
const previousMonth = startOfMonth(subMonths(new Date(), 2));
const currentMonth = startOfMonth(subMonths(new Date(), 1));
@@ -283,6 +284,7 @@ export const POST = withCron(async ({ rawBody }) => {
);
const reportingMonth = format(currentMonth, "MMM yyyy");
+ batchNumber = batchNumber || 1;
await sendBatchEmail(
summary.map(({ partner, ...rest }) => ({
@@ -302,13 +304,14 @@ export const POST = withCron(async ({ rawBody }) => {
}),
})),
{
- idempotencyKey: `partner-program-summary-${reportingMonth}-${program.id}`,
+ idempotencyKey: `partner-program-summary-${reportingMonth}-${program.id}-${batchNumber}`,
},
);
// Schedule the next batch if there are more partners to process
if (programEnrollments.length === PARTNER_BATCH_SIZE) {
startingAfter = programEnrollments[programEnrollments.length - 1].id;
+ batchNumber++;
const response = await queue.enqueueJSON({
url: `${APP_DOMAIN_WITH_NGROK}/api/cron/partner-program-summary/process`,
@@ -316,6 +319,7 @@ export const POST = withCron(async ({ rawBody }) => {
body: {
...result,
startingAfter,
+ batchNumber,
},
});
diff --git a/apps/web/app/(ee)/api/cron/partner-program-summary/route.ts b/apps/web/app/(ee)/api/cron/partner-program-summary/route.ts
index bba7a1cd5d..d4ea004998 100644
--- a/apps/web/app/(ee)/api/cron/partner-program-summary/route.ts
+++ b/apps/web/app/(ee)/api/cron/partner-program-summary/route.ts
@@ -14,8 +14,6 @@ export const GET = withCron(async () => {
const currentMonth = startOfMonth(subMonths(new Date(), 1));
const yearMonth = format(currentMonth, "yyyy-MM");
- console.log(yearMonth, currentMonth);
-
let page = 0;
while (true) {
diff --git a/apps/web/lib/cron/with-cron.ts b/apps/web/lib/cron/with-cron.ts
index e5be2841e3..e17873ca57 100644
--- a/apps/web/lib/cron/with-cron.ts
+++ b/apps/web/lib/cron/with-cron.ts
@@ -44,6 +44,8 @@ export const withCron = (handler: WithCronHandler) => {
else if (req.method === "POST") {
rawBody = await req.text();
await verifyQstashSignature({ req, rawBody });
+ } else {
+ throw new Error(`Unsupported HTTP method: ${req.method}`);
}
return await handler({
@@ -55,12 +57,15 @@ export const withCron = (handler: WithCronHandler) => {
} catch (error) {
console.error(error);
+ const errorMessage =
+ error instanceof Error ? error.message : String(error);
+
await log({
- message: `Cron job ${url.pathname} failed ${error.message}`,
+ message: `Cron job ${url.pathname} failed: ${errorMessage}`,
type: "cron",
});
- return logAndRespond(error.message);
+ return logAndRespond(errorMessage);
}
},
);