The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Organize workflow executors by action and move campaign email helpers into campaigns
Kiran K91faf7cbfe21
diff --git a/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts b/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.tsindex a4efa98b42..f95604f68c 100644--- a/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts+++ b/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts@@ -3,7 +3,7 @@ import { DubApiError } from "@/lib/api/errors";import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";import { parseRequestBody } from "@/lib/api/utils";-import { renderCampaignEmailHTML } from "@/lib/api/workflows/render-campaign-email-html";+import { renderCampaignEmailHTML } from "@/lib/api/campaigns/render-campaign-email-html";import { withWorkspace } from "@/lib/auth";import { TiptapNode } from "@/lib/types";import { CampaignSchema } from "@/lib/zod/schemas/campaigns";diff --git a/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts b/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.tsindex 2049f6556b..2662d8de74 100644--- a/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts+++ b/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts@@ -1,7 +1,7 @@import { validateCampaignFromAddress } from "@/lib/api/campaigns/validate-campaign";import { createId } from "@/lib/api/create-id";import { handleAndReturnErrorResponse } from "@/lib/api/errors";-import { renderCampaignEmailHTML } from "@/lib/api/workflows/render-campaign-email-html";+import { renderCampaignEmailHTML } from "@/lib/api/campaigns/render-campaign-email-html";import { qstash } from "@/lib/cron";import { verifyQstashSignature } from "@/lib/cron/verify-qstash";import { constructPartnerLink } from "@/lib/partners/construct-partner-link";diff --git a/apps/web/app/(ee)/api/cron/workflows/[workflowId]/route.ts b/apps/web/app/(ee)/api/cron/workflows/[workflowId]/route.tsindex 63654368d5..4f0bb513f0 100644--- a/apps/web/app/(ee)/api/cron/workflows/[workflowId]/route.ts+++ b/apps/web/app/(ee)/api/cron/workflows/[workflowId]/route.ts@@ -1,5 +1,5 @@-import { executeSendCampaignWorkflow } from "@/lib/api/workflows/execute-send-campaign-workflow";import { parseWorkflowConfig } from "@/lib/api/workflows/parse-workflow-config";+import { executeSendCampaignWorkflow } from "@/lib/api/workflows/send-campaign/execute";import { withCron } from "@/lib/cron/with-cron";import { prisma } from "@/lib/prisma";import { WORKFLOW_ACTION_TYPES } from "@/lib/zod/schemas/workflows";diff --git a/apps/web/app/(ee)/api/e2e/trigger-workflow/[workflowId]/route.ts b/apps/web/app/(ee)/api/e2e/trigger-workflow/[workflowId]/route.tsindex ab48735c90..ee68fdda5c 100644--- a/apps/web/app/(ee)/api/e2e/trigger-workflow/[workflowId]/route.ts+++ b/apps/web/app/(ee)/api/e2e/trigger-workflow/[workflowId]/route.ts@@ -1,6 +1,6 @@import { handleAndReturnErrorResponse } from "@/lib/api/errors";-import { executeSendCampaignWorkflow } from "@/lib/api/workflows/execute-send-campaign-workflow";import { parseWorkflowConfig } from "@/lib/api/workflows/parse-workflow-config";+import { executeSendCampaignWorkflow } from "@/lib/api/workflows/send-campaign/execute";import { withWorkspace } from "@/lib/auth";import { prisma } from "@/lib/prisma";import { WORKFLOW_ACTION_TYPES } from "@/lib/zod/schemas/workflows";diff --git a/apps/web/lib/api/workflows/interpolate-email-template.ts b/apps/web/lib/api/campaigns/interpolate-email-template.tssimilarity index 100%rename from apps/web/lib/api/workflows/interpolate-email-template.tsrename to apps/web/lib/api/campaigns/interpolate-email-template.tsdiff --git a/apps/web/lib/api/workflows/render-campaign-email-html.ts b/apps/web/lib/api/campaigns/render-campaign-email-html.tssimilarity index 100%rename from apps/web/lib/api/workflows/render-campaign-email-html.tsrename to apps/web/lib/api/campaigns/render-campaign-email-html.tsdiff --git a/apps/web/lib/api/workflows/render-campaign-email-markdown.ts b/apps/web/lib/api/campaigns/render-campaign-email-markdown.tssimilarity index 100%rename from apps/web/lib/api/workflows/render-campaign-email-markdown.tsrename to apps/web/lib/api/campaigns/render-campaign-email-markdown.tsdiff --git a/apps/web/lib/api/workflows/execute-complete-bounty-workflow.ts b/apps/web/lib/api/workflows/award-bounty/execute.tssimilarity index 96%rename from apps/web/lib/api/workflows/execute-complete-bounty-workflow.tsrename to apps/web/lib/api/workflows/award-bounty/execute.tsindex f52e49ec86..6844349bc6 100644--- a/apps/web/lib/api/workflows/execute-complete-bounty-workflow.ts+++ b/apps/web/lib/api/workflows/award-bounty/execute.ts@@ -10,9 +10,9 @@ import {Workflow,WorkspaceRole,} from "@prisma/client";-import { createId } from "../create-id";-import { getWorkspaceUsers } from "../get-workspace-users";-import { parseWorkflowConfig } from "./parse-workflow-config";+import { createId } from "../../create-id";+import { getWorkspaceUsers } from "../../get-workspace-users";+import { parseWorkflowConfig } from "../parse-workflow-config";const terminalStatusReason: Record<Exclude<BountySubmissionStatus, "draft">,@@ -23,7 +23,7 @@ const terminalStatusReason: Record<rejected: "been rejected",};-export const executeCompleteBountyWorkflow = async ({+export const executeAwardBountyWorkflow = async ({workflow,context,}: {diff --git a/apps/web/lib/api/workflows/execute-workflows.ts b/apps/web/lib/api/workflows/execute-workflows.tsindex aa209ab8d0..2b868ba15a 100644--- a/apps/web/lib/api/workflows/execute-workflows.ts+++ b/apps/web/lib/api/workflows/execute-workflows.ts@@ -3,10 +3,10 @@ import { prisma } from "@/lib/prisma";import { WorkflowConditionAttribute, WorkflowContext } from "@/lib/types";import { WORKFLOW_ACTION_TYPES } from "@/lib/zod/schemas/workflows";import { Workflow } from "@prisma/client";-import { executeCompleteBountyWorkflow } from "./execute-complete-bounty-workflow";-import { executeMoveGroupWorkflow } from "./execute-move-group-workflow";-import { executeSendCampaignWorkflow } from "./execute-send-campaign-workflow";+import { executeAwardBountyWorkflow } from "./award-bounty/execute";+import { executeMoveGroupWorkflow } from "./move-group/execute";import { parseWorkflowConfig } from "./parse-workflow-config";+import { executeSendCampaignWorkflow } from "./send-campaign/execute";interface WorkflowActionHandler {execute(params: {@@ -17,7 +17,7 @@ interface WorkflowActionHandler {const ACTION_HANDLERS: Record<WORKFLOW_ACTION_TYPES, WorkflowActionHandler> = {[WORKFLOW_ACTION_TYPES.AwardBounty]: {- execute: executeCompleteBountyWorkflow,+ execute: executeAwardBountyWorkflow,},[WORKFLOW_ACTION_TYPES.SendCampaign]: {diff --git a/apps/web/lib/api/workflows/execute-move-group-workflow.ts b/apps/web/lib/api/workflows/move-group/execute.tssimilarity index 93%rename from apps/web/lib/api/workflows/execute-move-group-workflow.tsrename to apps/web/lib/api/workflows/move-group/execute.tsindex df90e3ef90..ac392eadf7 100644--- a/apps/web/lib/api/workflows/execute-move-group-workflow.ts+++ b/apps/web/lib/api/workflows/move-group/execute.ts@@ -3,9 +3,9 @@ import { WorkflowConditionAttribute, WorkflowContext } from "@/lib/types";import { redis } from "@/lib/upstash/redis";import { WORKFLOW_ACTION_TYPES } from "@/lib/zod/schemas/workflows";import { Workflow } from "@prisma/client";-import { movePartnersToGroup } from "../groups/move-partners-to-group";-import { evaluateWorkflowConditions } from "./evaluate-workflow-conditions";-import { parseWorkflowConfig } from "./parse-workflow-config";+import { movePartnersToGroup } from "../../groups/move-partners-to-group";+import { evaluateWorkflowConditions } from "../evaluate-workflow-conditions";+import { parseWorkflowConfig } from "../parse-workflow-config";export const executeMoveGroupWorkflow = async ({workflow,diff --git a/apps/web/lib/api/workflows/execute-send-campaign-workflow.ts b/apps/web/lib/api/workflows/send-campaign/execute.tssimilarity index 97%rename from apps/web/lib/api/workflows/execute-send-campaign-workflow.tsrename to apps/web/lib/api/workflows/send-campaign/execute.tsindex 5a269f49cb..37023f09aa 100644--- a/apps/web/lib/api/workflows/execute-send-campaign-workflow.ts+++ b/apps/web/lib/api/workflows/send-campaign/execute.ts@@ -14,10 +14,10 @@ import CampaignEmail from "@dub/email/templates/campaign-email";import { chunk } from "@dub/utils";import { NotificationEmailType, Prisma, Workflow } from "@prisma/client";import { addHours, differenceInDays, subDays } from "date-fns";-import { validateCampaignFromAddress } from "../campaigns/validate-campaign";-import { createId } from "../create-id";-import { parseWorkflowConfig } from "./parse-workflow-config";-import { renderCampaignEmailHTML } from "./render-campaign-email-html";+import { validateCampaignFromAddress } from "../../campaigns/validate-campaign";+import { createId } from "../../create-id";+import { parseWorkflowConfig } from "../parse-workflow-config";+import { renderCampaignEmailHTML } from "../../campaigns/render-campaign-email-html";export const executeSendCampaignWorkflow = async ({workflow,diff --git a/apps/web/tests/misc/interpolate-email-template.test.ts b/apps/web/tests/misc/interpolate-email-template.test.tsindex 77332c888e..667ccb2192 100644--- a/apps/web/tests/misc/interpolate-email-template.test.ts+++ b/apps/web/tests/misc/interpolate-email-template.test.ts@@ -1,4 +1,4 @@-import { interpolateEmailTemplate } from "@/lib/api/workflows/interpolate-email-template";+import { interpolateEmailTemplate } from "@/lib/api/campaigns/interpolate-email-template";import { describe, expect, it } from "vitest";describe("interpolateEmailTemplate", () => {