fix: teamId가 제대로 전달되지 않던 문제 수정

#371
BDD-CLUB · Jan 26, 2025 · 1e70894 · 1e70894
1 parent 170dec1
commit 1e70894
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,7 @@
 import { DocumentList } from '@/types';
 
 export interface DocumentGridViewProps {
+  readonly teamId: number;
   documentArray: DocumentList[];
   setReload?: React.Dispatch<React.SetStateAction<boolean>>;
 }