[fix] 지원자페이지 api 수정 #1388

42organization · Apr 14, 2024 · b439afa · b439afa
1 parent 1ed3d1b
commit b439afa
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 26 deletions.
diff --git a/components/admin/recruitments/RecruitmentsHistoryList.tsx b/components/admin/recruitments/RecruitmentsHistoryList.tsx
@@ -37,7 +37,7 @@ const tableTitle: { [key: string]: string } = {
   id: 'ID',
   usedAt: '적용 시간',
   title: '제목',
-  status: '상태',
+  isFinish: '상태',
   detailRecruitment: '공고 상세보기',
   detaillUser: '지원자 보기',
 };
@@ -64,7 +64,7 @@ function RecruitmentsHistoryList({
       );
       // FIXME : 페이지네이션 x 임시로 1페이지로 고정
       setRecruitData({
-        recruitmentDtoList: res.data.recruitmentDtoList,
+        recruitmentDtoList: res.data.recruitments,
         totalPage: 1,
         currentPage: 1,
       });

diff --git a/components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx b/components/admin/recruitments/recruitmentsuser/DetailRecruitUserList.tsx
@@ -15,7 +15,7 @@ import {
 import PageNation from 'components/Pagination';
 import useRecruitmentUserFilter from 'hooks/recruitments/useRecruitmentUserFilter';
 import styles from 'styles/admin/recruitments/RecruitmentsUser.module.scss';
-import FilterQptionsUI from './FilterOptions';
+import RecruitmentFilterOptions from './RecruitmentFilterOptions';
 import renderTableCells from './renderTableCells';
 
 const tableTitle: { [key: string]: string } = {
@@ -47,7 +47,7 @@ function DetailRecruitUserList({ recruitId }: { recruitId: number }) {
 
   return (
     <>
-      {FilterQptionsUI(recruitUserData.applicationResults, recruitId)}
+      {/* {RecruitmentFilterOptions(recruitUserData.applicationResults, recruitId)} */}
       <TableContainer className={styles.tableContainer} component={Paper}>
         <Table className={styles.table} aria-label='customized table'>
           <TableHead className={styles.tableHeader}>

diff --git a/...tments/recruitmentsuser/FilterOptions.tsx → ...uitmentsuser/RecruitmentFilterOptions.tsx b/...tments/recruitmentsuser/FilterOptions.tsx → ...uitmentsuser/RecruitmentFilterOptions.tsx
@@ -26,14 +26,13 @@ const MenuProps = {
   },
 };
 
-// FIXME : FilterQptionsUI 이름 변경하기 (의미를 알아보기 어려움)
-function FilterQptionsUI(
+function RecruitmentFilterOptions(
   recruitUserData: IrecruitUserTable[],
   recruitId: number
 ) {
-  const [answers, setAnswers] = useState<Array<IcheckItem>>([]);
   const { checklistIds, handleChecklistChange } =
     useRecruitmentUserFilter(recruitId);
+  const [answers, setAnswers] = useState<Array<IcheckItem>>([]);
 
   useEffect(() => {
     setAnswers(
@@ -81,4 +80,4 @@ function FilterQptionsUI(
   );
 }
 
-export default FilterQptionsUI;
+export default RecruitmentFilterOptions;
diff --git a/components/admin/recruitments/recruitmentsuser/renderTableCells.tsx b/components/admin/recruitments/recruitmentsuser/renderTableCells.tsx
@@ -45,6 +45,7 @@ const ExpandableTableRow: React.FC<ExpandableTableRowProps> = ({
 };
 
 function renderTableCells(recruit: IrecruitUserTable, questions: string[]) {
+  console.log(recruit);
   const answers = questions.map((question) => {
     const formItem = recruit.form.find((form) => form.question === question);
     if (!formItem) return 'N/A';
@@ -72,14 +73,15 @@ function renderTableCells(recruit: IrecruitUserTable, questions: string[]) {
           <div>
             <strong>status:</strong> {recruit.status}
           </div>
-          {recruit.form.map((form, index) => (
-            <div key={index}>
-              <strong>{form.question}</strong>:{' '}
-              {form.answer
-                ? form.answer
-                : form.checkedList?.map((item) => item.content).join(', ')}
-            </div>
-          ))}
+          {recruit.form &&
+            recruit.form.map((form, index) => (
+              <div key={index}>
+                <strong>{form.question}</strong>:{' '}
+                {form.answer
+                  ? form.answer
+                  : form.checkedList?.map((item) => item.content).join(', ')}
+              </div>
+            ))}
         </div>
       }
     >

diff --git a/constants/admin/table.ts b/constants/admin/table.ts
@@ -251,14 +251,15 @@ export const tableFormat: TableFormat = {
       'startAt',
       'endAt',
       'status',
+      'isFinish',
       'isCurrent',
       'detailRecruitment',
       'detaillUser',
     ],
   },
   recruitUserList: {
     name: '지원자 목록',
-    columns: ['', 'intraId', 'status', 'question'],
+    columns: ['', 'intraId', 'status', 'isFinish', 'question'],
   },
   recruitEditTitle: {
     name: '공고 수정',

diff --git a/hooks/recruitments/useRecruitmentUserFilter.ts b/hooks/recruitments/useRecruitmentUserFilter.ts
@@ -9,7 +9,8 @@ import { instance } from 'utils/axios';
 import { toastState } from 'utils/recoil/toast';
 
 // FIXME : 페이지네이션 여부 담당자와 다시 확인하기 (현재 페이지네이션 없음)
-const useRecruitmentUserFilter = (recruitId: number, currentPage?: number) => {
+// const useRecruitmentUserFilter = (recruitId: number, currentPage?: number) => {
+const useRecruitmentUserFilter = (recruitId: number) => {
   const [recruitUserData, setRecruitUserData] = useState<IrecruitArrayTable>({
     applicationResults: [],
     totalPage: 0,
@@ -36,6 +37,7 @@ const useRecruitmentUserFilter = (recruitId: number, currentPage?: number) => {
         `/admin/recruitments/${recruitId}/applicants`
       );
       // FIXME: 페이지네이션 x (페이지네이션이 없는 api?) 임시로 1페이지로 고정
+      console.log(res.data);
       setRecruitUserData({
         applicationResults: res.data.applicationResults,
         totalPage: 1,
@@ -54,19 +56,23 @@ const useRecruitmentUserFilter = (recruitId: number, currentPage?: number) => {
         clicked: true,
       });
     }
-  }, [currentPage, searchString, checklistIds]);
+    // }, [currentPage, searchString, checklistIds]);
+  }, [searchString, checklistIds]);
 
   useEffect(() => {
     getRecruitUserHandler();
-  }, [currentPage, searchString, checklistIds]);
+    // }, [currentPage, searchString, checklistIds]);
+  }, [searchString, checklistIds]);
 
-  const questions = recruitUserData.applicationResults?.reduce(
+  const questions = recruitUserData.applicationResults.reduce(
     (acc: string[], application: { form: { question: string }[] }) => {
-      application.form.forEach(({ question }) => {
-        if (acc.indexOf(question) === -1) {
-          acc.push(question);
-        }
-      });
+      if (application.form) {
+        application.form.forEach(({ question }) => {
+          if (acc.indexOf(question) === -1) {
+            acc.push(question);
+          }
+        });
+      }
       return acc;
     },
     []

diff --git a/types/admin/adminRecruitmentsTypes.ts b/types/admin/adminRecruitmentsTypes.ts
@@ -7,6 +7,7 @@ export interface Irecruit {
   title: string;
   contents?: string;
   status?: '모집전' | '모집중' | '완료';
+  isFinish?: '모집전' | '모집중' | '완료';
   generation: string;
   form?: Array<Iquestion>;
 }