From 1e708943816258186d649c9fea5c7651c1752161 Mon Sep 17 00:00:00 2001
From: yeonddori <yeonddori@gmail.com>
Date: Sun, 26 Jan 2025 18:58:33 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20teamId=EA=B0=80=20=EC=A0=9C=EB=8C=80?=
 =?UTF-8?q?=EB=A1=9C=20=EC=A0=84=EB=8B=AC=EB=90=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#371
---
 src/app/team/[teamId]/document/page.tsx                |  2 +-
 src/app/team/[teamId]/page.tsx                         |  4 +++-
 .../team/[teamId]/study/[studyId]/document/page.tsx    |  2 +-
 src/components/DocumentCard/index.tsx                  | 10 ++++++++--
 src/containers/document/Documents/index.tsx            |  4 ++--
 src/containers/document/Documents/types.ts             |  1 +
 src/containers/study/DocumentModal/index.tsx           |  4 ++--
 src/containers/study/DocumentModal/types.ts            |  1 +
 src/containers/team/DocumentGridView/index.tsx         |  4 ++--
 src/containers/team/DocumentGridView/types.ts          |  1 +
 10 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/app/team/[teamId]/document/page.tsx b/src/app/team/[teamId]/document/page.tsx
index 98b00794..7e39c716 100644
--- a/src/app/team/[teamId]/document/page.tsx
+++ b/src/app/team/[teamId]/document/page.tsx
@@ -34,7 +34,7 @@ const Page = ({ params }: { params: { teamId: number } }) => {
           </Button>
         )}
       </Flex>
-      <Documents groupId={params.teamId} category="teams" refetchTrigger={openCreateModal} />
+      <Documents teamId={params.teamId} groupId={params.teamId} category="teams" refetchTrigger={openCreateModal} />
       <CreateDocumentModal
         isOpen={openCreateModal}
         onClose={() => setOpenCreateModal(false)}
diff --git a/src/app/team/[teamId]/page.tsx b/src/app/team/[teamId]/page.tsx
index 5c1ef608..20febdd5 100644
--- a/src/app/team/[teamId]/page.tsx
+++ b/src/app/team/[teamId]/page.tsx
@@ -239,7 +239,9 @@ const Page = ({ params }: { params: { teamId: number } }) => {
             />
           )}
           {category === '학습자료' && documentArray.length === 0 && <SuggestionCreate category="학습자료" />}
-          {category === '학습자료' && <DocumentGridView setReload={setReloadTrigger} documentArray={documentArray} />}
+          {category === '학습자료' && (
+            <DocumentGridView teamId={params.teamId} setReload={setReloadTrigger} documentArray={documentArray} />
+          )}
         </Flex>
       </Flex>
       <StudyModal
diff --git a/src/app/team/[teamId]/study/[studyId]/document/page.tsx b/src/app/team/[teamId]/study/[studyId]/document/page.tsx
index bdcaeea7..b3d6ba7d 100644
--- a/src/app/team/[teamId]/study/[studyId]/document/page.tsx
+++ b/src/app/team/[teamId]/study/[studyId]/document/page.tsx
@@ -52,7 +52,7 @@ const Page = ({ params }: { params: { teamId: number; studyId: number } }) => {
           </Button>
         )}
       </Flex>
-      <Documents groupId={params.studyId} category="studies" refetchTrigger={openCreateModal} />
+      <Documents teamId={params.teamId} groupId={params.studyId} category="studies" refetchTrigger={openCreateModal} />
       <CreateDocumentModal
         isOpen={openCreateModal}
         onClose={() => setOpenCreateModal(false)}
diff --git a/src/components/DocumentCard/index.tsx b/src/components/DocumentCard/index.tsx
index b2e6b6c0..a5c3f3e0 100644
--- a/src/components/DocumentCard/index.tsx
+++ b/src/components/DocumentCard/index.tsx
@@ -7,7 +7,7 @@ import S3_URL from '@/constants/s3Url';
 import DocumentModal from '@/containers/study/DocumentModal';
 import { DocumentList } from '@/types';
 
-const DocumentCard = ({ id, title, description, date, setReload, files, type }: DocumentList) => {
+const DocumentCard = ({ teamId, id, title, description, date, setReload, files, type }: DocumentList) => {
   const [docsModalOpen, setIsDocsModalOpen] = useState<boolean>(false);
 
   const firstImg = () => {
@@ -38,7 +38,13 @@ const DocumentCard = ({ id, title, description, date, setReload, files, type }:
       onClick={() => setIsDocsModalOpen(true)}
       rounded="xl"
     >
-      <DocumentModal id={id} isOpen={docsModalOpen} setIsDocsModalOpen={setIsDocsModalOpen} setReload={setReload} />
+      <DocumentModal
+        teamId={teamId}
+        id={id}
+        isOpen={docsModalOpen}
+        setIsDocsModalOpen={setIsDocsModalOpen}
+        setReload={setReload}
+      />
 
       <Image h="60" objectFit="cover" alt="study card" rounded="sm" src={firstImg()} />
       <CardBody px="2">
diff --git a/src/containers/document/Documents/index.tsx b/src/containers/document/Documents/index.tsx
index f75c5c66..941151b1 100644
--- a/src/containers/document/Documents/index.tsx
+++ b/src/containers/document/Documents/index.tsx
@@ -10,7 +10,7 @@ import { DocumentList } from '@/types';
 
 import { DocumentPageProps } from './types';
 
-const Documents = ({ groupId, category, refetchTrigger = false }: DocumentPageProps) => {
+const Documents = ({ teamId, groupId, category, refetchTrigger = false }: DocumentPageProps) => {
   const [currentPage, setCurrentPage] = useState<number>(1);
   const [documentArray, setDocumentArray] = useState<DocumentList[]>([]);
   const [documentLength, setDocumentLength] = useState<number>(4);
@@ -37,7 +37,7 @@ const Documents = ({ groupId, category, refetchTrigger = false }: DocumentPagePr
           <Grid gap={{ sm: '2', md: '4', xl: '8' }} templateColumns={`repeat(${itemsPerPage / 2}, 1fr)`} w="100%">
             {currentData.map((data) => (
               <DocumentCard
-                teamId={data.teamId}
+                teamId={teamId}
                 id={data.id}
                 key={data.id}
                 title={data.title}
diff --git a/src/containers/document/Documents/types.ts b/src/containers/document/Documents/types.ts
index a37ff4b4..f98cbdbd 100644
--- a/src/containers/document/Documents/types.ts
+++ b/src/containers/document/Documents/types.ts
@@ -1,4 +1,5 @@
 export interface DocumentPageProps {
+  readonly teamId: number;
   category: 'studies' | 'teams';
   groupId: number;
   refetchTrigger?: boolean;
diff --git a/src/containers/study/DocumentModal/index.tsx b/src/containers/study/DocumentModal/index.tsx
index 59d4ad7c..5215c55d 100644
--- a/src/containers/study/DocumentModal/index.tsx
+++ b/src/containers/study/DocumentModal/index.tsx
@@ -19,7 +19,7 @@ import { DocumentDetail, Member } from '@/types';
 
 import { DocumentModalProps } from './types';
 
-const DocumentModal = ({ id, isOpen, setIsDocsModalOpen, setReload }: DocumentModalProps) => {
+const DocumentModal = ({ teamId, id, isOpen, setIsDocsModalOpen, setReload }: DocumentModalProps) => {
   const [createDocsModalOpen, setIsCreateDocsModalOpen] = useState<boolean>(false);
 
   const {
@@ -44,7 +44,7 @@ const DocumentModal = ({ id, isOpen, setIsDocsModalOpen, setReload }: DocumentMo
 
   const user = useGetUser();
   const [isMember, setIsMember] = useState<boolean>(false);
-  const { result: teamMembers } = useGetFetchWithToken(getTeamMembers, [document?.teamId], user);
+  const { result: teamMembers } = useGetFetchWithToken(getTeamMembers, [teamId], user);
 
   useEffect(() => {
     if (user?.isLogin) {
diff --git a/src/containers/study/DocumentModal/types.ts b/src/containers/study/DocumentModal/types.ts
index 1a576145..d526c908 100644
--- a/src/containers/study/DocumentModal/types.ts
+++ b/src/containers/study/DocumentModal/types.ts
@@ -6,6 +6,7 @@ export interface DocumentData {
 }
 
 export interface DocumentModalProps {
+  readonly teamId: number;
   id: number;
   isOpen: boolean;
   setIsDocsModalOpen: React.Dispatch<React.SetStateAction<boolean>>;
diff --git a/src/containers/team/DocumentGridView/index.tsx b/src/containers/team/DocumentGridView/index.tsx
index a5c2f63f..7e3a59ee 100644
--- a/src/containers/team/DocumentGridView/index.tsx
+++ b/src/containers/team/DocumentGridView/index.tsx
@@ -4,13 +4,13 @@ import DocumentCard from '@/components/DocumentCard';
 
 import { DocumentGridViewProps } from './types';
 
-const DocumentGridView = ({ documentArray, setReload = () => {} }: DocumentGridViewProps) => {
+const DocumentGridView = ({ teamId, documentArray, setReload = () => {} }: DocumentGridViewProps) => {
   return (
     <Grid gap="4" templateColumns={{ base: 'repeat(2, 1fr)', lg: 'repeat(4, 1fr)' }}>
       {documentArray?.map((document) => {
         return (
           <DocumentCard
-            teamId={document.teamId}
+            teamId={teamId}
             key={document.id}
             id={document.id}
             title={document.title}
diff --git a/src/containers/team/DocumentGridView/types.ts b/src/containers/team/DocumentGridView/types.ts
index 451a150a..8d908630 100644
--- a/src/containers/team/DocumentGridView/types.ts
+++ b/src/containers/team/DocumentGridView/types.ts
@@ -1,6 +1,7 @@
 import { DocumentList } from '@/types';
 
 export interface DocumentGridViewProps {
+  readonly teamId: number;
   documentArray: DocumentList[];
   setReload?: React.Dispatch<React.SetStateAction<boolean>>;
 }