feat: creating and updating groups

2025-10-17 19:47:47 +04:00
parent daa9d12983
commit 30bc7bbee4
18 changed files with 657 additions and 290 deletions
--- a/src/app/deals/components/shared/DealCard/DealCard.module.css
+++ b/src/app/deals/components/shared/DealCard/DealCard.module.css
@ -12,6 +12,26 @@
    }
 }

+.container-selected {
+    border: 2px dashed !important;
+    @mixin light {
+        border-color: dodgerblue !important;
+    }
+    @mixin dark {
+        border-color: dodgerblue !important;
+    }
+}
+
+.container-mainly-selected {
+    border: 2px solid;
+    @mixin light {
+        border-color: dodgerblue !important;
+    }
+    @mixin dark {
+        border-color: dodgerblue !important;
+    }
+}
+
 .container-in-group {
    padding: 0;
    border: 1px dashed;
--- a/src/app/deals/components/shared/DealCard/DealCard.tsx
+++ b/src/app/deals/components/shared/DealCard/DealCard.tsx
@ -1,3 +1,6 @@
+import { IconCategoryPlus } from "@tabler/icons-react";
+import classNames from "classnames";
+import { useContextMenu } from "mantine-contextmenu";
 import { Box, Card, Group, Pill, Stack, Text } from "@mantine/core";
 import { useDealsContext } from "@/app/deals/contexts/DealsContext";
 import { useProjectsContext } from "@/app/deals/contexts/ProjectsContext";
@ -13,10 +16,16 @@ type Props = {

 const DealCard = ({ deal, isInGroup = false }: Props) => {
    const { selectedProject, modulesSet } = useProjectsContext();
-    const { dealsCrud, refetchDeals } = useDealsContext();
+    const { dealsCrud, refetchDeals, groupDealsSelection } = useDealsContext();
    const { openDrawer } = useDrawersContext();

    const onClick = () => {
+        if (groupDealsSelection.isDealsSelecting) {
+            if (groupDealsSelection.selectedBaseDealId !== deal.id)
+                groupDealsSelection.toggleDeal(deal.id);
+            return;
+        }
+
        openDrawer({
            key: "dealEditorDrawer",
            props: {
@ -29,12 +38,37 @@ const DealCard = ({ deal, isInGroup = false }: Props) => {
        });
    };

+    const { showContextMenu } = useContextMenu();
+
+    const dealContextMenu = deal.group
+        ? []
+        : [
+              {
+                  key: "startGroupForming",
+                  onClick: () =>
+                      groupDealsSelection.startSelectingWithDeal(deal.id),
+                  title: "Создать группу",
+                  icon: <IconCategoryPlus />,
+              },
+          ];
+
+    const getSelectedStyles = () => {
+        if (groupDealsSelection.selectedBaseDealId === deal.id) {
+            return styles["container-mainly-selected"];
+        }
+        if (groupDealsSelection.selectedDealIds.has(deal.id)) {
+            return styles["container-selected"];
+        }
+    };
+
    return (
        <Card
            onClick={onClick}
-            className={
+            className={classNames(
+                getSelectedStyles(),
                isInGroup ? styles["container-in-group"] : styles.container
-            }>
+            )}
+            onContextMenu={showContextMenu(dealContextMenu)}>
            <Group
                justify={"space-between"}
                wrap={"nowrap"}
--- a/src/app/deals/components/shared/DealsGroup/DealsGroup.module.css
+++ b/src/app/deals/components/shared/DealsGroup/DealsGroup.module.css
@ -10,3 +10,13 @@
        border-color: var(--mantine-color-dark-5);
    }
 }
+
+.selected-group {
+    border: 2px solid;
+    @mixin light {
+        border-color: dodgerblue;
+    }
+    @mixin dark {
+        border-color: dodgerblue;
+    }
+}
--- a/src/app/deals/components/shared/DealsGroup/DealsGroup.tsx
+++ b/src/app/deals/components/shared/DealsGroup/DealsGroup.tsx
@ -1,6 +1,10 @@
-import { FC } from "react";
-import { Stack, Text } from "@mantine/core";
+import { FC, useEffect, useState } from "react";
+import classNames from "classnames";
+import { Flex, Stack, TextInput } from "@mantine/core";
+import { useDebouncedValue } from "@mantine/hooks";
 import DealCard from "@/app/deals/components/shared/DealCard/DealCard";
+import GroupMenu from "@/app/deals/components/shared/GroupMenu/GroupMenu";
+import { useDealsContext } from "@/app/deals/contexts/DealsContext";
 import GroupWithDealsSchema from "@/types/GroupWithDealsSchema";
 import styles from "./DealsGroup.module.css";

@ -9,13 +13,41 @@ type Props = {
 };

 const DealsGroup: FC<Props> = ({ group }) => {
+    const [groupName, setGroupName] = useState(group.name ?? "");
+    const [debouncedGroupName] = useDebouncedValue(groupName, 600);
+    const { groupsCrud, groupDealsSelection } = useDealsContext();
+
+    useEffect(() => {
+        if (debouncedGroupName === group.name) return;
+        groupsCrud.onUpdate(group.id, { name: debouncedGroupName });
+    }, [debouncedGroupName]);
+
    return (
        <Stack
-            className={styles["group-container"]}
+            className={classNames(
+                styles["group-container"],
+                groupDealsSelection.selectedGroupId === group.id &&
+                    styles["selected-group"]
+            )}
            gap={"xs"}
            bdrs={"lg"}
            p={"xs"}>
-            <Text mx={"xs"}>{group.name}</Text>
+            <Flex
+                mx={"xs"}
+                align={"center"}>
+                <TextInput
+                    value={groupName}
+                    onChange={e => setGroupName(e.target.value)}
+                    variant={"unstyled"}
+                />
+                <GroupMenu
+                    group={group}
+                    onDelete={groupsCrud.onDelete}
+                    onStartDealsSelecting={
+                        groupDealsSelection.startSelectingWithExistingGroup
+                    }
+                />
+            </Flex>
            {group.items.map(deal => (
                <DealCard
                    deal={deal}
--- a/src/app/deals/components/shared/GroupDealsSelectionAffix/GroupDealsSelectionAffix.module.css
+++ b/src/app/deals/components/shared/GroupDealsSelectionAffix/GroupDealsSelectionAffix.module.css
@ -0,0 +1,8 @@
+.shadow {
+    @mixin light {
+        box-shadow: var(--light-shadow);
+    }
+    @mixin dark {
+        box-shadow: var(--dark-shadow);
+    }
+}
--- a/src/app/deals/components/shared/GroupDealsSelectionAffix/GroupDealsSelectionAffix.tsx
+++ b/src/app/deals/components/shared/GroupDealsSelectionAffix/GroupDealsSelectionAffix.tsx
@ -0,0 +1,51 @@
+"use client";
+
+import { Affix, Flex, Stack, Title, Transition } from "@mantine/core";
+import { useDealsContext } from "@/app/deals/contexts/DealsContext";
+import InlineButton from "@/components/ui/InlineButton/InlineButton";
+import styles from "./GroupDealsSelectionAffix.module.css";
+
+const GroupDealsSelectionAffix = () => {
+    const {
+        groupDealsSelection: {
+            selectedBaseDealId,
+            selectedGroupId,
+            finishDealsSelecting,
+            cancelDealsSelecting,
+        },
+    } = useDealsContext();
+
+    return (
+        <Affix position={{ bottom: 35, right: 35 }}>
+            <Transition
+                transition="slide-up"
+                mounted={!!(selectedBaseDealId || selectedGroupId)}>
+                {transitionStyles => (
+                    <Stack
+                        bdrs={"xl"}
+                        bd={"1px solid var(--mantine-color-default-border"}
+                        className={styles.shadow}
+                        p={"md"}
+                        gap={"md"}
+                        style={transitionStyles}>
+                        <Title
+                            order={5}
+                            ta={"center"}>
+                            Выбор сделок для группы
+                        </Title>
+                        <Flex gap={"xs"}>
+                            <InlineButton onClick={cancelDealsSelecting}>
+                                Отмена
+                            </InlineButton>
+                            <InlineButton variant={"filled"} onClick={finishDealsSelecting}>
+                                Сохранить
+                            </InlineButton>
+                        </Flex>
+                    </Stack>
+                )}
+            </Transition>
+        </Affix>
+    );
+};
+
+export default GroupDealsSelectionAffix;
--- a/src/app/deals/components/shared/GroupMenu/GroupMenu.tsx
+++ b/src/app/deals/components/shared/GroupMenu/GroupMenu.tsx
@ -0,0 +1,41 @@
+import React, { FC } from "react";
+import { IconCheckbox, IconDotsVertical, IconTrash } from "@tabler/icons-react";
+import { Box, Menu } from "@mantine/core";
+import DropdownMenuItem from "@/components/ui/DropdownMenuItem/DropdownMenuItem";
+import ThemeIcon from "@/components/ui/ThemeIcon/ThemeIcon";
+import GroupWithDealsSchema from "@/types/GroupWithDealsSchema";
+
+
+type Props = {
+    group: GroupWithDealsSchema;
+    onDelete: (groupId: number) => void;
+    onStartDealsSelecting: (group: GroupWithDealsSchema) => void;
+};
+
+const GroupMenu: FC<Props> = ({ group, onDelete, onStartDealsSelecting }) => {
+    return (
+        <Menu>
+            <Menu.Target>
+                <Box onClick={e => e.stopPropagation()}>
+                    <ThemeIcon size={"sm"}>
+                        <IconDotsVertical />
+                    </ThemeIcon>
+                </Box>
+            </Menu.Target>
+            <Menu.Dropdown>
+                <DropdownMenuItem
+                    onClick={() => onDelete(group.id)}
+                    icon={<IconTrash />}
+                    label={"Удалить"}
+                />
+                <DropdownMenuItem
+                    onClick={() => onStartDealsSelecting(group)}
+                    icon={<IconCheckbox />}
+                    label={"Добавить/удалить сделки"}
+                />
+            </Menu.Dropdown>
+        </Menu>
+    );
+};
+
+export default GroupMenu;
--- a/src/app/deals/components/shared/views/BoardView.tsx
+++ b/src/app/deals/components/shared/views/BoardView.tsx
@ -1,11 +1,13 @@
 import { Space } from "@mantine/core";
 import MainBlockHeader from "@/app/deals/components/mobile/MainBlockHeader/MainBlockHeader";
 import Funnel from "@/app/deals/components/shared/Funnel/Funnel";
+import GroupDealsSelectionAffix from "@/app/deals/components/shared/GroupDealsSelectionAffix/GroupDealsSelectionAffix";

 export const BoardView = () => (
    <>
        <MainBlockHeader />
        <Space h="md" />
        <Funnel />
+        <GroupDealsSelectionAffix />
    </>
 );
--- a/src/app/deals/contexts/DealsContext.tsx
+++ b/src/app/deals/contexts/DealsContext.tsx
@ -1,10 +1,13 @@
 "use client";

-import React from "react";
+import { Dispatch, SetStateAction } from "react";
 import { UseFormReturnType } from "@mantine/form";
 import { useStatusesContext } from "@/app/deals/contexts/StatusesContext";
 import useDealsAndGroups from "@/app/deals/hooks/useDealsAndGroups";
 import { DealsFiltersForm } from "@/app/deals/hooks/useDealsFilters";
+import useGroupDealsSelection, {
+    GroupDealsSelection,
+} from "@/app/deals/hooks/useGroupDealsSelection";
 import useDealGroupCrud, { GroupsCrud } from "@/hooks/cruds/useDealGroupCrud";
 import { DealsCrud, useDealsCrud } from "@/hooks/cruds/useDealsCrud";
 import useDealsList from "@/hooks/lists/useDealsList";
@ -23,10 +26,11 @@ type DealsContextState = {
    groupsCrud: GroupsCrud;
    paginationInfo?: PaginationInfoSchema;
    page: number;
-    setPage: React.Dispatch<React.SetStateAction<number>>;
+    setPage: Dispatch<SetStateAction<number>>;
    dealsFiltersForm: UseFormReturnType<DealsFiltersForm>;
    isChangedFilters: boolean;
    sortingForm: UseFormReturnType<SortingForm>;
+    groupDealsSelection: GroupDealsSelection;
 };

 type Props = {
@ -56,6 +60,8 @@ const useDealsContextState = ({

    const groupsCrud = useDealGroupCrud();

+    const groupDealsSelection = useGroupDealsSelection({ groupsCrud });
+
    const { dealsWithoutGroup, groupsWithDeals } =
        useDealsAndGroups(dealsListObjects);

@ -65,6 +71,7 @@ const useDealsContextState = ({
        groupsCrud,
        dealsWithoutGroup,
        groupsWithDeals,
+        groupDealsSelection,
    };
 };

--- a/src/app/deals/hooks/useGroupDealsSelection.tsx
+++ b/src/app/deals/hooks/useGroupDealsSelection.tsx
@ -0,0 +1,92 @@
+import { Dispatch, SetStateAction, useState } from "react";
+import { GroupsCrud } from "@/hooks/cruds/useDealGroupCrud";
+import GroupWithDealsSchema from "@/types/GroupWithDealsSchema";
+
+type Props = {
+    groupsCrud: GroupsCrud;
+};
+
+export type GroupDealsSelection = {
+    isDealsSelecting: boolean;
+    selectedBaseDealId: number | null;
+    startSelectingWithDeal: (dealId: number) => void;
+    selectedGroupId: number | null;
+    startSelectingWithExistingGroup: (group: GroupWithDealsSchema) => void;
+    selectedDealIds: Set<number>;
+    setSelectedDealIds: Dispatch<SetStateAction<Set<number>>>;
+    toggleDeal: (dealId: number) => void;
+    finishDealsSelecting: () => void;
+    cancelDealsSelecting: () => void;
+};
+
+const useGroupDealsSelection = ({ groupsCrud }: Props): GroupDealsSelection => {
+    const [selectedDealIds, setSelectedDealIds] = useState<Set<number>>(
+        new Set()
+    );
+    const [isDealsSelecting, setIsDealsSelecting] = useState<boolean>(false);
+    const [selectedBaseDealId, setSelectedBaseDealId] = useState<number | null>(
+        null
+    );
+    const [selectedGroupId, setSelectedGroupId] = useState<number | null>(null);
+
+    const toggleDeal = (dealId: number) => {
+        if (selectedDealIds.has(dealId)) {
+            selectedDealIds.delete(dealId);
+        } else {
+            selectedDealIds.add(dealId);
+        }
+        setSelectedDealIds(new Set(selectedDealIds));
+    };
+
+    const finishDealsSelecting = () => {
+        if (selectedBaseDealId) {
+            groupsCrud.onCreate(
+                selectedBaseDealId,
+                selectedDealIds.values().toArray()
+            );
+            setSelectedBaseDealId(null);
+        } else if (selectedGroupId) {
+            groupsCrud.onUpdateDealsInGroup(
+                selectedGroupId,
+                selectedDealIds.values().toArray()
+            );
+            setSelectedGroupId(null);
+        }
+        setIsDealsSelecting(false);
+        setSelectedDealIds(new Set());
+    };
+
+    const cancelDealsSelecting = () => {
+        setSelectedDealIds(new Set());
+        setSelectedBaseDealId(null);
+        setSelectedGroupId(null);
+        setIsDealsSelecting(false);
+    };
+
+    const startSelectingWithExistingGroup = (group: GroupWithDealsSchema) => {
+        setSelectedDealIds(new Set(group.items.map(item => item.id)));
+        setSelectedGroupId(group.id);
+        setIsDealsSelecting(true);
+    };
+
+    const startSelectingWithDeal = (dealId: number) => {
+        setSelectedDealIds(new Set([dealId]));
+        setSelectedBaseDealId(dealId);
+        setIsDealsSelecting(true);
+    };
+
+    return {
+        isDealsSelecting,
+        selectedBaseDealId,
+        startSelectingWithDeal,
+        selectedGroupId,
+        startSelectingWithExistingGroup,
+        selectedDealIds,
+        setSelectedDealIds,
+        toggleDeal,
+        finishDealsSelecting,
+        cancelDealsSelecting,
+    };
+};
+
+export default useGroupDealsSelection;
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@ -2,6 +2,7 @@ import "@mantine/core/styles.css";
 import "mantine-datatable/styles.layer.css";
 import "@mantine/notifications/styles.css";
 import "@mantine/dates/styles.css";
+import "mantine-contextmenu/styles.css";
 import "swiper/css";
 import "swiper/css/pagination";
 import "swiper/css/scrollbar";
@ -14,6 +15,7 @@ import {
 } from "@mantine/core";
 import { theme } from "@/theme";
 import "@/app/global.css";
+import { ContextMenuProvider } from "mantine-contextmenu";
 import { ModalsProvider } from "@mantine/modals";
 import { Notifications } from "@mantine/notifications";
 import { ProjectsContextProvider } from "@/app/deals/contexts/ProjectsContext";
@ -63,40 +65,42 @@ export default function RootLayout({ children }: Props) {
                <MantineProvider
                    theme={theme}
                    defaultColorScheme={"auto"}>
-                    <ReactQueryProvider>
-                        <ReduxProvider>
-                            <ModalsProvider
-                                labels={{ confirm: "Да", cancel: "Нет" }}
-                                modals={modals}>
-                                <DrawersContextProvider>
-                                    <ProjectsContextProvider>
-                                        <AppShell
-                                            layout={"alt"}
-                                            withBorder={false}
-                                            navbar={{
-                                                width: 220,
-                                                breakpoint: "sm",
-                                                collapsed: {
-                                                    desktop: false,
-                                                    mobile: true,
-                                                },
-                                            }}>
-                                            <AppShellNavbarWrapper>
-                                                <Navbar />
-                                            </AppShellNavbarWrapper>
-                                            <AppShellMainWrapper>
-                                                {children}
-                                            </AppShellMainWrapper>
-                                            <AppShellFooterWrapper>
-                                                <Footer />
-                                            </AppShellFooterWrapper>
-                                        </AppShell>
-                                    </ProjectsContextProvider>
-                                </DrawersContextProvider>
-                            </ModalsProvider>
-                        </ReduxProvider>
-                        <Notifications position="bottom-right" />
-                    </ReactQueryProvider>
+                    <ContextMenuProvider>
+                        <ReactQueryProvider>
+                            <ReduxProvider>
+                                <ModalsProvider
+                                    labels={{ confirm: "Да", cancel: "Нет" }}
+                                    modals={modals}>
+                                    <DrawersContextProvider>
+                                        <ProjectsContextProvider>
+                                            <AppShell
+                                                layout={"alt"}
+                                                withBorder={false}
+                                                navbar={{
+                                                    width: 220,
+                                                    breakpoint: "sm",
+                                                    collapsed: {
+                                                        desktop: false,
+                                                        mobile: true,
+                                                    },
+                                                }}>
+                                                <AppShellNavbarWrapper>
+                                                    <Navbar />
+                                                </AppShellNavbarWrapper>
+                                                <AppShellMainWrapper>
+                                                    {children}
+                                                </AppShellMainWrapper>
+                                                <AppShellFooterWrapper>
+                                                    <Footer />
+                                                </AppShellFooterWrapper>
+                                            </AppShell>
+                                        </ProjectsContextProvider>
+                                    </DrawersContextProvider>
+                                </ModalsProvider>
+                            </ReduxProvider>
+                            <Notifications position="bottom-right" />
+                        </ReactQueryProvider>
+                    </ContextMenuProvider>
                </MantineProvider>
            </body>
        </html>
--- a/src/hooks/cruds/useDealGroupCrud.tsx
+++ b/src/hooks/cruds/useDealGroupCrud.tsx
@ -1,19 +1,54 @@
-import { useMutation } from "@tanstack/react-query";
-import { UpdateDealGroupSchema } from "@/lib/client";
+import React from "react";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { AxiosError } from "axios";
+import { Text } from "@mantine/core";
+import { modals } from "@mantine/modals";
+import { HttpValidationError, UpdateDealGroupSchema } from "@/lib/client";
 import {
-    addDealMutation,
    createDealGroupMutation,
-    removeDealMutation,
+    deleteDealGroupMutation,
    updateDealGroupMutation,
+    updateDealsInGroupMutation,
 } from "@/lib/client/@tanstack/react-query.gen";
+import { notifications } from "@/lib/notifications";

 export type GroupsCrud = {
    onUpdate: (groupId: number, group: UpdateDealGroupSchema) => void;
-    // onDelete: (group: DealGroupSchema, onSuccess?: () => void) => void;
+    onCreate: (mainDealId: number, otherDealIds: number[]) => void;
+    onUpdateDealsInGroup: (groupId: number, dealIds: number[]) => void;
+    onDelete: (groupId: number) => void;
 };

 const useDealGroupCrud = (): GroupsCrud => {
-    const updateMutation = useMutation(updateDealGroupMutation());
+    const queryClient = useQueryClient();
+    const key = "getDeals";
+
+    const onError = (
+        error: AxiosError<HttpValidationError>,
+        _: any,
+        context: any
+    ) => {
+        console.error(error);
+        notifications.error({
+            message: error.response?.data?.detail as string | undefined,
+        });
+        if (context?.previous) {
+            queryClient.setQueryData([key], context.previous);
+        }
+    };
+
+    const onSettled = () => {
+        queryClient.invalidateQueries({
+            predicate: (query: { queryKey: any }) =>
+                query.queryKey[0]?._id === key,
+        });
+    };
+
+    const updateMutation = useMutation({
+        ...updateDealGroupMutation(),
+        onSettled,
+        onError,
+    });

    const onUpdate = (groupId: number, entity: UpdateDealGroupSchema) => {
        updateMutation.mutate({
@ -26,43 +61,64 @@ const useDealGroupCrud = (): GroupsCrud => {
        });
    };

-    const createMutation = useMutation(createDealGroupMutation());
+    const createMutation = useMutation({
+        ...createDealGroupMutation(),
+        onSettled,
+        onError,
+    });

-    const onCreate = (draggingDealId: number, hoveredDealId: number) => {
+    const onCreate = (mainDealId: number, otherDealIds: number[]) => {
        createMutation.mutate({
            body: {
-                draggingDealId,
-                hoveredDealId,
+                mainDealId,
+                otherDealIds,
            },
        });
    };

-    const addDealToGroupMutation = useMutation(addDealMutation());
+    const updateDealsMutation = useMutation({
+        ...updateDealsInGroupMutation(),
+        onSettled,
+        onError,
+    });

-    const onAddDeal = (dealId: number, groupId: number) => {
-        addDealToGroupMutation.mutate({
+    const onUpdateDealsInGroup = (groupId: number, dealIds: number[]) => {
+        updateDealsMutation.mutate({
+            path: {
+                pk: groupId,
+            },
            body: {
-                dealId,
-                groupId,
+                dealIds,
            },
        });
    };

-    const removeDealFromGroupMutation = useMutation(removeDealMutation());
+    const deleteMutation = useMutation({
+        ...deleteDealGroupMutation(),
+        onSettled,
+        onError,
+    });

-    const onRemoveDeal = (dealId: number) => {
-        removeDealFromGroupMutation.mutate({
-            body: {
-                dealId,
+    const onDelete = (groupId: number) => {
+        modals.openConfirmModal({
+            title: "Удаление группы",
+            children: <Text>Вы уверены, что хотите удалить группу?</Text>,
+            confirmProps: { color: "red" },
+            onConfirm: () => {
+                deleteMutation.mutate({
+                    path: {
+                        pk: groupId,
+                    },
+                });
            },
        });
    };

    return {
        onUpdate,
-        // onCreate,
-        // onAddDeal,
-        // onRemoveDeal,
+        onCreate,
+        onUpdateDealsInGroup,
+        onDelete,
    };
 };

--- a/src/lib/client/@tanstack/react-query.gen.ts
+++ b/src/lib/client/@tanstack/react-query.gen.ts
@ -9,7 +9,6 @@ import {
 import type { AxiosError } from "axios";
 import { client as _heyApiClient } from "../client.gen";
 import {
-    addDeal,
    addKitToDeal,
    addKitToDealProduct,
    createBarcodeTemplate,
@ -31,6 +30,7 @@ import {
    deleteBoard,
    deleteClient,
    deleteDeal,
+    deleteDealGroup,
    deleteDealProduct,
    deleteDealProductService,
    deleteDealService,
@ -61,7 +61,6 @@ import {
    getServicesKits,
    getStatuses,
    getStatusHistory,
-    removeDeal,
    updateBarcodeTemplate,
    updateBoard,
    updateClient,
@ -70,6 +69,7 @@ import {
    updateDealProduct,
    updateDealProductService,
    updateDealService,
+    updateDealsInGroup,
    updateMarketplace,
    updateProduct,
    updateProject,
@ -80,9 +80,6 @@ import {
    type Options,
 } from "../sdk.gen";
 import type {
-    AddDealData,
-    AddDealError,
-    AddDealResponse,
    AddKitToDealData,
    AddKitToDealError,
    AddKitToDealProductData,
@ -145,6 +142,9 @@ import type {
    DeleteClientResponse2,
    DeleteDealData,
    DeleteDealError,
+    DeleteDealGroupData,
+    DeleteDealGroupError,
+    DeleteDealGroupResponse2,
    DeleteDealProductData,
    DeleteDealProductError,
    DeleteDealProductResponse2,
@ -204,9 +204,6 @@ import type {
    GetServicesKitsData,
    GetStatusesData,
    GetStatusHistoryData,
-    RemoveDealData,
-    RemoveDealError,
-    RemoveDealResponse,
    UpdateBarcodeTemplateData,
    UpdateBarcodeTemplateError,
    UpdateBarcodeTemplateResponse2,
@ -231,6 +228,9 @@ import type {
    UpdateDealServiceData,
    UpdateDealServiceError,
    UpdateDealServiceResponse2,
+    UpdateDealsInGroupData,
+    UpdateDealsInGroupError,
+    UpdateDealsInGroupResponse2,
    UpdateMarketplaceData,
    UpdateMarketplaceError,
    UpdateMarketplaceResponse2,
@ -621,6 +621,33 @@ export const updateDealMutation = (
    return mutationOptions;
 };

+/**
+ * Delete Group
+ */
+export const deleteDealGroupMutation = (
+    options?: Partial<Options<DeleteDealGroupData>>
+): UseMutationOptions<
+    DeleteDealGroupResponse2,
+    AxiosError<DeleteDealGroupError>,
+    Options<DeleteDealGroupData>
+> => {
+    const mutationOptions: UseMutationOptions<
+        DeleteDealGroupResponse2,
+        AxiosError<DeleteDealGroupError>,
+        Options<DeleteDealGroupData>
+    > = {
+        mutationFn: async localOptions => {
+            const { data } = await deleteDealGroup({
+                ...options,
+                ...localOptions,
+                throwOnError: true,
+            });
+            return data;
+        },
+    };
+    return mutationOptions;
+};
+
 /**
 * Update Group
 */
@ -699,43 +726,19 @@ export const createDealGroupMutation = (
    return mutationOptions;
 };

-/**
- * Remove Deal
- */
-export const removeDealMutation = (
-    options?: Partial<Options<RemoveDealData>>
-): UseMutationOptions<
-    RemoveDealResponse,
-    AxiosError<RemoveDealError>,
-    Options<RemoveDealData>
-> => {
-    const mutationOptions: UseMutationOptions<
-        RemoveDealResponse,
-        AxiosError<RemoveDealError>,
-        Options<RemoveDealData>
-    > = {
-        mutationFn: async localOptions => {
-            const { data } = await removeDeal({
-                ...options,
-                ...localOptions,
-                throwOnError: true,
-            });
-            return data;
-        },
-    };
-    return mutationOptions;
-};
-
-export const addDealQueryKey = (options: Options<AddDealData>) =>
-    createQueryKey("addDeal", options);
+export const updateDealsInGroupQueryKey = (
+    options: Options<UpdateDealsInGroupData>
+) => createQueryKey("updateDealsInGroup", options);

 /**
- * Add Deal
+ * Update Deals In Group
 */
-export const addDealOptions = (options: Options<AddDealData>) => {
+export const updateDealsInGroupOptions = (
+    options: Options<UpdateDealsInGroupData>
+) => {
    return queryOptions({
        queryFn: async ({ queryKey, signal }) => {
-            const { data } = await addDeal({
+            const { data } = await updateDealsInGroup({
                ...options,
                ...queryKey[0],
                signal,
@ -743,27 +746,27 @@ export const addDealOptions = (options: Options<AddDealData>) => {
            });
            return data;
        },
-        queryKey: addDealQueryKey(options),
+        queryKey: updateDealsInGroupQueryKey(options),
    });
 };

 /**
- * Add Deal
+ * Update Deals In Group
 */
-export const addDealMutation = (
-    options?: Partial<Options<AddDealData>>
+export const updateDealsInGroupMutation = (
+    options?: Partial<Options<UpdateDealsInGroupData>>
 ): UseMutationOptions<
-    AddDealResponse,
-    AxiosError<AddDealError>,
-    Options<AddDealData>
+    UpdateDealsInGroupResponse2,
+    AxiosError<UpdateDealsInGroupError>,
+    Options<UpdateDealsInGroupData>
 > => {
    const mutationOptions: UseMutationOptions<
-        AddDealResponse,
-        AxiosError<AddDealError>,
-        Options<AddDealData>
+        UpdateDealsInGroupResponse2,
+        AxiosError<UpdateDealsInGroupError>,
+        Options<UpdateDealsInGroupData>
    > = {
        mutationFn: async localOptions => {
-            const { data } = await addDeal({
+            const { data } = await updateDealsInGroup({
                ...options,
                ...localOptions,
                throwOnError: true,
--- a/src/lib/client/sdk.gen.ts
+++ b/src/lib/client/sdk.gen.ts
@ -3,9 +3,6 @@
 import type { Client, Options as ClientOptions, TDataShape } from "./client";
 import { client as _heyApiClient } from "./client.gen";
 import type {
-    AddDealData,
-    AddDealErrors,
-    AddDealResponses,
    AddKitToDealData,
    AddKitToDealErrors,
    AddKitToDealProductData,
@ -68,6 +65,9 @@ import type {
    DeleteClientResponses,
    DeleteDealData,
    DeleteDealErrors,
+    DeleteDealGroupData,
+    DeleteDealGroupErrors,
+    DeleteDealGroupResponses,
    DeleteDealProductData,
    DeleteDealProductErrors,
    DeleteDealProductResponses,
@ -150,9 +150,6 @@ import type {
    GetStatusHistoryData,
    GetStatusHistoryErrors,
    GetStatusHistoryResponses,
-    RemoveDealData,
-    RemoveDealErrors,
-    RemoveDealResponses,
    UpdateBarcodeTemplateData,
    UpdateBarcodeTemplateErrors,
    UpdateBarcodeTemplateResponses,
@ -177,6 +174,9 @@ import type {
    UpdateDealServiceData,
    UpdateDealServiceErrors,
    UpdateDealServiceResponses,
+    UpdateDealsInGroupData,
+    UpdateDealsInGroupErrors,
+    UpdateDealsInGroupResponses,
    UpdateMarketplaceData,
    UpdateMarketplaceErrors,
    UpdateMarketplaceResponses,
@ -200,8 +200,6 @@ import type {
    UpdateStatusResponses,
 } from "./types.gen";
 import {
-    zAddDealData,
-    zAddDealResponse,
    zAddKitToDealData,
    zAddKitToDealProductData,
    zAddKitToDealProductResponse,
@ -243,6 +241,8 @@ import {
    zDeleteClientData,
    zDeleteClientResponse2,
    zDeleteDealData,
+    zDeleteDealGroupData,
+    zDeleteDealGroupResponse2,
    zDeleteDealProductData,
    zDeleteDealProductResponse2,
    zDeleteDealProductServiceData,
@ -304,8 +304,6 @@ import {
    zGetStatusesResponse2,
    zGetStatusHistoryData,
    zGetStatusHistoryResponse2,
-    zRemoveDealData,
-    zRemoveDealResponse,
    zUpdateBarcodeTemplateData,
    zUpdateBarcodeTemplateResponse2,
    zUpdateBoardData,
@ -322,6 +320,8 @@ import {
    zUpdateDealResponse2,
    zUpdateDealServiceData,
    zUpdateDealServiceResponse2,
+    zUpdateDealsInGroupData,
+    zUpdateDealsInGroupResponse2,
    zUpdateMarketplaceData,
    zUpdateMarketplaceResponse2,
    zUpdateProductData,
@ -555,6 +555,29 @@ export const updateDeal = <ThrowOnError extends boolean = false>(
    });
 };

+/**
+ * Delete Group
+ */
+export const deleteDealGroup = <ThrowOnError extends boolean = false>(
+    options: Options<DeleteDealGroupData, ThrowOnError>
+) => {
+    return (options.client ?? _heyApiClient).delete<
+        DeleteDealGroupResponses,
+        DeleteDealGroupErrors,
+        ThrowOnError
+    >({
+        requestValidator: async data => {
+            return await zDeleteDealGroupData.parseAsync(data);
+        },
+        responseType: "json",
+        responseValidator: async data => {
+            return await zDeleteDealGroupResponse2.parseAsync(data);
+        },
+        url: "/deal-group/{pk}",
+        ...options,
+    });
+};
+
 /**
 * Update Group
 */
@ -610,51 +633,24 @@ export const createDealGroup = <ThrowOnError extends boolean = false>(
 };

 /**
- * Remove Deal
+ * Update Deals In Group
 */
-export const removeDeal = <ThrowOnError extends boolean = false>(
-    options: Options<RemoveDealData, ThrowOnError>
-) => {
-    return (options.client ?? _heyApiClient).delete<
-        RemoveDealResponses,
-        RemoveDealErrors,
-        ThrowOnError
-    >({
-        requestValidator: async data => {
-            return await zRemoveDealData.parseAsync(data);
-        },
-        responseType: "json",
-        responseValidator: async data => {
-            return await zRemoveDealResponse.parseAsync(data);
-        },
-        url: "/deal-group/deal",
-        ...options,
-        headers: {
-            "Content-Type": "application/json",
-            ...options.headers,
-        },
-    });
-};
-
-/**
- * Add Deal
- */
-export const addDeal = <ThrowOnError extends boolean = false>(
-    options: Options<AddDealData, ThrowOnError>
+export const updateDealsInGroup = <ThrowOnError extends boolean = false>(
+    options: Options<UpdateDealsInGroupData, ThrowOnError>
 ) => {
    return (options.client ?? _heyApiClient).post<
-        AddDealResponses,
-        AddDealErrors,
+        UpdateDealsInGroupResponses,
+        UpdateDealsInGroupErrors,
        ThrowOnError
    >({
        requestValidator: async data => {
-            return await zAddDealData.parseAsync(data);
+            return await zUpdateDealsInGroupData.parseAsync(data);
        },
        responseType: "json",
        responseValidator: async data => {
-            return await zAddDealResponse.parseAsync(data);
+            return await zUpdateDealsInGroupResponse2.parseAsync(data);
        },
-        url: "/deal-group/deal",
+        url: "/deal-group/{pk}/deals",
        ...options,
        headers: {
            "Content-Type": "application/json",
--- a/src/lib/client/types.gen.ts
+++ b/src/lib/client/types.gen.ts
@ -1,29 +1,5 @@
 // This file is auto-generated by @hey-api/openapi-ts

-/**
- * AddDealToGroupRequest
- */
-export type AddDealToGroupRequest = {
-    /**
-     * Dealid
-     */
-    dealId: number;
-    /**
-     * Groupid
-     */
-    groupId: number;
-};
-
-/**
- * AddDealToGroupResponse
- */
-export type AddDealToGroupResponse = {
-    /**
-     * Message
-     */
-    message: string;
-};
-
 /**
 * BarcodeTemplateAttributeSchema
 */
@ -376,13 +352,13 @@ export type CreateClientSchema = {
 */
 export type CreateDealGroupRequest = {
    /**
-     * Draggingdealid
+     * Maindealid
     */
-    draggingDealId: number;
+    mainDealId: number;
    /**
-     * Hovereddealid
+     * Otherdealids
     */
-    hoveredDealId: number;
+    otherDealIds: Array<number>;
 };

 /**
@ -950,26 +926,6 @@ export type DealProductSchema = {
    productServices: Array<ProductServiceSchema>;
 };

-/**
- * DealRemoveFromGroupRequest
- */
-export type DealRemoveFromGroupRequest = {
-    /**
-     * Dealid
-     */
-    dealId: number;
-};
-
-/**
- * DealRemoveFromGroupResponse
- */
-export type DealRemoveFromGroupResponse = {
-    /**
-     * Message
-     */
-    message: string;
-};
-
 /**
 * DealSchema
 */
@ -1061,6 +1017,16 @@ export type DeleteClientResponse = {
    message: string;
 };

+/**
+ * DeleteDealGroupResponse
+ */
+export type DeleteDealGroupResponse = {
+    /**
+     * Message
+     */
+    message: string;
+};
+
 /**
 * DeleteDealProductResponse
 */
@ -1978,6 +1944,26 @@ export type UpdateDealServiceSchema = {
    isFixedPrice: boolean;
 };

+/**
+ * UpdateDealsInGroupRequest
+ */
+export type UpdateDealsInGroupRequest = {
+    /**
+     * Dealids
+     */
+    dealIds: Array<number>;
+};
+
+/**
+ * UpdateDealsInGroupResponse
+ */
+export type UpdateDealsInGroupResponse = {
+    /**
+     * Message
+     */
+    message: string;
+};
+
 /**
 * UpdateMarketplaceRequest
 */
@ -2585,6 +2571,38 @@ export type UpdateDealResponses = {
 export type UpdateDealResponse2 =
    UpdateDealResponses[keyof UpdateDealResponses];

+export type DeleteDealGroupData = {
+    body?: never;
+    path: {
+        /**
+         * Pk
+         */
+        pk: number;
+    };
+    query?: never;
+    url: "/deal-group/{pk}";
+};
+
+export type DeleteDealGroupErrors = {
+    /**
+     * Validation Error
+     */
+    422: HttpValidationError;
+};
+
+export type DeleteDealGroupError =
+    DeleteDealGroupErrors[keyof DeleteDealGroupErrors];
+
+export type DeleteDealGroupResponses = {
+    /**
+     * Successful Response
+     */
+    200: DeleteDealGroupResponse;
+};
+
+export type DeleteDealGroupResponse2 =
+    DeleteDealGroupResponses[keyof DeleteDealGroupResponses];
+
 export type UpdateDealGroupData = {
    body: UpdateDealGroupRequest;
    path: {
@ -2644,55 +2662,37 @@ export type CreateDealGroupResponses = {
 export type CreateDealGroupResponse2 =
    CreateDealGroupResponses[keyof CreateDealGroupResponses];

-export type RemoveDealData = {
-    body: DealRemoveFromGroupRequest;
-    path?: never;
+export type UpdateDealsInGroupData = {
+    body: UpdateDealsInGroupRequest;
+    path: {
+        /**
+         * Pk
+         */
+        pk: number;
+    };
    query?: never;
-    url: "/deal-group/deal";
+    url: "/deal-group/{pk}/deals";
 };

-export type RemoveDealErrors = {
+export type UpdateDealsInGroupErrors = {
    /**
     * Validation Error
     */
    422: HttpValidationError;
 };

-export type RemoveDealError = RemoveDealErrors[keyof RemoveDealErrors];
+export type UpdateDealsInGroupError =
+    UpdateDealsInGroupErrors[keyof UpdateDealsInGroupErrors];

-export type RemoveDealResponses = {
+export type UpdateDealsInGroupResponses = {
    /**
     * Successful Response
     */
-    200: DealRemoveFromGroupResponse;
+    200: UpdateDealsInGroupResponse;
 };

-export type RemoveDealResponse = RemoveDealResponses[keyof RemoveDealResponses];
-
-export type AddDealData = {
-    body: AddDealToGroupRequest;
-    path?: never;
-    query?: never;
-    url: "/deal-group/deal";
-};
-
-export type AddDealErrors = {
-    /**
-     * Validation Error
-     */
-    422: HttpValidationError;
-};
-
-export type AddDealError = AddDealErrors[keyof AddDealErrors];
-
-export type AddDealResponses = {
-    /**
-     * Successful Response
-     */
-    200: AddDealToGroupResponse;
-};
-
-export type AddDealResponse = AddDealResponses[keyof AddDealResponses];
+export type UpdateDealsInGroupResponse2 =
+    UpdateDealsInGroupResponses[keyof UpdateDealsInGroupResponses];

 export type GetBuiltInModulesData = {
    body?: never;
--- a/src/lib/client/zod.gen.ts
+++ b/src/lib/client/zod.gen.ts
@ -2,21 +2,6 @@

 import { z } from "zod";

-/**
- * AddDealToGroupRequest
- */
-export const zAddDealToGroupRequest = z.object({
-    dealId: z.int(),
-    groupId: z.int(),
-});
-
-/**
- * AddDealToGroupResponse
- */
-export const zAddDealToGroupResponse = z.object({
-    message: z.string(),
-});
-
 /**
 * BarcodeTemplateAttributeSchema
 */
@ -212,8 +197,8 @@ export const zCreateClientResponse = z.object({
 * CreateDealGroupRequest
 */
 export const zCreateDealGroupRequest = z.object({
-    draggingDealId: z.int(),
-    hoveredDealId: z.int(),
+    mainDealId: z.int(),
+    otherDealIds: z.array(z.int()),
 });

 /**
@ -694,20 +679,6 @@ export const zDealProductAddKitResponse = z.object({
    message: z.string(),
 });

-/**
- * DealRemoveFromGroupRequest
- */
-export const zDealRemoveFromGroupRequest = z.object({
-    dealId: z.int(),
-});
-
-/**
- * DealRemoveFromGroupResponse
- */
-export const zDealRemoveFromGroupResponse = z.object({
-    message: z.string(),
-});
-
 /**
 * DeleteBarcodeTemplateResponse
 */
@ -729,6 +700,13 @@ export const zDeleteClientResponse = z.object({
    message: z.string(),
 });

+/**
+ * DeleteDealGroupResponse
+ */
+export const zDeleteDealGroupResponse = z.object({
+    message: z.string(),
+});
+
 /**
 * DeleteDealProductResponse
 */
@ -1181,6 +1159,20 @@ export const zUpdateDealServiceResponse = z.object({
    message: z.string(),
 });

+/**
+ * UpdateDealsInGroupRequest
+ */
+export const zUpdateDealsInGroupRequest = z.object({
+    dealIds: z.array(z.int()),
+});
+
+/**
+ * UpdateDealsInGroupResponse
+ */
+export const zUpdateDealsInGroupResponse = z.object({
+    message: z.string(),
+});
+
 /**
 * UpdateMarketplaceSchema
 */
@ -1489,6 +1481,19 @@ export const zUpdateDealData = z.object({
 */
 export const zUpdateDealResponse2 = zUpdateDealResponse;

+export const zDeleteDealGroupData = z.object({
+    body: z.optional(z.never()),
+    path: z.object({
+        pk: z.int(),
+    }),
+    query: z.optional(z.never()),
+});
+
+/**
+ * Successful Response
+ */
+export const zDeleteDealGroupResponse2 = zDeleteDealGroupResponse;
+
 export const zUpdateDealGroupData = z.object({
    body: zUpdateDealGroupRequest,
    path: z.object({
@ -1513,27 +1518,18 @@ export const zCreateDealGroupData = z.object({
 */
 export const zCreateDealGroupResponse2 = zCreateDealGroupResponse;

-export const zRemoveDealData = z.object({
-    body: zDealRemoveFromGroupRequest,
-    path: z.optional(z.never()),
+export const zUpdateDealsInGroupData = z.object({
+    body: zUpdateDealsInGroupRequest,
+    path: z.object({
+        pk: z.int(),
+    }),
    query: z.optional(z.never()),
 });

 /**
 * Successful Response
 */
-export const zRemoveDealResponse = zDealRemoveFromGroupResponse;
-
-export const zAddDealData = z.object({
-    body: zAddDealToGroupRequest,
-    path: z.optional(z.never()),
-    query: z.optional(z.never()),
-});
-
-/**
- * Successful Response
- */
-export const zAddDealResponse = zAddDealToGroupResponse;
+export const zUpdateDealsInGroupResponse2 = zUpdateDealsInGroupResponse;

 export const zGetBuiltInModulesData = z.object({
    body: z.optional(z.never()),