Add POST /api/commissions for manual commission creation

apps/web/app/(ee)/api/commissions/route.ts

@@ -1,10 +1,14 @@
+import { createManualCommissions } from "@/lib/api/commissions/create-manual-commissions";
 import { getCommissions } from "@/lib/api/commissions/get-commissions";
 import { transformCustomerForCommission } from "@/lib/api/customers/transform-customer";
 import { DubApiError } from "@/lib/api/errors";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { parseRequestBody } from "@/lib/api/utils";
 import { withWorkspace } from "@/lib/auth";
 import {
   CommissionEnrichedSchema,
+  createCommissionResponseSchema,
+  createManualCommissionBodySchema,
   getCommissionsQuerySchema,
 } from "@/lib/zod/schemas/commissions";
 import { prisma } from "@dub/prisma";
@@ -75,3 +79,46 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {
     ),
   );
 });
+
+// POST /api/commissions - create manual commission
+export const POST = withWorkspace(
+  async ({ workspace, session, req }) => {
+    const programId = getDefaultProgramIdOrThrow(workspace);
+
+    const body = createManualCommissionBodySchema.parse(
+      await parseRequestBody(req),
+    );
+
+    console.time("createManualCommissions");
+
+    await createManualCommissions({
+      ...body,
+      workspace,
+      programId,
+      user: session.user,
+    });
+
+    console.timeEnd("createManualCommissions");
+
+    return NextResponse.json(
+      createCommissionResponseSchema.parse({
+        success: true,
+        message: "Your commissions are being created and will appear shortly.",
+      }),
+      {
+        status: 202,
+      },
+    );
+  },
+  {
+    requiredPlan: [
+      "business",
+      "business plus",
+      "business extra",
+      "business max",
+      "advanced",
+      "enterprise",
+    ],
+    requiredRoles: ["owner", "member"],
+  },
+);

apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts

@@ -1,3 +1,4 @@
+import { triggerAggregateDueCommissionsCronJob } from "@/lib/actions/partners/trigger-aggregate-due-commissions";
 import { createId } from "@/lib/api/create-id";
 import { detectAndRecordFraudEvent } from "@/lib/api/fraud/detect-record-fraud-event";
 import { notifyPartnerCommission } from "@/lib/api/partners/notify-partner-commission";
@@ -432,6 +433,8 @@ async function stepRunSideEffects(
     skipWorkflow,
     clickEvent,
     isFirstConversion,
+    userId,
+    triggerAggregateDueCommissions,
   } = input;
 
   if (!_commission) {
@@ -563,6 +566,10 @@ async function stepRunSideEffects(
         click: pick(clickEvent, ["url", "referer"]),
         event: { id: eventId },
       }),
+
+    // Aggregate due commissions immediately for manual commission
+    triggerAggregateDueCommissions &&
+      triggerAggregateDueCommissionsCronJob(programId),
   ]);
 
   return [

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx

@@ -1,9 +1,12 @@
-import { createManualCommissionAction } from "@/lib/actions/partners/create-manual-commission";
 import { handleMoneyKeyDown } from "@/lib/form-utils";
 import { mutatePrefix } from "@/lib/swr/mutate";
+import { useApiMutation } from "@/lib/swr/use-api-mutation";
 import useRewards from "@/lib/swr/use-rewards";
 import useWorkspace from "@/lib/swr/use-workspace";
-import { createCommissionSchema } from "@/lib/zod/schemas/commissions";
+import {
+  createCommissionResponseSchema,
+  createManualCommissionBodySchema,
+} from "@/lib/zod/schemas/commissions";
 import { StripeCustomerInvoiceSchema } from "@/lib/zod/schemas/customers";
 import { CustomerSelector } from "@/ui/customers/customer-selector";
 import { PartnerLinkSelector } from "@/ui/partners/partner-link-selector";
@@ -27,7 +30,6 @@ import {
   ToggleGroup,
 } from "@dub/ui";
 import { cn, currencyFormatter, formatDate } from "@dub/utils";
-import { useAction } from "next-safe-action/hooks";
 import { useParams } from "next/navigation";
 import { Dispatch, SetStateAction, useEffect, useMemo, useState } from "react";
 import { Controller, useForm } from "react-hook-form";
@@ -39,7 +41,27 @@ interface CreateCommissionSheetProps {
   setIsOpen: Dispatch<SetStateAction<boolean>>;
 }
 
-type FormData = z.infer<typeof createCommissionSchema>;
+// Flatten the discriminated union for react-hook-form compatibility.
+// The form renders all possible fields; onSubmit builds the correct variant.
+type CreateCommissionBody = z.infer<typeof createManualCommissionBodySchema>;
+type CustomBody = Extract<CreateCommissionBody, { type: "custom" }>;
+type LeadBody = Extract<CreateCommissionBody, { type: "lead" }>;
+type SaleBody = Extract<CreateCommissionBody, { type: "sale" }>;
+
+type FormData = {
+  partnerId: CustomBody["partnerId"];
+  amount: CustomBody["amount"] | null;
+  date: CustomBody["date"];
+  description: CustomBody["description"];
+  customerId: LeadBody["customerId"];
+  linkId: LeadBody["linkId"];
+  leadEventDate: LeadBody["leadEventDate"];
+  leadEventName: LeadBody["leadEventName"];
+  saleAmount: SaleBody["saleAmount"];
+  saleEventDate: SaleBody["saleEventDate"];
+  invoiceId: SaleBody["invoiceId"];
+  productId: SaleBody["productId"];
+};
 
 type StripeInvoiceFromApi = z.infer<typeof StripeCustomerInvoiceSchema>;
 
@@ -74,7 +96,7 @@ function CreateCommissionSheetContent({
 
   const [hasCustomLeadEventDate, setHasCustomLeadEventDate] = useState(false);
   const [hasCustomLeadEventName, setHasCustomLeadEventName] = useState(false);
-  const [useExistingEvents, setUseExistingEvents] = useState(false);
+  const [importStripeInvoices, setImportStripeInvoices] = useState(false);
 
   const [commissionType, setCommissionType] =
     useState<CommissionType>("custom");
@@ -111,7 +133,6 @@ function CreateCommissionSheetContent({
     saleEventDate,
     saleAmount,
     leadEventDate,
-    description,
   ] = watch([
     "partnerId",
     "date",
@@ -121,7 +142,6 @@ function CreateCommissionSheetContent({
     "saleEventDate",
     "saleAmount",
     "leadEventDate",
-    "description",
   ]);
 
   const { rewards } = useRewards();
@@ -172,7 +192,10 @@ function CreateCommissionSheetContent({
     isLoading: isStripeInvoicesLoading,
     error: stripeInvoicesError,
   } = useSWR(
-    customerId && useExistingEvents && commissionType === "sale" && workspaceId
+    customerId &&
+      importStripeInvoices &&
+      commissionType === "sale" &&
+      workspaceId
       ? `/api/customers/${customerId}/stripe-invoices?workspaceId=${workspaceId}`
       : null,
     fetcherStripeInvoices,
@@ -217,44 +240,71 @@ function CreateCommissionSheetContent({
     }
   }, [commissionType]);
 
-  const { executeAsync, isPending } = useAction(createManualCommissionAction, {
-    onSuccess: async () => {
-      toast.success("A commission has been created for the partner!");
-      setIsOpen(false);
-      await mutatePrefix(`/api/commissions?workspaceId=${workspaceId}`);
-    },
-    onError({ error }) {
-      toast.error(error.serverError);
-    },
-  });
+  const { makeRequest, isSubmitting } =
+    useApiMutation<z.infer<typeof createCommissionResponseSchema>>();
 
   const onSubmit = async (data: FormData) => {
     if (!workspaceId || !defaultProgramId) {
       toast.error("Please fill all required fields.");
       return;
     }
 
-    const date = data.date ? new Date(data.date).toISOString() : null;
-
-    const saleEventDate = data.saleEventDate
-      ? new Date(data.saleEventDate).toISOString()
-      : null;
+    let body: Record<string, unknown>;
 
-    const leadEventDate = data.leadEventDate
-      ? new Date(data.leadEventDate).toISOString()
-      : null;
+    if (commissionType === "custom") {
+      body = {
+        type: "custom",
+        partnerId,
+        amount: data.amount ? Math.round(data.amount * 100) : 0,
+        date: data.date ? data.date.toISOString() : null,
+        description: data.description || null,
+      };
+    } else if (commissionType === "lead") {
+      body = {
+        type: "lead",
+        partnerId,
+        customerId: data.customerId,
+        linkId: data.linkId,
+        leadEventDate: data.leadEventDate
+          ? data.leadEventDate.toISOString()
+          : null,
+        leadEventName: data.leadEventName || null,
+      };
+    } else {
+      body = {
+        type: "sale",
+        partnerId,
+        customerId: data.customerId,
+        linkId: data.linkId,
+        importStripeInvoices,
+        ...(importStripeInvoices
+          ? {
+              saleAmount: null,
+              saleEventDate: null,
+              invoiceId: null,
+              productId: null,
+            }
+          : {
+              saleAmount: data.saleAmount
+                ? Math.round(data.saleAmount * 100)
+                : null,
+              saleEventDate: data.saleEventDate
+                ? data.saleEventDate.toISOString()
+                : null,
+              invoiceId: data.invoiceId || null,
+              productId: data.productId || null,
+            }),
+      };
+    }
 
-    await executeAsync({
-      ...data,
-      commissionType,
-      partnerId,
-      workspaceId,
-      date,
-      amount: data.amount ? data.amount * 100 : null,
-      saleAmount: data.saleAmount ? data.saleAmount * 100 : null,
-      saleEventDate,
-      leadEventDate,
-      useExistingEvents,
+    await makeRequest("/api/commissions", {
+      method: "POST",
+      body,
+      onSuccess: async ({ message }) => {
+        toast.success(message);
+        setIsOpen(false);
+        await mutatePrefix("/api/commissions");
+      },
     });
   };
 
@@ -274,7 +324,7 @@ function CreateCommissionSheetContent({
     }
 
     if (commissionType === "sale") {
-      if (useExistingEvents) {
+      if (importStripeInvoices) {
         if (isStripeInvoicesLoading) {
           return "Loading Stripe invoices...";
         }
@@ -301,7 +351,7 @@ function CreateCommissionSheetContent({
     customerId,
     amount, // custom commission amount
     saleAmount, // sale commission amount
-    useExistingEvents,
+    importStripeInvoices,
     noStripeCustomerId,
     unimportedStripeInvoices.length,
     isStripeInvoicesLoading,
@@ -591,17 +641,17 @@ function CreateCommissionSheetContent({
                           optionClassName="h-8 flex items-center justify-center rounded-md flex-1 text-sm normal-case"
                           indicatorClassName="bg-white"
                           options={eventSourceOptions}
-                          selected={useExistingEvents ? "existing" : "new"}
+                          selected={importStripeInvoices ? "existing" : "new"}
                           selectAction={(value: string) =>
-                            setUseExistingEvents(value === "existing")
+                            setImportStripeInvoices(value === "existing")
                           }
                         />
                         <p className="mt-2 text-xs text-neutral-500">
                           {
                             eventSourceOptions.find(
                               (option) =>
                                 option.value ===
-                                (useExistingEvents ? "existing" : "new"),
+                                (importStripeInvoices ? "existing" : "new"),
                             )?.description
                           }
                         </p>
@@ -610,7 +660,7 @@ function CreateCommissionSheetContent({
 
                     {/* Stripe invoices for sale + use existing */}
                     {customerId &&
-                      useExistingEvents &&
+                      importStripeInvoices &&
                       commissionType === "sale" && (
                         <div className="space-y-3">
                           {isStripeInvoicesLoading ? (
@@ -714,7 +764,7 @@ function CreateCommissionSheetContent({
                       )}
 
                     {customerId &&
-                      !useExistingEvents &&
+                      !importStripeInvoices &&
                       (commissionType === "lead" ? (
                         <>
                           <AnimatedSizeContainer
@@ -1007,15 +1057,15 @@ function CreateCommissionSheetContent({
             onClick={() => setIsOpen(false)}
             text="Cancel"
             className="w-fit"
-            disabled={isPending}
+            disabled={isSubmitting}
           />
 
           <Button
             type="submit"
             variant="primary"
             text={`Create commission${unimportedStripeInvoices.length > 0 ? "s" : ""}`}
             className="w-fit"
-            loading={isPending}
+            loading={isSubmitting}
             disabledTooltip={submitDisabledMessage}
           />
         </div>