feat: 칸반보드 조회 API 수정

JNU-econovation · Sep 5, 2024 · 1d49915 · 1d49915
1 parent acfc153
commit 1d49915
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/frontend/components/kanban/DragDrop.component.tsx b/frontend/components/kanban/DragDrop.component.tsx
@@ -10,15 +10,19 @@ import { useAtom, useAtomValue } from "jotai";
 import { KanbanSelectedButtonNumberState } from "@/src/stores/kanban/Navbar.atoms";
 import useDragDrop from "@/src/hooks/useDragDrop.hook";
 
-const KanbanColumnView = () => {
+interface KanbanColumnViewProps {
+  generation: string;
+}
+
+const KanbanColumnView = ({ generation }: KanbanColumnViewProps) => {
   const navbarId = useAtomValue(KanbanSelectedButtonNumberState);
 
   const {
     data: kanbanData,
     isError,
     isLoading,
   } = useQuery<KanbanColumnData[]>(["kanbanDataArray", navbarId], () =>
-    getAllKanbanData(navbarId)
+    getAllKanbanData(navbarId, generation)
   );
 
   if (!kanbanData || isLoading) {
@@ -65,7 +69,7 @@ const KanbanBoardDragDropComponent = ({
             ref={provided.innerRef}
             {...provided.droppableProps}
           >
-            <KanbanColumnView />
+            <KanbanColumnView generation={generation} />
             <KanbanAddColumnComponent />
             {provided.placeholder}
           </div>

diff --git a/frontend/components/kanban/column/ColumnWithBackButton.component.tsx b/frontend/components/kanban/column/ColumnWithBackButton.component.tsx
@@ -31,7 +31,7 @@ const KanbanColumnDetailCard = ({
     isError,
     isLoading,
   } = useQuery<KanbanColumnData[]>(["kanbanDataArray", generation], () =>
-    getAllKanbanData(navbarId)
+    getAllKanbanData(navbarId, generation)
   );
 
   if (!kanbanDataArray || isLoading) {

diff --git a/frontend/src/apis/kanban/index.ts b/frontend/src/apis/kanban/index.ts
@@ -19,9 +19,11 @@ export interface KanbanCardReq {
 }
 
 // TODO: card api 추가 시 수정 필요
-export const getKanbanCards = async (columnId: string) => {
+export const getKanbanCards = async (columnId: string, generation: string) => {
   const { data } = await https.get<KanbanCardReq[]>(
-    `/navigations/${columnId}/boards`
+    `/navigations/${columnId}/boards?${new URLSearchParams({
+      year: generation,
+    })}`
   );
 
   return data;
@@ -90,10 +92,11 @@ export const postAddCard = async ({ columnId, title }: addCardReq) => {
 };
 
 export const getAllKanbanData = async (
-  navigationId: string
+  navigationId: string,
+  generation: string
 ): Promise<KanbanColumnData[]> => {
   const columnsData = await getColums(navigationId);
-  const cardsData = await getKanbanCards(navigationId);
+  const cardsData = await getKanbanCards(navigationId, generation);
 
   return columnsData.map((column) => {
     const startColumnCardData = cardsData