Group move rules partner source group addition

apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts

@@ -2,6 +2,7 @@ import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { DubApiError } from "@/lib/api/errors";
 import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
 import { movePartnersToGroup } from "@/lib/api/groups/move-partners-to-group";
+import { scrubFromPartnerGroupReferences } from "@/lib/api/groups/scrub-from-partner-group-references";
 import { upsertGroupMoveRules } from "@/lib/api/groups/upsert-group-move-rules";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { parseRequestBody } from "@/lib/api/utils";
@@ -365,7 +366,17 @@ export const DELETE = withWorkspace(
       // for `remap-discount-codes` that runs in movePartnersToGroup
       // but we will delete the Discount in `remap-discount-codes` once there are no remaining discount codes.
 
-      // 2. Delete the group move workflow
+      // TODO:
+      // Move this to a background job using defineJob
+
+      // 2. Remove this group from other groups' fromPartnerGroup move-rule conditions
+      await scrubFromPartnerGroupReferences({
+        programId,
+        deletedGroupId: group.id,
+        tx,
+      });
+
+      // 3. Delete the group move workflow
       if (group.workflowId) {
         await tx.workflow.delete({
           where: {
@@ -374,7 +385,7 @@ export const DELETE = withWorkspace(
         });
       }
 
-      // 3. Delete the group
+      // 4. Delete the group
       await tx.partnerGroup.delete({
         where: {
           id: group.id,

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-additional-settings.tsx

@@ -1,7 +1,6 @@
 "use client";
 
 import { findGroupsWithMatchingRules } from "@/lib/api/groups/find-groups-with-matching-rules";
-import { validateGroupMoveRules } from "@/lib/api/groups/validate-group-move-rules";
 import { PAYOUT_HOLDING_PERIOD_DAYS } from "@/lib/constants/payouts";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import { useApiMutation } from "@/lib/swr/use-api-mutation";
@@ -117,34 +116,22 @@ function GroupAdditionalSettingsForm({
 
   const onSubmit = async (data: FormData) => {
     if (!group) return;
-    if (data.moveRules && data.moveRules.length > 0) {
-      try {
-        validateGroupMoveRules({
-          rules: data.moveRules,
-          destinationGroupId: group.id,
-        });
-      } catch (error) {
-        toast.error(error.message);
+    if (data.moveRules && data.moveRules.length > 0 && groups) {
+      const groupsWithMatchingRules = findGroupsWithMatchingRules({
+        groups,
+        currentRules: data.moveRules,
+        currentGroupId: group.id,
+      });
+
+      if (groupsWithMatchingRules.length > 0) {
+        const groupNames = groupsWithMatchingRules
+          .map((g) => g.name)
+          .join(", ");
+        toast.error(
+          `This rule is already in use by the ${groupNames} ${pluralize("group", groupsWithMatchingRules.length)}. Select a different activity or amount.`,
+        );
         return;
       }
-
-      if (groups) {
-        const groupsWithMatchingRules = findGroupsWithMatchingRules({
-          groups,
-          currentRules: data.moveRules,
-          currentGroupId: group.id,
-        });
-
-        if (groupsWithMatchingRules.length > 0) {
-          const groupNames = groupsWithMatchingRules
-            .map((g) => g.name)
-            .join(", ");
-          toast.error(
-            `This rule is already in use by the ${groupNames} ${pluralize("group", groupsWithMatchingRules.length)}. Select a different activity or amount.`,
-          );
-          return;
-        }
-      }
     }
 
     await updateGroup(`/api/groups/${group.id}`, {