From fd626347098b32d2694daf5ff3a10d7004e5c980 Mon Sep 17 00:00:00 2001
From: hamo-o <yheel369@gmail.com>
Date: Mon, 7 Apr 2025 10:29:58 +0900
Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=EC=9D=BC=EC=A0=95=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=B2=84=ED=8A=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../discussion/ui/DiscussionTitle/index.tsx   | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionTitle/index.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionTitle/index.tsx
index ebc2c9d8..7850a72c 100644
--- a/frontend/apps/client/src/features/discussion/ui/DiscussionTitle/index.tsx
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionTitle/index.tsx
@@ -1,5 +1,5 @@
 import { vars } from '@endolphin/theme';
-import { Flex, Text } from '@endolphin/ui';
+import { Button, Flex, Icon, Text } from '@endolphin/ui';
 import { useParams } from '@tanstack/react-router';
 
 import { useDiscussionQuery } from '../../api/queries';
@@ -11,22 +11,35 @@ const DiscussionTitle = () => {
   const { discussion, isLoading } = useDiscussionQuery(params.id);
   return (
     <Flex
-      align='flex-start'
       className={titleStyle}
-      direction='column'
-      gap={200}
-      width='100%'
+      justify='space-between'
+      width='full'
     >
-      {!isLoading && (
-        <>
-          <Text color={vars.color.Ref.Netural[900]} typo='h2'>
-            {discussion?.title}
-            {' '}
-            일정 조율 결과
-          </Text>
-          <DiscussionBadges discussion={discussion} />
-        </>
-      )}
+      <Flex
+        align='flex-start'
+        direction='column'
+        gap={200}
+        width='100%'
+      >
+        {!isLoading && (
+          <>
+            <Text color={vars.color.Ref.Netural[900]} typo='h2'>
+              {discussion?.title}
+              {' '}
+              일정 조율 결과
+            </Text>
+            <DiscussionBadges discussion={discussion} />
+          </>
+        )}
+      </Flex>
+      <Button
+        rightIcon={<Icon.Pencil />}
+        size='lg'
+        style='weak'
+        variant='secondary'
+      >
+        수정하기
+      </Button>
     </Flex>
   );
 };

From 38a3c97aae2956e3286d589e87c9e046ed231c9a Mon Sep 17 00:00:00 2001
From: hamo-o <yheel369@gmail.com>
Date: Sun, 13 Apr 2025 07:33:36 +0900
Subject: [PATCH 02/10] =?UTF-8?q?feat:=20=EB=85=BC=EC=9D=98=20=ED=98=B8?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=A7=8C=20=EC=88=98=EC=A0=95=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EB=85=B8=EC=B6=9C=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/DiscussionEditButton/index.tsx         | 25 +++++++++++++++++++
 .../discussion/ui/DiscussionTitle/index.tsx   | 12 +++------
 2 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 frontend/apps/client/src/features/discussion/ui/DiscussionEditButton/index.tsx

diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionEditButton/index.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionEditButton/index.tsx
new file mode 100644
index 00000000..e6b60fc8
--- /dev/null
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionEditButton/index.tsx
@@ -0,0 +1,25 @@
+import { useParams } from '@tanstack/react-router';
+
+import Button from '@/components/Button';
+import { Pencil } from '@/components/Icon';
+
+import { useDiscussionHostQuery } from '../../api/queries';
+
+const DiscussionEditButton = () => {
+  const param: { id: string } = useParams({ from: '/_main/discussion/$id' });
+  const { isHost, isPending } = useDiscussionHostQuery(param.id);
+  if (isPending || !isHost) return null;
+
+  return (
+    <Button
+      rightIcon={<Pencil />}
+      size='lg'
+      style='weak'
+      variant='secondary'
+    >
+      수정하기
+    </Button>
+  );
+};
+
+export default DiscussionEditButton;
\ No newline at end of file
diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionTitle/index.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionTitle/index.tsx
index 7850a72c..a9fbb2a7 100644
--- a/frontend/apps/client/src/features/discussion/ui/DiscussionTitle/index.tsx
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionTitle/index.tsx
@@ -1,8 +1,9 @@
 import { vars } from '@endolphin/theme';
-import { Button, Flex, Icon, Text } from '@endolphin/ui';
+import { Flex, Text } from '@endolphin/ui';
 import { useParams } from '@tanstack/react-router';
 
 import { useDiscussionQuery } from '../../api/queries';
+import DiscussionEditButton from '../DiscussionEditButton';
 import { DiscussionBadges } from './DiscussionBadges';
 import { titleStyle } from './index.css';
 
@@ -32,14 +33,7 @@ const DiscussionTitle = () => {
           </>
         )}
       </Flex>
-      <Button
-        rightIcon={<Icon.Pencil />}
-        size='lg'
-        style='weak'
-        variant='secondary'
-      >
-        수정하기
-      </Button>
+      <DiscussionEditButton />
     </Flex>
   );
 };

From 9468453f57139af5eabc91e0a57317da4e051a64 Mon Sep 17 00:00:00 2001
From: hamo-o <yheel369@gmail.com>
Date: Sun, 13 Apr 2025 07:39:43 +0900
Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=EC=9D=BC=EC=A0=95=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=A1=9C=20=EB=9D=BC?=
 =?UTF-8?q?=EC=9A=B0=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../discussion/ui/DiscussionEditButton/index.tsx         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionEditButton/index.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionEditButton/index.tsx
index e6b60fc8..1eae08eb 100644
--- a/frontend/apps/client/src/features/discussion/ui/DiscussionEditButton/index.tsx
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionEditButton/index.tsx
@@ -1,4 +1,4 @@
-import { useParams } from '@tanstack/react-router';
+import { Link, useParams } from '@tanstack/react-router';
 
 import Button from '@/components/Button';
 import { Pencil } from '@/components/Icon';
@@ -6,15 +6,18 @@ import { Pencil } from '@/components/Icon';
 import { useDiscussionHostQuery } from '../../api/queries';
 
 const DiscussionEditButton = () => {
-  const param: { id: string } = useParams({ from: '/_main/discussion/$id' });
-  const { isHost, isPending } = useDiscussionHostQuery(param.id);
+  const { id } = useParams({ from: '/_main/discussion/$id' });
+
+  const { isHost, isPending } = useDiscussionHostQuery(id);
   if (isPending || !isHost) return null;
 
   return (
     <Button
+      as={Link}
       rightIcon={<Pencil />}
       size='lg'
       style='weak'
+      to={`/discussion/edit/${id}`}
       variant='secondary'
     >
       수정하기

From ba12d808035f7b433eb9c2915bd9dfbe7d88d20d Mon Sep 17 00:00:00 2001
From: hamo-o <yheel369@gmail.com>
Date: Sun, 13 Apr 2025 07:44:51 +0900
Subject: [PATCH 04/10] =?UTF-8?q?fix:=20isLoading=20isPending=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=ED=99=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/apps/client/src/features/discussion/api/queries.ts   | 4 ++--
 .../src/features/discussion/ui/DiscussionTitle/index.tsx      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/apps/client/src/features/discussion/api/queries.ts b/frontend/apps/client/src/features/discussion/api/queries.ts
index 84a49ddc..885ffdd7 100644
--- a/frontend/apps/client/src/features/discussion/api/queries.ts
+++ b/frontend/apps/client/src/features/discussion/api/queries.ts
@@ -60,10 +60,10 @@ export const discussionHostQuery = (discussionId: string) => ({
 });
 
 export const useDiscussionQuery = (discussionId: string) => {
-  const { data: discussion, isLoading } 
+  const { data: discussion, isPending } 
     = useQuery<DiscussionResponse>(discussionQuery(discussionId));
 
-  return { discussion, isLoading };
+  return { discussion, isPending };
 };
 
 export const useDiscussionCalendarQuery = (
diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionTitle/index.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionTitle/index.tsx
index a9fbb2a7..fb1fd275 100644
--- a/frontend/apps/client/src/features/discussion/ui/DiscussionTitle/index.tsx
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionTitle/index.tsx
@@ -9,7 +9,7 @@ import { titleStyle } from './index.css';
 
 const DiscussionTitle = () => {
   const params: { id: string } = useParams({ from: '/_main/discussion/$id' });
-  const { discussion, isLoading } = useDiscussionQuery(params.id);
+  const { discussion, isPending } = useDiscussionQuery(params.id);
   return (
     <Flex
       className={titleStyle}
@@ -22,7 +22,7 @@ const DiscussionTitle = () => {
         gap={200}
         width='100%'
       >
-        {!isLoading && (
+        {!isPending && (
           <>
             <Text color={vars.color.Ref.Netural[900]} typo='h2'>
               {discussion?.title}

From 972e959ee936f142cc1b29a739dca2234d31838f Mon Sep 17 00:00:00 2001
From: hamo-o <yheel369@gmail.com>
Date: Sun, 13 Apr 2025 07:55:31 +0900
Subject: [PATCH 05/10] =?UTF-8?q?feat:=20mockdata=20=EB=8C=80=EC=8B=A0=20?=
 =?UTF-8?q?=EC=9D=BC=EC=A0=95=20=EC=A0=95=EB=B3=B4=20=EB=84=98=EA=B8=B0?=
 =?UTF-8?q?=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../discussion/ui/DiscussionForm/index.tsx    |  3 +-
 .../DiscussionEditPage/index.tsx              | 57 +++++++++++--------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/index.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/index.tsx
index 16c110dd..e5d7ffcc 100644
--- a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/index.tsx
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/index.tsx
@@ -15,7 +15,8 @@ import MeetingTitle from './MeetingTitle';
 import type { FormType } from './type';
 
 const DiscussionForm = (
-  { type, initialValues }: { type: FormType; initialValues?: DiscussionRequest },
+  { type, initialValues }: 
+  { type: FormType; initialValues?: DiscussionRequest },
 ) => {
   const SEVEN_DAYS = 7 * 24 * 60 * 60 * 1000;
   const today = new Date();
diff --git a/frontend/apps/client/src/pages/DiscussionPage/DiscussionEditPage/index.tsx b/frontend/apps/client/src/pages/DiscussionPage/DiscussionEditPage/index.tsx
index 52689678..1334bf05 100644
--- a/frontend/apps/client/src/pages/DiscussionPage/DiscussionEditPage/index.tsx
+++ b/frontend/apps/client/src/pages/DiscussionPage/DiscussionEditPage/index.tsx
@@ -1,33 +1,42 @@
 import { Flex } from '@endolphin/ui';
+import { useParams } from '@tanstack/react-router';
 
+import { useDiscussionQuery } from '@/features/discussion/api/queries';
 import DiscussionCreateTitle from '@/features/discussion/ui/DiscussionCreateTitle';
 import DiscussionForm from '@/features/discussion/ui/DiscussionForm';
 
 import { discussionContainerStyle } from '../index.css';
 
-const DiscussionEditPage = () => (
-  <Flex
-    align='center'
-    className={discussionContainerStyle}
-    direction='column'
-    gap={800}
-    justify='flex-start'
-  >
-    <DiscussionCreateTitle title='일정 조율 수정' />
-    <DiscussionForm 
-      initialValues={{
-        title: '기업디(3) 첫 팀플',
-        dateRangeStart: '2021-10-10',
-        dateRangeEnd: '2021-10-10',
-        timeRangeStart: '09:00',
-        timeRangeEnd: '12:00',
-        duration: 60,
-        meetingMethod: 'OFFLINE',
-        deadline: '2021-10-10',
-      }}
-      type='edit'
-    />
-  </Flex>
-);
+const DiscussionEditPage = () => {
+  const { id } = useParams({ from: '/_main/discussion/edit/$id' });
+  const { discussion, isPending } = useDiscussionQuery(id);
+
+  if (isPending || !discussion) return null;
+
+  return (
+    <Flex
+      align='center'
+      className={discussionContainerStyle}
+      direction='column'
+      gap={800}
+      justify='flex-start'
+    >
+      <DiscussionCreateTitle title='일정 조율 수정' />
+      <DiscussionForm 
+        initialValues={{
+          title: discussion.title,
+          dateRangeStart: discussion.dateRangeStart,
+          dateRangeEnd: discussion.dateRangeEnd,
+          timeRangeStart: discussion.timeRangeStart,
+          timeRangeEnd: discussion.timeRangeEnd,
+          duration: discussion.duration,
+          meetingMethod: discussion.meetingMethod,
+          deadline: discussion.deadline,
+        }}
+        type='edit'
+      />
+    </Flex>
+  );
+};
 
 export default DiscussionEditPage;
\ No newline at end of file

From 744c0a3b35d470f044afa34584533ddc1e6367cc Mon Sep 17 00:00:00 2001
From: hamo-o <yheel369@gmail.com>
Date: Sun, 13 Apr 2025 08:26:33 +0900
Subject: [PATCH 06/10] =?UTF-8?q?feat:=20=EB=85=BC=EC=9D=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20API=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/features/discussion/api/index.ts      |  7 +++
 .../src/features/discussion/api/mutations.ts  | 52 +++++++++++++----
 .../ui/DiscussionForm/EnrollButton.tsx        | 58 +++++++++++++++++++
 .../ui/DiscussionForm/FormButton.tsx          | 54 +----------------
 4 files changed, 107 insertions(+), 64 deletions(-)
 create mode 100644 frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx

diff --git a/frontend/apps/client/src/features/discussion/api/index.ts b/frontend/apps/client/src/features/discussion/api/index.ts
index 5039f164..92c9327b 100644
--- a/frontend/apps/client/src/features/discussion/api/index.ts
+++ b/frontend/apps/client/src/features/discussion/api/index.ts
@@ -24,6 +24,13 @@ export const discussionApi = {
     return response;
   },
 
+  putDiscussion: async (
+    discussionId: string, body: DiscussionRequest,
+  ): Promise<DiscussionResponse> => {
+    const response = await request.put(`/api/v1/discussion/${discussionId}`, { body });
+    return response;
+  },
+
   getIsHost: async (id: string): Promise<boolean> => {
     const response = await request.get(`/api/v1/discussion/${id}/role`);
     return response;
diff --git a/frontend/apps/client/src/features/discussion/api/mutations.ts b/frontend/apps/client/src/features/discussion/api/mutations.ts
index d8afe6c2..56a0495b 100644
--- a/frontend/apps/client/src/features/discussion/api/mutations.ts
+++ b/frontend/apps/client/src/features/discussion/api/mutations.ts
@@ -1,29 +1,59 @@
+import type { UseMutateFunction } from '@tanstack/react-query';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { useNavigate } from '@tanstack/react-router';
+import { useNavigate, useParams } from '@tanstack/react-router';
 
-import { sharedScheduleKey } from '@/features/shared-schedule/api/keys';
+import { 
+  ongoingQueryKey, 
+  sharedScheduleKey, 
+  upcomingQueryKey, 
+} from '@/features/shared-schedule/api/keys';
 
 import type { DiscussionConfirmRequest, DiscussionRequest } from '../model';
 import { candidateApi, discussionApi } from '.';
 import { invitationApi } from './invitationApi';
 import { discussionKeys } from './keys';
 
+type MutationParams = {
+  body: DiscussionRequest;
+  callback: (id: string) => void;
+};
+
+export type DiscussionMutateFn = UseMutateFunction<
+  { id: number },
+  Error,
+  MutationParams
+>;
+
 export const useDiscussionMutation = () => {
   const queryClient = useQueryClient();
-  
+
   const { mutate } = useMutation({
-    mutationFn: ({ body }: { 
-      body: DiscussionRequest;
-      callback: (id: string) => void;
-    }) => discussionApi.postDiscussion(body),
+    mutationFn: ({ body }: MutationParams) => discussionApi.postDiscussion(body),
     onSuccess: ({ id }, { callback }) => {
+      queryClient.invalidateQueries({ queryKey: upcomingQueryKey });
+      queryClient.invalidateQueries({ queryKey: ongoingQueryKey.all });
+      queryClient.invalidateQueries({ queryKey: discussionKeys.all });
       callback?.(id.toString());
-      queryClient.invalidateQueries({
-        queryKey: discussionKeys.all,
-      });
     },
   });
-  
+
+  return { mutate };
+};
+
+export const useDiscussionEditMutation = () => {
+  const { id } = useParams({ from: '/_main/discussion/edit/$id' });
+  const queryClient = useQueryClient();
+
+  const { mutate } = useMutation({
+    mutationFn: ({ body }: MutationParams) => discussionApi.putDiscussion(id, body),
+    onSuccess: (_, { callback }) => {
+      queryClient.invalidateQueries({ queryKey: upcomingQueryKey });
+      queryClient.invalidateQueries({ queryKey: ongoingQueryKey.all });
+      queryClient.invalidateQueries({ queryKey: discussionKeys.detail(id) });
+      callback?.(id.toString());
+    },
+  });
+
   return { mutate };
 };
 
diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx
new file mode 100644
index 00000000..2a0542b2
--- /dev/null
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx
@@ -0,0 +1,58 @@
+import { clsx } from '@endolphin/core/utils';
+import { Button } from '@endolphin/ui';
+import { useNavigate } from '@tanstack/react-router';
+
+import type { DiscussionMutateFn } from '../../api/mutations';
+import { useDiscussionEditMutation, useDiscussionMutation } from '../../api/mutations';
+import { useFormContext } from './FormContext';
+import { buttonStyle } from './index.css';
+import type { FormType } from './type';
+
+interface EnrollType {
+  text: string;
+  mutate: DiscussionMutateFn;
+  navigate: string;
+}
+
+const EnrollButton = ({ type }: { type: FormType }) => {
+  const { name, formState, isValidForm } = useFormContext();
+  const navigate = useNavigate();
+  const { mutate: postMutation } = useDiscussionMutation();
+  const { mutate: editMutation } = useDiscussionEditMutation();
+      
+  const typeMap: Record<FormType, EnrollType> = {
+    add: {
+      text: '생성하기',
+      mutate: postMutation,
+      navigate: '/discussion/create/$id',
+    },
+    edit: {
+      text: '수정하기',
+      mutate: editMutation,
+      navigate: '/discussion/$id',
+    },
+  };
+      
+  const handleClickEnrollButton = () => {
+    const callback = (id: string) => {
+      navigate({
+        to: typeMap[type].navigate,
+        params: { id },
+      });
+    };
+    typeMap[type].mutate({ body: formState, callback });
+  };
+      
+  return (
+    <Button
+      className={clsx(name, buttonStyle)}
+      disabled={!isValidForm()}
+      onClick={handleClickEnrollButton}
+      size='xl'
+    >
+      {typeMap[type].text}
+    </Button>
+  );
+};
+
+export default EnrollButton;
\ No newline at end of file
diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/FormButton.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/FormButton.tsx
index 955f3046..524ad12c 100644
--- a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/FormButton.tsx
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/FormButton.tsx
@@ -1,13 +1,6 @@
-import { clsx } from '@endolphin/core/utils';
 import { Button, Flex } from '@endolphin/ui';
-import { type QueryClient, useQueryClient } from '@tanstack/react-query';
-import { useNavigate } from '@tanstack/react-router';
 
-import { ongoingQueryKey, upcomingQueryKey } from '@/features/shared-schedule/api/keys';
-
-import { useDiscussionMutation } from '../../api/mutations';
-import { useFormContext } from './FormContext';
-import { buttonStyle } from './index.css';
+import EnrollButton from './EnrollButton';
 import type { FormType } from './type';
 
 const FormButton = ({ type }: { type: FormType }) => {
@@ -35,49 +28,4 @@ const FormButton = ({ type }: { type: FormType }) => {
   );
 };
 
-const EnrollButton = ({ type }: { type: FormType }) => {
-  const queryClient = useQueryClient();
-  const { name, formState, isValidForm } = useFormContext();
-  const navigate = useNavigate();
-  const { mutate } = useDiscussionMutation();
-
-  const typeMap: Record<FormType, Record<string, string>> = {
-    add: {
-      text: '생성하기',
-      navigate: '/discussion/create/$id',
-    },
-    edit: {
-      text: '수정하기',
-      navigate: '/discussion/$id',
-    },
-  };
-
-  const handleClickEnrollButton = () => {
-    const callback = (id: string) => {
-      invalidateScheduleCaches(queryClient);
-      navigate({
-        to: typeMap[type].navigate,
-        params: { id },
-      });
-    };
-    mutate({ body: formState, callback });
-  };
-
-  return (
-    <Button
-      className={clsx(name, buttonStyle)}
-      disabled={!isValidForm()}
-      onClick={handleClickEnrollButton}
-      size='xl'
-    >
-      {typeMap[type].text}
-    </Button>
-  );
-};
-
-const invalidateScheduleCaches = (queryClient: QueryClient) => {
-  queryClient.invalidateQueries({ queryKey: upcomingQueryKey });
-  queryClient.invalidateQueries({ queryKey: ongoingQueryKey.all });
-};
-
 export default FormButton;

From 291d90d592fc9fe87b04563d61ecb5e4d3a8e249 Mon Sep 17 00:00:00 2001
From: hamo-o <yheel369@gmail.com>
Date: Mon, 12 May 2025 09:33:18 +0900
Subject: [PATCH 07/10] =?UTF-8?q?fix:=20=EC=83=9D=EC=84=B1=EA=B3=BC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B2=84=ED=8A=BC=20=EB=B6=84=EB=A6=AC?=
 =?UTF-8?q?=ED=95=B4=EC=84=9C=20=EB=9D=BC=EC=9A=B0=ED=8C=85=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=20=EB=B0=A9=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/features/discussion/api/mutations.ts  | 32 +++++-----
 .../ui/DiscussionForm/EnrollButton.tsx        | 60 ++++++++-----------
 .../ui/DiscussionForm/FormButton.tsx          | 40 +++++++------
 3 files changed, 59 insertions(+), 73 deletions(-)

diff --git a/frontend/apps/client/src/features/discussion/api/mutations.ts b/frontend/apps/client/src/features/discussion/api/mutations.ts
index 56a0495b..328c626c 100644
--- a/frontend/apps/client/src/features/discussion/api/mutations.ts
+++ b/frontend/apps/client/src/features/discussion/api/mutations.ts
@@ -1,4 +1,3 @@
-import type { UseMutateFunction } from '@tanstack/react-query';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useNavigate, useParams } from '@tanstack/react-router';
 
@@ -13,27 +12,20 @@ import { candidateApi, discussionApi } from '.';
 import { invitationApi } from './invitationApi';
 import { discussionKeys } from './keys';
 
-type MutationParams = {
-  body: DiscussionRequest;
-  callback: (id: string) => void;
-};
-
-export type DiscussionMutateFn = UseMutateFunction<
-  { id: number },
-  Error,
-  MutationParams
->;
-
 export const useDiscussionMutation = () => {
   const queryClient = useQueryClient();
+  const navigate = useNavigate();
 
   const { mutate } = useMutation({
-    mutationFn: ({ body }: MutationParams) => discussionApi.postDiscussion(body),
-    onSuccess: ({ id }, { callback }) => {
+    mutationFn: (body: DiscussionRequest) => discussionApi.postDiscussion(body),
+    onSuccess: ({ id }) => {
       queryClient.invalidateQueries({ queryKey: upcomingQueryKey });
       queryClient.invalidateQueries({ queryKey: ongoingQueryKey.all });
       queryClient.invalidateQueries({ queryKey: discussionKeys.all });
-      callback?.(id.toString());
+      navigate({
+        to: '/discussion/$id',
+        params: { id: String(id) },
+      });
     },
   });
 
@@ -43,14 +35,18 @@ export const useDiscussionMutation = () => {
 export const useDiscussionEditMutation = () => {
   const { id } = useParams({ from: '/_main/discussion/edit/$id' });
   const queryClient = useQueryClient();
+  const navigate = useNavigate();
 
   const { mutate } = useMutation({
-    mutationFn: ({ body }: MutationParams) => discussionApi.putDiscussion(id, body),
-    onSuccess: (_, { callback }) => {
+    mutationFn: (body: DiscussionRequest) => discussionApi.putDiscussion(id, body),
+    onSuccess: (_) => {
       queryClient.invalidateQueries({ queryKey: upcomingQueryKey });
       queryClient.invalidateQueries({ queryKey: ongoingQueryKey.all });
       queryClient.invalidateQueries({ queryKey: discussionKeys.detail(id) });
-      callback?.(id.toString());
+      navigate({
+        to: '/discussion/$id',
+        params: { id },
+      });
     },
   });
 
diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx
index 2a0542b2..4da1b4ac 100644
--- a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx
@@ -1,46 +1,16 @@
 import { clsx } from '@endolphin/core/utils';
 import { Button } from '@endolphin/ui';
-import { useNavigate } from '@tanstack/react-router';
 
-import type { DiscussionMutateFn } from '../../api/mutations';
 import { useDiscussionEditMutation, useDiscussionMutation } from '../../api/mutations';
 import { useFormContext } from './FormContext';
 import { buttonStyle } from './index.css';
-import type { FormType } from './type';
 
-interface EnrollType {
-  text: string;
-  mutate: DiscussionMutateFn;
-  navigate: string;
-}
-
-const EnrollButton = ({ type }: { type: FormType }) => {
+export const AddButton = () => {
   const { name, formState, isValidForm } = useFormContext();
-  const navigate = useNavigate();
-  const { mutate: postMutation } = useDiscussionMutation();
-  const { mutate: editMutation } = useDiscussionEditMutation();
-      
-  const typeMap: Record<FormType, EnrollType> = {
-    add: {
-      text: '생성하기',
-      mutate: postMutation,
-      navigate: '/discussion/create/$id',
-    },
-    edit: {
-      text: '수정하기',
-      mutate: editMutation,
-      navigate: '/discussion/$id',
-    },
-  };
-      
+  const { mutate } = useDiscussionMutation();
+
   const handleClickEnrollButton = () => {
-    const callback = (id: string) => {
-      navigate({
-        to: typeMap[type].navigate,
-        params: { id },
-      });
-    };
-    typeMap[type].mutate({ body: formState, callback });
+    mutate(formState);
   };
       
   return (
@@ -50,9 +20,27 @@ const EnrollButton = ({ type }: { type: FormType }) => {
       onClick={handleClickEnrollButton}
       size='xl'
     >
-      {typeMap[type].text}
+      생성하기
     </Button>
   );
 };
 
-export default EnrollButton;
\ No newline at end of file
+export const EditButton = () => {
+  const { name, formState, isValidForm } = useFormContext();
+  const { mutate } = useDiscussionEditMutation();
+      
+  const handleClickEnrollButton = () => {
+    mutate(formState);
+  };
+      
+  return (
+    <Button
+      className={clsx(name, buttonStyle)}
+      disabled={!isValidForm()}
+      onClick={handleClickEnrollButton}
+      size='xl'
+    >
+      수정하기
+    </Button>
+  );
+};
\ No newline at end of file
diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/FormButton.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/FormButton.tsx
index 524ad12c..e75e22d2 100644
--- a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/FormButton.tsx
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/FormButton.tsx
@@ -1,31 +1,33 @@
 import { Button, Flex } from '@endolphin/ui';
 
-import EnrollButton from './EnrollButton';
+import { AddButton, EditButton } from './EnrollButton';
 import type { FormType } from './type';
 
 const FormButton = ({ type }: { type: FormType }) => {
   const handleClickDeleteDiscussion = () => {
     /* Do something */
   };
-  return type === 'add' ? (
-    <EnrollButton type={type} />
-  ) : (
-    <Flex
-      gap={100}
-      justify='flex-end'
-      width='100%'
-    >
-      <Button
-        onClick={handleClickDeleteDiscussion}
-        size='xl'
-        style='outline'
-        variant='re'
+  return (
+    type === 'add' ? (
+      <AddButton />
+    ) : (
+      <Flex
+        gap={300}
+        justify='flex-end'
+        width='100%'
       >
-        삭제하기
-      </Button>
-      <EnrollButton type={type} />
-    </Flex>
+        <Button
+          onClick={handleClickDeleteDiscussion}
+          size='xl'
+          style='outline'
+          variant='re'
+        >
+          삭제하기
+        </Button>
+        <EditButton />
+      </Flex>
+    )
   );
 };
 
-export default FormButton;
+export default FormButton;
\ No newline at end of file

From f56ebc0c1e74c2535fe9ea1a7b15069c50c64401 Mon Sep 17 00:00:00 2001
From: hamo-o <yheel369@gmail.com>
Date: Mon, 12 May 2025 10:02:40 +0900
Subject: [PATCH 08/10] =?UTF-8?q?feat:=20=EB=85=BC=EC=9D=98=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/features/discussion/api/index.ts      |  5 +++
 .../src/features/discussion/api/mutations.ts  | 17 +++++++
 .../ui/DiscussionForm/EnrollButton.tsx        | 25 ++++++++++-
 .../ui/DiscussionForm/FormButton.tsx          | 44 +++++++------------
 4 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/frontend/apps/client/src/features/discussion/api/index.ts b/frontend/apps/client/src/features/discussion/api/index.ts
index 92c9327b..2d7acf08 100644
--- a/frontend/apps/client/src/features/discussion/api/index.ts
+++ b/frontend/apps/client/src/features/discussion/api/index.ts
@@ -31,6 +31,11 @@ export const discussionApi = {
     return response;
   },
 
+  deleteDiscussion: async (discussionId: string): Promise<void> => {
+    const response = await request.delete(`/api/v1/discussion/${discussionId}`);
+    return response;
+  },
+
   getIsHost: async (id: string): Promise<boolean> => {
     const response = await request.get(`/api/v1/discussion/${id}/role`);
     return response;
diff --git a/frontend/apps/client/src/features/discussion/api/mutations.ts b/frontend/apps/client/src/features/discussion/api/mutations.ts
index 328c626c..95065115 100644
--- a/frontend/apps/client/src/features/discussion/api/mutations.ts
+++ b/frontend/apps/client/src/features/discussion/api/mutations.ts
@@ -53,6 +53,23 @@ export const useDiscussionEditMutation = () => {
   return { mutate };
 };
 
+export const useDiscussionDeleteMutation = () => {
+  const { id } = useParams({ from: '/_main/discussion/edit/$id' });
+  const queryClient = useQueryClient();
+  const navigate = useNavigate();
+
+  const { mutate } = useMutation({
+    mutationFn: () => discussionApi.deleteDiscussion(id),
+    onSuccess: (_) => {
+      queryClient.invalidateQueries({ queryKey: upcomingQueryKey });
+      queryClient.invalidateQueries({ queryKey: ongoingQueryKey.all });
+      navigate({ to: '/home' });
+    },
+  });
+
+  return { mutate };
+};
+
 export const useInvitationJoinMutation = () => {
   const { mutate } = useMutation({
     mutationFn: ({ body }: {
diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx
index 4da1b4ac..5cedfe3c 100644
--- a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx
@@ -1,7 +1,11 @@
 import { clsx } from '@endolphin/core/utils';
 import { Button } from '@endolphin/ui';
 
-import { useDiscussionEditMutation, useDiscussionMutation } from '../../api/mutations';
+import { 
+  useDiscussionDeleteMutation, 
+  useDiscussionEditMutation, 
+  useDiscussionMutation,
+} from '../../api/mutations';
 import { useFormContext } from './FormContext';
 import { buttonStyle } from './index.css';
 
@@ -43,4 +47,23 @@ export const EditButton = () => {
       수정하기
     </Button>
   );
+};
+
+export const DeleteButton = () => {
+  const { mutate } = useDiscussionDeleteMutation();
+
+  const handleClickDeleteDiscussion = () => {
+    mutate();
+  };
+
+  return (
+    <Button
+      onClick={handleClickDeleteDiscussion}
+      size='xl'
+      style='outline'
+      variant='re'
+    >
+      삭제하기
+    </Button>
+  );
 };
\ No newline at end of file
diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/FormButton.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/FormButton.tsx
index e75e22d2..738e6787 100644
--- a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/FormButton.tsx
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/FormButton.tsx
@@ -1,33 +1,21 @@
-import { Button, Flex } from '@endolphin/ui';
+import { Flex } from '@endolphin/ui';
 
-import { AddButton, EditButton } from './EnrollButton';
+import { AddButton, DeleteButton, EditButton } from './EnrollButton';
 import type { FormType } from './type';
 
-const FormButton = ({ type }: { type: FormType }) => {
-  const handleClickDeleteDiscussion = () => {
-    /* Do something */
-  };
-  return (
-    type === 'add' ? (
-      <AddButton />
-    ) : (
-      <Flex
-        gap={300}
-        justify='flex-end'
-        width='100%'
-      >
-        <Button
-          onClick={handleClickDeleteDiscussion}
-          size='xl'
-          style='outline'
-          variant='re'
-        >
-          삭제하기
-        </Button>
-        <EditButton />
-      </Flex>
-    )
-  );
-};
+const FormButton = ({ type }: { type: FormType }) => (
+  type === 'add' ? (
+    <AddButton />
+  ) : (
+    <Flex
+      gap={300}
+      justify='flex-end'
+      width='100%'
+    >
+      <DeleteButton />
+      <EditButton />
+    </Flex>
+  )
+);
 
 export default FormButton;
\ No newline at end of file

From 3dc39ba8873aa9125dd1bf5435807eba317dadce Mon Sep 17 00:00:00 2001
From: hamo-o <yheel369@gmail.com>
Date: Mon, 12 May 2025 10:14:50 +0900
Subject: [PATCH 09/10] =?UTF-8?q?feat:=20=EC=82=AD=EC=A0=9C=20=EA=B2=BD?=
 =?UTF-8?q?=EA=B3=A0=20=EB=AA=A8=EB=8B=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/features/discussion/api/mutations.ts  |  3 +-
 .../ui/DiscussionForm/EnrollButton.tsx        | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/frontend/apps/client/src/features/discussion/api/mutations.ts b/frontend/apps/client/src/features/discussion/api/mutations.ts
index 95065115..876c9119 100644
--- a/frontend/apps/client/src/features/discussion/api/mutations.ts
+++ b/frontend/apps/client/src/features/discussion/api/mutations.ts
@@ -53,7 +53,7 @@ export const useDiscussionEditMutation = () => {
   return { mutate };
 };
 
-export const useDiscussionDeleteMutation = () => {
+export const useDiscussionDeleteMutation = (callback: () => void) => {
   const { id } = useParams({ from: '/_main/discussion/edit/$id' });
   const queryClient = useQueryClient();
   const navigate = useNavigate();
@@ -63,6 +63,7 @@ export const useDiscussionDeleteMutation = () => {
     onSuccess: (_) => {
       queryClient.invalidateQueries({ queryKey: upcomingQueryKey });
       queryClient.invalidateQueries({ queryKey: ongoingQueryKey.all });
+      callback();
       navigate({ to: '/home' });
     },
   });
diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx
index 5cedfe3c..5c2e14a0 100644
--- a/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionForm/EnrollButton.tsx
@@ -1,5 +1,7 @@
 import { clsx } from '@endolphin/core/utils';
-import { Button } from '@endolphin/ui';
+import { Button, Flex } from '@endolphin/ui';
+
+import { useGlobalModal } from '@/store/global/modal';
 
 import { 
   useDiscussionDeleteMutation, 
@@ -50,10 +52,31 @@ export const EditButton = () => {
 };
 
 export const DeleteButton = () => {
-  const { mutate } = useDiscussionDeleteMutation();
+  const { createModal, onModalClose } = useGlobalModal();
+  const { mutate } = useDiscussionDeleteMutation(onModalClose);
 
   const handleClickDeleteDiscussion = () => {
-    mutate();
+    createModal({
+      subTitle: '경고',
+      type: 'error',
+      title: '정말 삭제할까요?',
+      description: '삭제하면 다시 되돌릴 수 없어요.',
+      children: (
+        <Flex
+          align='flex-end'
+          height='100%'
+          justify='flex-end'
+        >
+          <Button
+            onClick={() => mutate()}
+            size='xl'
+            variant='re'
+          >
+            삭제하기
+          </Button>
+        </Flex>
+      ),
+    });
   };
 
   return (

From 7ca4ea889634f3ed6248a5eeacbc97fa88b1cf10 Mon Sep 17 00:00:00 2001
From: hamo-o <yheel369@gmail.com>
Date: Sun, 27 Jul 2025 19:09:49 +0900
Subject: [PATCH 10/10] =?UTF-8?q?fix:=20=EC=9E=98=EB=AA=BB=EB=90=9C=20impo?=
 =?UTF-8?q?rt=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../features/discussion/ui/DiscussionEditButton/index.tsx   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/apps/client/src/features/discussion/ui/DiscussionEditButton/index.tsx b/frontend/apps/client/src/features/discussion/ui/DiscussionEditButton/index.tsx
index 1eae08eb..10b81141 100644
--- a/frontend/apps/client/src/features/discussion/ui/DiscussionEditButton/index.tsx
+++ b/frontend/apps/client/src/features/discussion/ui/DiscussionEditButton/index.tsx
@@ -1,8 +1,6 @@
+import { Button, Icon } from '@endolphin/ui';
 import { Link, useParams } from '@tanstack/react-router';
 
-import Button from '@/components/Button';
-import { Pencil } from '@/components/Icon';
-
 import { useDiscussionHostQuery } from '../../api/queries';
 
 const DiscussionEditButton = () => {
@@ -14,7 +12,7 @@ const DiscussionEditButton = () => {
   return (
     <Button
       as={Link}
-      rightIcon={<Pencil />}
+      rightIcon={<Icon.Pencil />}
       size='lg'
       style='weak'
       to={`/discussion/edit/${id}`}