Merge pull request #105 from GDGoCINHA/develop

Fix(#4)/ 프록시 대상 주소 재변경

Author: ThinkMuk

src/app/api/auth/[route]/route.js src/app/api/[route]/route.jssrc/app/api/auth/[route]/route.js renamed to src/app/api/[route]/route.js

@@ -1,4 +1,3 @@
-// 예시: /api/auth/[action]/route.js
 import { NextResponse } from 'next/server';
 import axios from 'axios';
 

src/components/study/dashboard/admin/view/CreatedStudies.jsx

@@ -56,7 +56,7 @@ export default function CreatedStudies() {
                     </tr>
                     </thead>
                     <tbody>
-                    {Array.isArray(data) && data.length > 0 ? (
+                    {Array.isArray(data) && data?.length > 0 ? (
                         data.map((data) => (
                             <tr
                                 key={data.id}

src/components/study/dashboard/my/view/AppliedStudies.jsx

@@ -57,7 +57,7 @@ export default function AppliedStudies() {
                     </tr>
                     </thead>
                     <tbody>
-                    {data.length > 0 ? (
+                    {data?.length > 0 ? (
                         data.map((data) => (
                             <tr
                                 key={data.studyId}

src/components/study/ui/card/ApplicantInfoList.jsx

@@ -45,7 +45,7 @@ export default function ApplicantInfoList({
                     </tr>
                     </thead>
                     <tbody>
-                    {applications.length === 0 ? (
+                    {applications?.length === 0 ? (
                         <tr>
                             <td colSpan="4" className="py-4 text-center text-gray-500">
                                 아직 지원자가 없습니다. ㅠㅠ

src/hooks/study/useApplicantDetail.js

@@ -14,7 +14,7 @@ export const useApplicantDetail = (apiClient, studyId, applicantId) => {
                     setApplicantDetail(getAttendeeDetailsByStudyId.data);
                 } else {
                     const resApplicantDetail = await apiClient.get(`/study/${studyId}/attendee/${applicantId}`);
-                    setApplicantDetail(resApplicantDetail.data);
+                    setApplicantDetail(resApplicantDetail?.data?.data);
                 }
             } catch (err) {
                 setError(err);
@@ -24,7 +24,7 @@ export const useApplicantDetail = (apiClient, studyId, applicantId) => {
         };
 
         fetchApplicantDetailData();
-    }, []);
+    }, [studyId, applicantId]);
 
     return { applicantDetail, isLoading, error };
 };

src/hooks/study/useApplicantList.js

@@ -14,7 +14,7 @@ export const useApplicantList = (apiClient, studyId) => {
                     setApplicantList(getAttendeesByStudyId.data.attendees);
                 } else {
                     const resApplicant = await apiClient.get(`/study/${studyId}/attendee?page=1`);
-                    setApplicantList(resApplicant.data.attendees);
+                    setApplicantList(resApplicant?.data?.data?.attendees);
                 }
             } catch (err) {
                 setError(err);
@@ -24,7 +24,7 @@ export const useApplicantList = (apiClient, studyId) => {
         };
 
         fetchApplicantListData();
-    }, []);
+    }, [studyId]);
 
     return { applicantList, isLoading, error };
 };

src/hooks/study/useAppliedStudyList.js

@@ -16,8 +16,8 @@ export const useAppliedStudyList = (apiClient) => {
                     setRecruitedAppliedStudyList(getMyStudyApplyResult.data.recruited);
                 } else {
                     const resCreatedStudy = await apiClient.get('/study/attendee/result');
-                    setRecruitingAppliedStudyList(resCreatedStudy.data.recruiting);
-                    setRecruitedAppliedStudyList(resCreatedStudy.data.recruited);
+                    setRecruitingAppliedStudyList(resCreatedStudy?.data?.data?.recruiting);
+                    setRecruitedAppliedStudyList(resCreatedStudy?.data?.data?.recruited);
                 }
             } catch (err) {
                 setError(err);

src/hooks/study/useCreatedStudyList.js

@@ -16,8 +16,8 @@ export const useCreatedStudyList = (apiClient) => {
                     setRecruitedCreatedStudyList(getCreatedStudiesByStatus.data.recruited);
                 } else {
                     const resCreatedStudy = await apiClient.get('/study/me');
-                    setRecruitingCreatedStudyList(resCreatedStudy.data.recruiting);
-                    setRecruitedCreatedStudyList(resCreatedStudy.data.recruited);
+                    setRecruitingCreatedStudyList(resCreatedStudy?.data?.data?.recruiting);
+                    setRecruitedCreatedStudyList(resCreatedStudy?.data?.data?.recruited);
                 }
             } catch (err) {
                 setError(err);

src/hooks/study/useStudyAccessCheck.js

@@ -16,9 +16,10 @@ export const useStudyAccessCheck = (apiClient, studyId) => {
                     setIsStudyLead(getCreatedStudiesByStatus.data.recruiting.some(study => study.id === Number(studyId)) || getCreatedStudiesByStatus.data.recruited.some(study => study.id === Number(studyId)));
                 } else {
                     const resAppliedStudy = await apiClient.get(`/study/attendee/result`);
-                    setIsStudyApplicant(resAppliedStudy.data.recruiting.some(study => study.studyId === Number(studyId)) || resAppliedStudy.data.recruited.some(study => study.studyId === Number(studyId)));
+                    // 얘는 recruited가 없는데? 버근가? -> 아무것도 지원 안한 상태긴함 ㅇㅇ
+                    setIsStudyApplicant(resAppliedStudy?.data?.data?.recruiting?.some(study => study?.studyId === Number(studyId)) || resAppliedStudy?.data?.data?.recruited?.some(study => study?.studyId === Number(studyId)));
                     const resCreatedStudy = await apiClient.get('/study/me');
-                    setIsStudyLead(resCreatedStudy.data.recruiting.some(study => study.id === Number(studyId)) || resCreatedStudy.data.recruited.some(study => study.id === Number(studyId)));
+                    setIsStudyLead(resCreatedStudy?.data?.data?.recruiting?.some(study => study?.id === Number(studyId)) || resCreatedStudy?.data?.data?.recruited?.some(study => study?.id === Number(studyId)));
                 }
             } catch (err) {
                 setError(err);
@@ -28,7 +29,7 @@ export const useStudyAccessCheck = (apiClient, studyId) => {
         };
 
         fetchPermissionData();
-    }, []);
+    }, [studyId]);
 
     // 이 스터디가 네놈의 것이 맞느냐?
     // 홀홀 그대는 정직한 유저구나 true를 반환하여주겠다

src/hooks/study/useStudyDetail.js

@@ -26,13 +26,15 @@ export const useStudyDetail = (apiClient, studyId) => {
                     }
                 } else {
                     const resStudyDetail = await apiClient.get(`/study/${studyId}`);
-                    setStudyDetail(resStudyDetail.data);
-                    setStudyLead(resStudyDetail.data.creator);
-                    setIsRecruiting(resStudyDetail.data.status === "RECRUITING");
+                    setStudyDetail(resStudyDetail?.data?.data);
+                    setStudyLead(resStudyDetail?.data?.data?.creator);
+                    setIsRecruiting(resStudyDetail?.data?.data?.status === "RECRUITING");
 
                     const resApplications = await apiClient.get('/study/attendee/result');
-                    if (resApplications.data.recruiting.some((application) => application.studyId === Number(studyId))) {
+                    if (resApplications?.data?.data?.recruiting?.some((study) => study?.studyId === Number(studyId))) {
                         setIsApplied(true);
+                    } else {
+                        setIsApplied(false);
                     }
                 }
             } catch (error) {
@@ -43,7 +45,7 @@ export const useStudyDetail = (apiClient, studyId) => {
         };
 
         fetchStudyDetailData();
-    }, []);
+    }, [studyId]);
 
     return { studyDetail, studyLead, isRecruiting, isApplied, isLoading, error };
 };