Merge pull request #333 from CheckMate-sookmyung/fix/#326-api

#326 fix: api 수정
CheckMate-sookmyung · Sep 22, 2024 · f35b6d5 · f35b6d5
2 parents 50bb164 + b9244b8
commit f35b6d5
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 141 deletions.
diff --git a/src/apis/attendance.js b/src/apis/attendance.js
@@ -8,7 +8,7 @@ export const getAttendanceList = async (eventId) => {
 
 export const updateAttendanceList = async (eventId, body) => {
   const { data } = await axiosInstance.put(
-    `/api/v1/attendance/list/${eventId}`,
+    `/api/v1/attendance/manage/${eventId}`,
     body,
   );
 

diff --git a/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx b/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx
@@ -79,10 +79,10 @@ const AttendanceStudentIdPage = () => {
           setIsModalOpen(true);
         } else {
           const parsedStudent = {
-            studentName: data.studentName || data[0].studentName,
-            studentNumber: data.studentNumber || data[0].studentNumber,
-            studentInfoId: data.studentInfoId || data[0].studentInfoId,
-            major: data.major || data[0].major,
+            studentName: data.attendeeName,
+            studentNumber: data.studentNumber,
+            studentInfoId: data.attendeeId,
+            major: data.attendeeAffiliation,
           };
 
           setAttendanceCheck(data);

diff --git a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
@@ -238,7 +238,7 @@ export default function DashboardAttendeePage() {
   const handleDownload = async () => {
     try {
       const response = await axiosInstance.get(
-        `/api/v1/attendance/list/${eventId}`,
+        `/api/v1/attendancelist/${eventId}`,
         { responseType: 'blob' },
       );
 

diff --git a/src/pages/DashboardPage/DashboardStatisticPage/CompletionChart.jsx b/src/pages/DashboardPage/DashboardStatisticPage/CompletionChart.jsx
@@ -1,14 +1,13 @@
 import { Doughnut } from 'react-chartjs-2';
 import { Chart as ChartJS, ArcElement, Tooltip, Legend } from 'chart.js';
 import ChartDataLabels from 'chartjs-plugin-datalabels';
-import { ATTENDEE_LIST } from './attendee';
 
 ChartJS.register(ArcElement, Tooltip, Legend, ChartDataLabels);
 
 const CompletionChart = ({ attendeeList }) => {
-  const totalStudents = attendeeList.eventRatioDetailResponseDtos.length;
+  const totalStudents = attendeeList.eventStatisticDetailResponseDtos.length;
   const completedStudents =
-    ATTENDEE_LIST[0].eventRatioDetailResponseDtos.filter(
+    attendeeList.eventStatisticDetailResponseDtos.filter(
       (student) => student.completion,
     ).length;
 

diff --git a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
@@ -4,17 +4,13 @@ import { Sidebar, TopNavigation } from '@/components';
 import MajorChart from './MajorChart';
 import YearChart from './YearChart';
 import CompletionChart from './CompletionChart';
-import { ATTENDEE_LIST } from './attendee';
 import { eventIDState } from '@/recoil/atoms/state';
 import { getEventDetail, getEventStatistic } from '@/apis';
 import { useQuery } from '@tanstack/react-query';
 import { useRecoilValue } from 'recoil';
 
 const DetailStatisticsPage = () => {
   const eventId = useRecoilValue(eventIDState);
-  const startDate = ATTENDEE_LIST[0].eventDates[0];
-  const endDate =
-    ATTENDEE_LIST[0].eventDates[ATTENDEE_LIST[0].eventDates.length - 1];
 
   const {
     data: eventDetail,

diff --git a/src/pages/DashboardPage/DashboardStatisticPage/MajorChart.jsx b/src/pages/DashboardPage/DashboardStatisticPage/MajorChart.jsx
@@ -1,23 +1,22 @@
 import { Doughnut } from 'react-chartjs-2';
 import { Chart as ChartJS, ArcElement, Tooltip, Legend } from 'chart.js';
 import ChartDataLabels from 'chartjs-plugin-datalabels';
-import { ATTENDEE_LIST } from './attendee';
 
 ChartJS.register(ArcElement, Tooltip, Legend, ChartDataLabels);
 
 const MajorChart = ({ attendeeList }) => {
   const majorAttendance = {};
   let totalCompletedStudentsByMajor = 0;
 
-  attendeeList.eventRatioDetailResponseDtos.forEach((student) => {
-    // if (student.completion) {
-    totalCompletedStudentsByMajor++;
-    if (majorAttendance[student.studentMajor]) {
-      majorAttendance[student.studentMajor]++;
-    } else {
-      majorAttendance[student.studentMajor] = 1;
+  attendeeList.eventStatisticDetailResponseDtos.forEach((student) => {
+    if (student.completion) {
+      totalCompletedStudentsByMajor++;
+      if (majorAttendance[student.studentMajor]) {
+        majorAttendance[student.studentMajor]++;
+      } else {
+        majorAttendance[student.studentMajor] = 1;
+      }
     }
-    // }
   });
 
   const sortedMajorAttendance = Object.entries(majorAttendance).sort(
@@ -91,7 +90,7 @@ const MajorChart = ({ attendeeList }) => {
 
             if (label === '기타') {
               const etcStudents =
-                ATTENDEE_LIST[0].eventRatioDetailResponseDtos.length -
+                attendeeList.eventRatioDetailResponseDtos.length -
                 totalCompletedStudentsByMajor;
               return `${etcStudents}명`;
             } else if (majorAttendance[label]) {

diff --git a/src/pages/DashboardPage/DashboardStatisticPage/YearChart.jsx b/src/pages/DashboardPage/DashboardStatisticPage/YearChart.jsx
@@ -1,24 +1,23 @@
 import { Doughnut } from 'react-chartjs-2';
 import { Chart as ChartJS, ArcElement, Tooltip, Legend } from 'chart.js';
 import ChartDataLabels from 'chartjs-plugin-datalabels';
-import { ATTENDEE_LIST } from './attendee';
 
 ChartJS.register(ArcElement, Tooltip, Legend, ChartDataLabels);
 
 const YearChart = ({ attendeeList }) => {
   const yearAttendance = {};
   let totalCompletedStudentsByYear = 0;
 
-  attendeeList.eventRatioDetailResponseDtos.forEach((student) => {
-    // if (student.completion) {
-    totalCompletedStudentsByYear++;
-    const year = String(student.studentNumber).substring(0, 2);
-    if (yearAttendance[year]) {
-      yearAttendance[year]++;
-    } else {
-      yearAttendance[year] = 1;
+  attendeeList.eventStatisticDetailResponseDtos.forEach((student) => {
+    if (student.completion) {
+      totalCompletedStudentsByYear++;
+      const year = String(student.studentNumber).substring(0, 2);
+      if (yearAttendance[year]) {
+        yearAttendance[year]++;
+      } else {
+        yearAttendance[year] = 1;
+      }
     }
-    // }
   });
 
   const sortedYearAttendance = Object.entries(yearAttendance).sort(

diff --git a/src/pages/DashboardPage/DashboardStatisticPage/attendee.js b/src/pages/DashboardPage/DashboardStatisticPage/attendee.js
diff --git a/src/services/attendanceService/attendanceService.js b/src/services/attendanceService/attendanceService.js
@@ -13,7 +13,7 @@ export const getAttendanceCheck = async ({ eventId }, params) => {
 
 export const postAttendanceSign = async ({ eventId, studentInfoId }, body) => {
   await axiosInstance.post(
-    `/api/v1/attendance/sign/${eventId}/${studentInfoId}`,
+    `/api/v1/attendance/check/sign/${eventId}/${studentInfoId}`,
     body,
     {
       headers: {