[Bug]: 승인 api 오류 및 자격증,대상자 전체 관리 페이지 오류 수정

apps/graduate/src/pages/admin/certification/ui/CertificationAdminPage.tsx

@@ -1,16 +1,10 @@
 import { useState } from 'react';
 
+import type { GraduationUserSummary } from '~/shared/api';
 import { DataTable, Header, Pagination, Toolbar } from '~/shared/components';
 import {
-  APPROVE_ALERT,
-  APPROVE_CONFIRM_TITLE,
-  APPROVE_EMPTY,
-  APPROVE_FAILED,
-  APPROVE_SUCCESS,
-} from '~/shared/components/Toolbar/toolbarTexts';
-import {
+  useApproveGraduationUsers,
   useFetchGraduationUsers,
-  useUpdateGraduationUsersBatchApprove,
   useToast,
 } from '~/shared/hooks';
 import { downloadGraduationUsersExcel } from '~/shared/utils';
@@ -24,24 +18,51 @@ export default function CertificationAdminPage() {
   const [pageSize, setPageSize] = useState(10);
   const [query, setQuery] = useState('');
   const [selectedIds, setSelectedIds] = useState<number[]>([]);
-  const { toast, confirm } = useToast();
+  const { toast } = useToast();
 
   const resetSelection = () => {
     setSelectedIds([]);
     setPage(1);
   };
 
-  const { approveGraduationUsers } = useUpdateGraduationUsersBatchApprove({
-    onSuccess: resetSelection,
-  });
-
   const { data, isLoading } = useFetchGraduationUsers({
     page: page - 1,
     size: pageSize,
     name: query || undefined,
     graduationType: 'CERTIFICATE',
   });
 
+  const classify = (selected: GraduationUserSummary[]) => {
+    const notSubmitted: typeof selected = [];
+    const pending: typeof selected = [];
+    const alreadyApproved: typeof selected = [];
+
+    selected.forEach(user => {
+      const certStatus =
+        user.status && user.status.type === 'CERTIFICATE' ? user.status : null;
+      if (!certStatus || !certStatus.submitted) {
+        notSubmitted.push(user);
+        return;
+      }
+      if (certStatus.approval) {
+        alreadyApproved.push(user);
+        return;
+      }
+      pending.push(user);
+    });
+
+    return { notSubmitted, pending, alreadyApproved };
+  };
+
+  const { handleApproveSelected } = useApproveGraduationUsers({
+    items: data?.contents ?? [],
+    selectedIds,
+    getId: user => user.id,
+    getLabel: user => `${user.studentId} ${user.name}`,
+    classify,
+    onSuccess: resetSelection,
+  });
+
   const rows: CertRow[] = data
     ? data.contents.map((user, idx) => {
         const certStatus =
@@ -83,27 +104,6 @@ export default function CertificationAdminPage() {
     );
   };
 
-  const handleApproveSelected = () => {
-    if (selectedIds.length === 0) {
-      toast.warning(APPROVE_EMPTY);
-      return;
-    }
-    confirm({
-      title: APPROVE_CONFIRM_TITLE,
-      content: APPROVE_ALERT,
-      okText: '승인',
-      cancelText: '취소',
-      onOk: async () => {
-        try {
-          await approveGraduationUsers(selectedIds);
-          toast.success(APPROVE_SUCCESS);
-        } catch (error) {
-          toast.error(error instanceof Error ? error.message : APPROVE_FAILED);
-        }
-      },
-    });
-  };
-
   const handleDownloadExcel = async () => {
     try {
       await downloadGraduationUsersExcel('CERTIFICATE');

apps/graduate/src/pages/admin/thesis/ui/ThesisAdminPage.tsx

@@ -1,16 +1,10 @@
 import { useState } from 'react';
 
+import type { GraduationUserSummary } from '~/shared/api';
 import { DataTable, Header, Pagination, Toolbar } from '~/shared/components';
 import {
-  APPROVE_ALERT,
-  APPROVE_CONFIRM_TITLE,
-  APPROVE_EMPTY,
-  APPROVE_FAILED,
-  APPROVE_SUCCESS,
-} from '~/shared/components/Toolbar/toolbarTexts';
-import {
+  useApproveGraduationUsers,
   useFetchGraduationUsers,
-  useUpdateGraduationUsersBatchApprove,
   useToast,
 } from '~/shared/hooks';
 import { downloadGraduationUsersExcel } from '~/shared/utils';
@@ -24,24 +18,64 @@ export default function ThesisAdminPage() {
   const [pageSize, setPageSize] = useState(10);
   const [query, setQuery] = useState('');
   const [selectedIds, setSelectedIds] = useState<number[]>([]);
-  const { toast, confirm } = useToast();
+  const { toast } = useToast();
 
   const resetSelection = () => {
     setSelectedIds([]);
     setPage(1);
   };
 
-  const { approveGraduationUsers } = useUpdateGraduationUsersBatchApprove({
-    onSuccess: resetSelection,
-  });
-
   const { data, isLoading } = useFetchGraduationUsers({
     page: page - 1,
     size: pageSize,
     name: query || undefined,
     graduationType: 'THESIS',
   });
 
+  const classify = (selected: GraduationUserSummary[]) => {
+    const notSubmitted: typeof selected = [];
+    const pending: typeof selected = [];
+    const alreadyApproved: typeof selected = [];
+
+    selected.forEach(user => {
+      const status = user.status;
+      if (!status || status.type !== 'THESIS') {
+        notSubmitted.push(user);
+        return;
+      }
+
+      const midSubmitted = status.midThesis.submitted;
+      const finalSubmitted = status.finalThesis.submitted;
+      const midApproved = status.midThesis.approval;
+      const finalApproved = status.finalThesis.approval;
+      const hasPending =
+        (midSubmitted && !midApproved) || (finalSubmitted && !finalApproved);
+
+      if (hasPending) {
+        pending.push(user);
+        return;
+      }
+
+      if (midSubmitted && finalSubmitted) {
+        alreadyApproved.push(user);
+        return;
+      }
+
+      notSubmitted.push(user);
+    });
+
+    return { notSubmitted, pending, alreadyApproved };
+  };
+
+  const { handleApproveSelected } = useApproveGraduationUsers({
+    items: data?.contents ?? [],
+    selectedIds,
+    getId: user => user.id,
+    getLabel: user => `${user.studentId} ${user.name}`,
+    classify,
+    onSuccess: resetSelection,
+  });
+
   const rows: ThesisRow[] = data
     ? data.contents.map((user, idx) => {
         const thesis = user.status?.type === 'THESIS' ? user.status : null;
@@ -92,27 +126,6 @@ export default function ThesisAdminPage() {
     );
   };
 
-  const handleApproveSelected = () => {
-    if (selectedIds.length === 0) {
-      toast.warning(APPROVE_EMPTY);
-      return;
-    }
-    confirm({
-      title: APPROVE_CONFIRM_TITLE,
-      content: APPROVE_ALERT,
-      okText: '승인',
-      cancelText: '취소',
-      onOk: async () => {
-        try {
-          await approveGraduationUsers(selectedIds);
-          toast.success(APPROVE_SUCCESS);
-        } catch (error) {
-          toast.error(error instanceof Error ? error.message : APPROVE_FAILED);
-        }
-      },
-    });
-  };
-
   const handleDownloadExcel = async () => {
     try {
       await downloadGraduationUsersExcel('THESIS');

apps/graduate/src/shared/components/Toolbar/toolbarTexts.ts

@@ -2,6 +2,16 @@ export const DELETE_ALERT = '선택한 학생을 삭제할까요?';
 export const DELETE_CONFIRM_TITLE = '학생 삭제';
 export const APPROVE_ALERT = '선택한 학생을 승인할까요?';
 export const APPROVE_CONFIRM_TITLE = '학생 승인';
+export const APPROVE_OK_TEXT = '승인';
+export const APPROVE_CANCEL_TEXT = '취소';
 export const APPROVE_EMPTY = '승인할 대상을 선택하세요.';
 export const APPROVE_SUCCESS = '선택한 학생을 승인했습니다.';
 export const APPROVE_FAILED = '승인에 실패했습니다.';
+export const APPROVE_NOTHING = '승인할 제출이 없습니다.';
+export const APPROVE_RESULT_TITLE = '승인 결과';
+export const APPROVE_RESULT_APPROVED = '승인된 대상';
+export const APPROVE_RESULT_NOT_APPROVED = '미승인 대상';
+export const APPROVE_RESULT_NONE = '없음';
+export const APPROVE_REASON_NOT_SUBMITTED = '미제출';
+export const APPROVE_REASON_ALREADY_APPROVED = '이미 승인';
+export const APPROVE_REASON_FAILED = '승인 실패';

apps/graduate/src/shared/hooks/student/index.ts

@@ -1,3 +1,4 @@
 export { useFetchGraduationUsers } from './useFetchGraduationUsers';
+export { useApproveGraduationUsers } from './useApproveGraduationUsers';
 export { useRemoveGraduationUsers } from './useRemoveGraduationUsers';
 export { useUpdateGraduationUsersBatchApprove } from './useUpdateGraduationUsersBatchApprove';