Merge pull request #76 from INU-Software-Design/NEEIS-67-feature/grade-page

⬆️ update : 자잘한 수정사항들 업데이트

Author: yereong

package-lock.json

@@ -22,7 +22,20 @@ jest.mock("@/store/grade-filter-store", () => ({
   default: () => ({
     year: "2025",
     semester: "1",
-    subject: "수학",
+    subject: "독서와 문법",
+  }),
+}));
+jest.mock("@/store/teacher-store", () => ({
+  __esModule: true,
+  default: () => ({
+    mysubject: "독서와 문법",
+    setSubject: jest.fn(),
+    setGrade: jest.fn(),
+    setTeacherName: jest.fn(),
+    setClassNumber: jest.fn(),
+    grade: "1",
+    classNumber: "1",
+    teacherName: "김철수",
   }),
 }));
 
@@ -106,8 +119,11 @@ jest.mock("@/components/shared/Header", () => ({
 
 describe("<GradesPage /> 실제 EvalAddModal/EvalAddForm 테스트", () => {
   beforeEach(() => {
-    jest.clearAllMocks();
+  Object.defineProperty(window, "location", {
+    configurable: true,
+    value: { reload: jest.fn() } as any,
   });
+});
 
   it("handleAddEval에서 평가명 없이 추가 시 alert가 호출된다", async () => {
     window.alert = jest.fn();
@@ -119,6 +135,7 @@ describe("<GradesPage /> 실제 EvalAddModal/EvalAddForm 테스트", () => {
     });
   });
 
+
   it("handleAddEval에서 PostEval 실패 시 alert가 호출된다", async () => {
     (PostEval as jest.Mock).mockRejectedValueOnce(new Error("fail"));
     window.alert = jest.fn();
@@ -316,7 +333,7 @@ it("handleInputBlur에서 빈 문자열 입력 시 score가 undefined로 설정
     fireEvent.click(screen.getByText("추가"));
     await waitFor(() => {
       expect(PostEval).toHaveBeenCalledWith(
-        "수학", // subject from mock store
+        "독서와 문법", // subject from mock store
         2025, // year from mock store
         1, // semester from mock store
         1, // grade from mock store
@@ -400,7 +417,7 @@ it("404 fallback fetch에서 studentList의 studentId와 name이 없으면 '-'
   fireEvent.click(screen.getByText("추가"));
   await waitFor(() => {
     expect(PostEval).toHaveBeenCalledWith(
-      "수학", 2025, 1, 1, "WRITTEN", "새로운 평가", 0, 0 // Number(null) === 0
+      "독서와 문법", 2025, 1, 1, "WRITTEN", "새로운 평가", 0, 0 // Number(null) === 0
     );
   });
 });

src/__test__/grade/GradesPage.test.tsx

@@ -0,0 +1,56 @@
+// __tests__/store/useTeacher.test.ts
+import { act } from "@testing-library/react";
+import useTeacher from "@/store/teacher-store";
+
+describe("useTeacher zustand store", () => {
+  beforeEach(() => {
+    // Zustand store를 초기화
+    const { getState, setState } = useTeacher;
+    setState({
+      grade: "1",
+      classNumber: "1",
+      teacherName: "김철수",
+      mysubject: "독서와 문법",
+      setGrade: getState().setGrade,
+      setClassNumber: getState().setClassNumber,
+      setTeacherName: getState().setTeacherName,
+      setSubject: getState().setSubject,
+    });
+  });
+
+  it("초기값이 올바르게 설정된다", () => {
+    const state = useTeacher.getState();
+    expect(state.grade).toBe("1");
+    expect(state.classNumber).toBe("1");
+    expect(state.teacherName).toBe("김철수");
+    expect(state.mysubject).toBe("독서와 문법");
+  });
+
+  it("setGrade로 grade가 변경된다", () => {
+    act(() => {
+      useTeacher.getState().setGrade("3");
+    });
+    expect(useTeacher.getState().grade).toBe("3");
+  });
+
+  it("setClassNumber로 classNumber가 변경된다", () => {
+    act(() => {
+      useTeacher.getState().setClassNumber("2");
+    });
+    expect(useTeacher.getState().classNumber).toBe("2");
+  });
+
+  it("setTeacherName으로 teacherName이 변경된다", () => {
+    act(() => {
+      useTeacher.getState().setTeacherName("이영희");
+    });
+    expect(useTeacher.getState().teacherName).toBe("이영희");
+  });
+
+  it("setSubject로 mysubject가 변경된다", () => {
+    act(() => {
+      useTeacher.getState().setSubject("영어1");
+    });
+    expect(useTeacher.getState().mysubject).toBe("영어1");
+  });
+});

src/__test__/grade/useTeacher.test.ts

@@ -16,7 +16,7 @@ const BehaviorContent = () => {
     const getBehavior = async () => {
       try {
         const token = localStorage.getItem("accessToken");
-        const res = await axios.get(`${process.env.NEXT_PUBLIC_BACKEND_DOMAIN}/behavior?year=${year}&grade=${grade}&classNum=${classNumber}&studentId=${studentId}`, {
+        const res = await axios.get(`${process.env.NEXT_PUBLIC_BACKEND_DOMAIN}/behavior?year=${year}&grade=${grade}&classNum=${classNumber}&number=${studentId}`, {
           headers: { Authorization: `Bearer ${token}` },
         });
         const data = res.data.response;

src/components/behavior/BehaviorContent.tsx

@@ -124,7 +124,7 @@ function EditableCell({
       {isEditing ? (
         <input
           type="number"
-          className="w-16 border rounded px-1 py-0.5"
+          className="w-8 border-none rounded px-1 py-0.5 no-spinner "
           value={inputValue}
           onChange={handleInputChange}
           onBlur={handleInputBlur}

src/components/grade/GradeTable.tsx

@@ -12,7 +12,7 @@ import { GetStudentList } from "@/api/getStudentList";
 import { mapApiResponseToStudents, convertToApiFormat, Evaluation } from "@/utils/gradeUtils";
 import useStudentFilterStore from "@/store/student-filter-store";
 import useGradeFilterStore from "@/store/grade-filter-store";
-
+import useTeacher from "@/store/teacher-store";
 export default function GradesPage() {
   const { grade, classNumber, studentNumber } = useStudentFilterStore();
   const { year, semester, subject } = useGradeFilterStore();
@@ -22,6 +22,7 @@ export default function GradesPage() {
   const [inputValue, setInputValue] = useState<string>("");
   const [evaluations, setEvaluations] = useState<Evaluation[]>([]);
   const [showEvalInput, setShowEvalInput] = useState(false);
+  const mysubject = useTeacher().mysubject;
   const [evalInput, setEvalInput] = useState<{
     title: string;
     examType: "WRITTEN" | "PRACTICAL";
@@ -102,13 +103,16 @@ export default function GradesPage() {
 
   const handleSave = async (e: React.MouseEvent<HTMLButtonElement>) => {
     e.preventDefault();
+    if(subject != mysubject ){ 
+      alert(`본인의 과목인 ${mysubject}만 수정가능합니다.`)
+    }else{
     const payload = convertToApiFormat(students, evaluations, Number(classNumber));
     try {
       await PostScore(payload);
       window.location.reload();
     } catch {
       alert("저장에 실패했습니다. 다시 시도해주세요.");
-    }
+    }}
   };
 
   const handleAddEval = async () => {

src/pages/grade/index.tsx

@@ -4,6 +4,7 @@ import { useRouter } from "next/navigation";
 import { PostLogin } from "@/api/postLogin";
 import useLoginStore from "@/store/login-store";
 import useStudent from "@/store/student-store";
+import useTeacher from "@/store/teacher-store";
 import { messaging, getToken } from "@/utils/firebase";
 import { PostFCM } from "@/api/postFCM";
 
@@ -13,7 +14,7 @@ const Login = () => {
   const [password, setPassword] = useState<string>("");
   const { setName } = useLoginStore();
   const { setGrade, setClassNumber, setStudentNumber, setStudentId, setStudentName } = useStudent();
-  
+  const { setTeacherName, setSubject } = useTeacher();
   const handleUserIdChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
     setUserId(e.target.value);
   };
@@ -68,6 +69,8 @@ const Login = () => {
       localStorage.setItem("accessToken", accessToken);
       sendFcmTokenToServer();
       if (role === "TEACHER") {
+        setTeacherName(data.name);
+        setSubject(data.subject);
         router.push("/student-record");
       } else if (role === "STUDENT") {
         router.push("/student/student-record");

src/pages/index.tsx

@@ -0,0 +1,27 @@
+import { create } from "zustand";
+
+interface ITeacher {
+  grade: string;
+  classNumber: string;
+  teacherName: string;
+  mysubject: string;
+
+  setGrade: (grade: string) => void;
+  setClassNumber: (classNumber: string) => void; 
+  setTeacherName: (name: string) => void;
+  setSubject: (mysubject: string) => void;
+}
+
+const useTeacher = create<ITeacher>((set) => ({
+  grade: "1",
+  classNumber: "1",
+  teacherName: "김철수",
+  mysubject: "독서와 문법",
+
+  setGrade: (grade: string) => set({ grade }),
+  setClassNumber: (classNumber: string) => set({ classNumber }),
+  setTeacherName: (teacherName: string) => set({ teacherName }),
+  setSubject: (mysubject: string) => set({ mysubject })
+}));
+
+export default useTeacher;