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 feedback

Steven Tey7e1b5803f9f8
diff --git a/apps/web/app/(ee)/api/cron/streams/update-click-stats/route.ts b/apps/web/app/(ee)/api/cron/streams/update-click-stats/route.ts
index c3413adda4..1beb4e7255 100644
--- a/apps/web/app/(ee)/api/cron/streams/update-click-stats/route.ts
+++ b/apps/web/app/(ee)/api/cron/streams/update-click-stats/route.ts
@@ -1,4 +1,3 @@
-import { qstash } from "@/lib/cron";
import { withCron } from "@/lib/cron/with-cron";
import { conn } from "@/lib/planetscale";
import { redis } from "@/lib/upstash/redis";
@@ -7,8 +6,7 @@ import {
LinkClickEvent,
linkClickEventStream,
} from "@/lib/upstash/redis-streams/link-click-events";
-import { APP_DOMAIN_WITH_NGROK, log } from "@dub/utils";
-import { NextResponse } from "next/server";
+import { log } from "@dub/utils";
import { logAndRespond } from "../../utils";
export const dynamic = "force-dynamic";
@@ -317,73 +315,41 @@ const maybeAlertOnBacklog = async (streamInfo: {
});
};
-const executeClickStatsCron = async () => {
- const {
- linkUpdates,
- errors,
- totalProcessed,
- entriesProcessed = 0,
- } = await processClickStatsStreamBatch();
+// GET /api/cron/streams/update-click-stats
+export const GET = withCron(async () => {
+ const acquired = await redis.set(LOCK_KEY, "1", {
+ nx: true,
+ ex: LOCK_TTL_SECONDS,
+ });
- const streamInfo = await linkClickEventStream.getStreamInfo();
- await maybeAlertOnBacklog(streamInfo);
+ if (!acquired) {
+ return logAndRespond(
+ "[update-click-stats] Another run is in progress. Skipping...",
+ );
+ }
- const hasMore =
- streamInfo.length > 0 || (entriesProcessed ?? 0) >= BATCH_SIZE;
+ const { linkUpdates, errors, totalProcessed } =
+ await processClickStatsStreamBatch();
- if (hasMore) {
- await qstash.publishJSON({
- url: `${APP_DOMAIN_WITH_NGROK}/api/cron/streams/update-click-stats`,
- method: "POST",
- body: {},
- });
- }
+ const streamInfo = await linkClickEventStream.getStreamInfo();
+ await maybeAlertOnBacklog(streamInfo);
if (!linkUpdates.length) {
- return NextResponse.json({
+ return logAndRespond({
success: true,
- message: "No updates to process",
processed: 0,
streamInfo,
- hasMore,
+ message: "No updates to process",
});
}
- const response = {
+ await redis.del(LOCK_KEY);
+
+ return logAndRespond({
success: true,
processed: totalProcessed,
errors: errors?.length || 0,
streamInfo,
- hasMore,
message: `Successfully processed ${totalProcessed} click stats updates`,
- };
-
- console.log(response);
-
- return NextResponse.json(response);
-};
-
-const runWithLock = async () => {
- const acquired = await redis.set(LOCK_KEY, "1", {
- nx: true,
- ex: LOCK_TTL_SECONDS,
});
-
- if (!acquired) {
- return logAndRespond(
- "[update-click-stats] Another run is in progress. Skipping...",
- );
- }
-
- try {
- return await executeClickStatsCron();
- } finally {
- await redis.del(LOCK_KEY);
- }
-};
-
-// GET /api/cron/streams/update-click-stats
-export const GET = withCron(async () => runWithLock());
-
-// POST /api/cron/streams/update-click-stats (recursively called by QStash)
-export const POST = withCron(async () => runWithLock());
+});
diff --git a/apps/web/app/(ee)/api/cron/streams/update-partner-stats/route.ts b/apps/web/app/(ee)/api/cron/streams/update-partner-stats/route.ts
index 9205796015..7e083361fd 100644
--- a/apps/web/app/(ee)/api/cron/streams/update-partner-stats/route.ts
+++ b/apps/web/app/(ee)/api/cron/streams/update-partner-stats/route.ts
@@ -8,7 +8,7 @@ import {
import { toCentsNumber } from "@dub/utils";
import { ProgramEnrollment } from "@prisma/client";
import { differenceInDays, format } from "date-fns";
-import { NextResponse } from "next/server";
+import { logAndRespond } from "../../utils";
export const dynamic = "force-dynamic";
@@ -351,7 +351,7 @@ export const GET = withCron(async () => {
await processPartnerActivityStreamBatch();
if (!updates.length) {
- return NextResponse.json({
+ return logAndRespond({
success: true,
message: "No updates to process",
processed: 0,
@@ -360,15 +360,11 @@ export const GET = withCron(async () => {
const streamInfo = await partnerActivityStream.getStreamInfo();
- const response = {
+ return logAndRespond({
success: true,
processed: totalProcessed,
errors: errors?.length || 0,
streamInfo,
message: `Successfully processed ${totalProcessed} partner activity updates`,
- };
-
- console.log(response);
-
- return NextResponse.json(response);
+ });
});
diff --git a/apps/web/app/(ee)/api/cron/streams/update-workspace-links-usage/route.ts b/apps/web/app/(ee)/api/cron/streams/update-workspace-links-usage/route.ts
index ac77b6019b..c08e7a2e75 100644
--- a/apps/web/app/(ee)/api/cron/streams/update-workspace-links-usage/route.ts
+++ b/apps/web/app/(ee)/api/cron/streams/update-workspace-links-usage/route.ts
@@ -11,7 +11,7 @@ import {
workspaceLinksUsageStream,
} from "@/lib/upstash/redis-streams/workspace-links-usage";
import { log } from "@dub/utils";
-import { NextResponse } from "next/server";
+import { logAndRespond } from "../../utils";
export const dynamic = "force-dynamic";
@@ -317,7 +317,7 @@ export const GET = withCron(async () => {
} = await processWorkspaceLinksUsageBatch();
if (!updates.length) {
- return NextResponse.json({
+ return logAndRespond({
success: true,
message: "No updates to process",
processed: 0,
@@ -326,7 +326,7 @@ export const GET = withCron(async () => {
const streamInfo = await workspaceLinksUsageStream.getStreamInfo();
- const response = {
+ return logAndRespond({
success: true,
processed: totalProcessed,
notificationsSent,
@@ -334,9 +334,5 @@ export const GET = withCron(async () => {
lastProcessedId,
streamInfo,
message: `Successfully processed ${totalProcessed} workspace links usage updates`,
- };
-
- console.log(response);
-
- return NextResponse.json(response);
+ });
});