Merge pull request #246 from code-zero-to-one/fix/jira-issue

[Fix] 지라 이슈 해결

Author: yeun38

.vscode/launch.json

@@ -0,0 +1,34 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Next.js: debug server-side",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "npm run dev -- --inspect"
+    },
+  {
+  "name": "Next.js: attach client (safe login)",
+  "type": "pwa-chrome",
+  "request": "attach",
+  "port": 9222,
+  "url": "http://localhost:3000",
+  "webRoot": "${workspaceFolder}"
+},
+    {
+      "name": "Next.js: debug full stack",
+      "type": "node",
+      "request": "launch",
+      "program": "${workspaceFolder}/node_modules/next/dist/bin/next",
+      "runtimeArgs": ["--inspect"],
+      "skipFiles": ["<node_internals>/**"],
+      "serverReadyAction": {
+        "action": "debugWithEdge",
+        "killOnServerStop": true,
+        "pattern": "- Local:.+(https?://.+)",
+        "uriFormat": "%s",
+        "webRoot": "${workspaceFolder}"
+      }
+    }
+  ]
+}

app/(service)/(my)/my-study/completed/page.tsx

@@ -1,11 +1,11 @@
 'use client';
 
 import { Plus } from 'lucide-react';
-import React, { useState } from 'react';
+import { useState } from 'react';
 import { MemberStudyItem } from '@/features/study/group/api/group-study-types';
 import { useMemberStudyListQuery } from '@/features/study/group/model/use-member-study-list-query';
 import CompletedGroupStudyList from '@/features/study/group/ui/completed-group-study-list';
-import OpenGroupStudyModal from '@/features/study/group/ui/open-group-modal';
+import GroupStudyFormModal from '@/features/study/group/ui/group-study-form-modal';
 import Button from '@/shared/ui/button';
 import Pagination from '@/shared/ui/pagination';
 
@@ -35,7 +35,8 @@ export default function CompletedPage() {
     <div className="flex flex-col gap-300">
       <div className="flex flex-row items-center justify-between">
         <h1 className="font-designer-20b">마이스터디</h1>
-        <OpenGroupStudyModal
+        <GroupStudyFormModal
+          mode="create"
           trigger={
             <Button icon={<Plus className="text-text-inverse" />} size="medium">
               스터디 개설하기

app/(service)/(my)/my-study/not-completed/page.tsx

@@ -4,8 +4,9 @@ import { Plus } from 'lucide-react';
 import React, { useState } from 'react';
 import { MemberStudyItem } from '@/features/study/group/api/group-study-types';
 import { useMemberStudyListQuery } from '@/features/study/group/model/use-member-study-list-query';
+import OpenGroupStudyModal from '@/features/study/group/ui/group-study-form-modal';
+import GroupStudyFormModal from '@/features/study/group/ui/group-study-form-modal';
 import NotCompletedGroupStudyList from '@/features/study/group/ui/not-completed-group-study-list';
-import OpenGroupStudyModal from '@/features/study/group/ui/open-group-modal';
 import Button from '@/shared/ui/button';
 import Pagination from '@/shared/ui/pagination';
 
@@ -35,7 +36,8 @@ export default function NotCompletedPage() {
     <div className="flex flex-col gap-300">
       <div className="flex flex-row items-center justify-between">
         <h1 className="font-designer-20b">마이스터디</h1>
-        <OpenGroupStudyModal
+        <GroupStudyFormModal
+          mode="create"
           trigger={
             <Button icon={<Plus className="text-text-inverse" />} size="medium">
               스터디 개설하기

app/(service)/(my)/my-study/page.tsx

@@ -2,12 +2,11 @@
 
 import { Plus } from 'lucide-react';
 import Link from 'next/link';
-import React from 'react';
 import { MemberStudyItem } from '@/features/study/group/api/group-study-types';
 import { useMemberStudyListQuery } from '@/features/study/group/model/use-member-study-list-query';
 import CompletedGroupStudyList from '@/features/study/group/ui/completed-group-study-list';
+import GroupStudyFormModal from '@/features/study/group/ui/group-study-form-modal';
 import NotCompletedGroupStudyList from '@/features/study/group/ui/not-completed-group-study-list';
-import OpenGroupStudyModal from '@/features/study/group/ui/open-group-modal';
 import { getCookie } from '@/shared/tanstack-query/cookie';
 import Button from '@/shared/ui/button';
 
@@ -40,7 +39,8 @@ export default function MyStudy() {
     <div className="flex flex-col gap-300">
       <div className="flex flex-row items-center justify-between">
         <h1 className="font-designer-20b">마이스터디</h1>
-        <OpenGroupStudyModal
+        <GroupStudyFormModal
+          mode="create"
           trigger={
             <Button icon={<Plus className="text-text-inverse" />} size="medium">
               스터디 개설하기

app/(service)/(nav)/study/[id]/page.tsx

@@ -48,8 +48,8 @@ export default async function Page({
       <StudyDetailPage
         memberId={memberId}
         groupStudyId={Number(id)}
-        studyDetail={data}
-        leader={data.basicInfo.leader}
+        // studyDetail={data}
+        // leader={data.basicInfo.leader}
       />
     </HydrationBoundary>
   );

app/(service)/(nav)/study/page.tsx

@@ -1,5 +1,6 @@
+import GroupStudyFormModal from '@/features/study/group/ui/group-study-form-modal';
+
 import GroupStudyList from '@/features/study/group/ui/group-study-list';
-import OpenGroupStudyModal from '@/features/study/group/ui/open-group-modal';
 import IconPlus from '@/shared/icons/plus.svg';
 import { getServerCookie } from '@/shared/lib/server-cookie';
 import Button from '@/shared/ui/button';
@@ -16,7 +17,8 @@ export default async function Study() {
           <span className="font-designer-28b text-[#181D27]">
             스터디 둘러보기
           </span>
-          <OpenGroupStudyModal
+          <GroupStudyFormModal
+            mode="create"
             trigger={
               <Button
                 color="primary"

src/features/study/group/api/creat-group-study.ts

@@ -1,9 +1,14 @@
 import { axiosInstance } from '@/shared/tanstack-query/axios';
-import { OpenGroupStudyRequest } from './group-study-types';
+import { GroupStudyFormRequest } from './group-study-types';
 
 // CS 스터디 매칭 신청
-export const createGroupStudy = async (payload: OpenGroupStudyRequest) => {
-  const res = await axiosInstance.post('/group-studies', payload);
+export const createGroupStudy = async (payload: GroupStudyFormRequest) => {
+  try {
+    const res = await axiosInstance.post('/group-studies', payload);
 
-  return res.data;
+    return res.data;
+  } catch (error) {
+    console.error('그룹 스터디 생성 실패:', error);
+    throw error;
+  }
 };

src/features/study/group/api/group-study-types.ts

@@ -132,8 +132,9 @@ export interface Timestamps {
 }
 
 /** 상세 화면용 DetailInfo (기존 DetailInfo 확장) */
-export interface DetailInfoDetail extends DetailInfo, Timestamps {
+export interface DetailInfoDetail extends SimpleDetailInfo, Timestamps {
   /** 서버가 내려주는 원본/대표 이미지 경로 (없을 수 있음) */
+  description: string;
   image: {
     imageId: number;
     resizedImages: ResizedImage[];
@@ -156,7 +157,7 @@ export interface ApplyGroupStudyResponse {
   createdAt: string;
 }
 
-export interface OpenGroupStudyRequest {
+export interface GroupStudyFormRequest {
   basicInfo: BasicInfo;
   detailInfo: DetailInfo;
   interviewPost: {

src/features/study/group/api/update-group-study.ts

@@ -0,0 +1,20 @@
+import { axiosInstance } from '@/shared/tanstack-query/axios';
+import { GroupStudyFormRequest } from './group-study-types';
+
+// CS 스터디 매칭 신청
+export const updateGroupStudy = async (
+  groupStudyId: number,
+  payload: GroupStudyFormRequest,
+) => {
+  try {
+    const res = await axiosInstance.put(
+      `/group-studies/${groupStudyId}`,
+      payload,
+    );
+
+    return res.data;
+  } catch (error) {
+    console.error('그룹 스터디 수정 실패:', error);
+    throw error;
+  }
+};

src/features/study/group/const/use-group-study-mutation.ts

@@ -1,10 +1,19 @@
 import { useMutation } from '@tanstack/react-query';
 import { createGroupStudy } from '../api/creat-group-study';
-import { OpenGroupStudyRequest } from '../api/group-study-types';
+import { GroupStudyFormRequest } from '../api/group-study-types';
+import { updateGroupStudy } from '../api/update-group-study';
 
 // 그룹 스터디 개설 mutation
 export const useCreateGroupStudyMutation = () => {
   return useMutation({
-    mutationFn: (payload: OpenGroupStudyRequest) => createGroupStudy(payload),
+    mutationFn: (payload: GroupStudyFormRequest) => createGroupStudy(payload),
+  });
+};
+
+// 그룹 스터디 수정 mutation
+export const useUpdateGroupStudyMutation = (groupStudyId: number) => {
+  return useMutation({
+    mutationFn: (payload: GroupStudyFormRequest) =>
+      updateGroupStudy(groupStudyId, payload),
   });
 };