Merge pull request #297 from Bamdoliro/feat/#296

원서접수 subjectList 누락 버그 & accessToken undefined 버그 수정

Author: SEOKKAMONI

apps/user/src/apis/token/refresh.ts

@@ -1,4 +1,4 @@
-import { TOKEN, ROUTES } from '@/constants/common/constant';
+import { ROUTES, TOKEN } from '@/constants/common/constant';
 import { maru } from '../instance/instance';
 import { Storage } from '../storage/storage';
 
@@ -9,7 +9,7 @@ const refreshToken = async () => {
                 'Refresh-Token': `${Storage.getItem(TOKEN.REFRESH)}`,
             },
         });
-        Storage.setItem(TOKEN.ACCESS, data.accessToken);
+        Storage.setItem(TOKEN.ACCESS, data.data.accessToken);
     } catch {
         window.location.href = ROUTES.LOGIN;
         alert('다시 로그인 해주세요');

apps/user/src/app/form/성적입력/성적입력.hooks.ts

@@ -1,23 +1,14 @@
 import { useSaveFormMutation } from '@/services/form/mutations';
-import {
-    useSetFormStepStore,
-    useNewSubjectValueStore,
-    useSubjectValueStore,
-    useFormValueStore,
-} from '@/store';
+import { useFormValueStore, useSetFormStepStore } from '@/store';
 
 export const useCTAButton = () => {
     const form = useFormValueStore();
     const setFormStep = useSetFormStepStore();
-    const newSubjectList = useNewSubjectValueStore();
-    const subjectList = useSubjectValueStore();
     const { saveFormMutate } = useSaveFormMutation();
 
-    const studentSubjectList = [...subjectList, ...newSubjectList].map(({ id, ...rest }) => rest);
-
     const handleNextButtonClick = () => {
         setFormStep('자기소개서');
-        saveFormMutate({ ...form, grade: { ...form.grade, subjectList: studentSubjectList } });
+        saveFormMutate(form);
     };
 
     const handlePreviousButtonClick = () => {

apps/user/src/components/form/Calculators/GradeCalculator/GradeCalculator.tsx

@@ -1,4 +1,4 @@
-import { useNewSubjectStore, useSubjectStore } from '@/store';
+import { useNewSubjectStore, useSetFormStore, useSubjectStore } from '@/store';
 import { Subject } from '@/types/form/client';
 import { color, font } from '@maru/theme';
 import { Button, Column } from '@maru/ui';
@@ -12,6 +12,7 @@ import NewGradeCalculatorItem from './NewGradeCalculatorItem/NewGradeCalculatorI
 const GradeCalculator = () => {
     const [newSubjectList, setNewSubjectList] = useNewSubjectStore();
     const [subjectList, setSubjectList] = useSubjectStore();
+    const setForm = useSetFormStore();
     const footerRef = useRef<HTMLDivElement>(null);
     const isMount = useRef(true);
 
@@ -35,6 +36,14 @@ const GradeCalculator = () => {
         if (newSubjectList.length) footerRef.current?.scrollIntoView();
     }, [newSubjectList]);
 
+    useEffect(() => {
+        const studentSubjectList = [...subjectList, ...newSubjectList].map(
+            ({ id, ...rest }) => rest,
+        );
+
+        setForm((prev) => ({ ...prev, grade: { ...prev.grade, subjectList: studentSubjectList } }));
+    }, [newSubjectList, subjectList]);
+
     return (
         <StyledGradeCalculator>
             <Desc>

apps/user/src/components/form/ProfileUploader/ProfileUploader.tsx

@@ -91,7 +91,7 @@ const ProfileUploader = () => {
                 </Button>
             )}
             <Desc>
-                20MB 이하, 3개월 이내의
+                10MB 이하, 3개월 이내의
                 <br />
                 3x4 cm 증명사진
             </Desc>