@@ -62,7 +62,7 @@ public void saveOrUpdateAttendance(String username, AttendanceBulkRequestDto req
6262 Teacher teacher = teacherService .authenticate (username );
6363 Classroom classroom = classroomService .findClassroom (requestDto .getYear (), requestDto .getGrade (), requestDto .getClassNumber (), teacher .getId ());
6464
65- if (classroom .getTeacher () != teacher ) {
65+ if (classroom .getTeacher () != teacher ) {
6666 throw new CustomException (HANDLE_ACCESS_DENIED );
6767 }
6868
@@ -146,7 +146,7 @@ public List<StudentAttendanceResDto> getAttendances(String username, int year, i
146146 .build ())
147147 .toList ();
148148
149- return StudentAttendanceResDto .toDto ( cs ,
149+ return StudentAttendanceResDto .toDto (cs ,
150150 attendances .isEmpty () ? Attendance .builder ().student (student ).build () : attendances .getFirst (),
151151 dailyAttendanceDtos
152152 );
@@ -248,14 +248,17 @@ public AttendanceFeedbackResDto saveFeedback(String username, int year, int grad
248248
249249 // [교사] 출결 피드백 수정
250250 @ Transactional
251- public AttendanceFeedbackResDto updateFeedback (String username , Long feedBackId , AttendanceFeedbackReqDto requestDto ) {
251+ public AttendanceFeedbackResDto updateFeedback (String username , int year , int grade , int classNum , int number , AttendanceFeedbackReqDto requestDto ) {
252252
253253 Teacher teacher = teacherService .authenticate (username );
254254
255- AttendanceFeedback feedback = feedbackRepository .findById (feedBackId )
256- .orElseThrow (() -> new CustomException (ErrorCode .DATA_NOT_FOUND ));
255+ ClassroomStudent classroomStudent = checkValidate (username , year , grade , classNum , number );
256+
257+ AttendanceFeedback feedback = feedbackRepository .findByClassroomStudent (classroomStudent ).orElseThrow (
258+ () -> new CustomException (ErrorCode .DATA_NOT_FOUND )
259+ );
257260
258- if (feedback .getClassroomStudent ().getClassroom ().getTeacher () != teacher ){
261+ if (feedback .getClassroomStudent ().getClassroom ().getTeacher () != teacher ) {
259262 throw new CustomException (HANDLE_ACCESS_DENIED );
260263 }
261264 feedback .updateContent (requestDto .getFeedback ());
@@ -319,7 +322,7 @@ private ClassroomStudent checkValidate(String username, int year, int grade, int
319322 .orElseThrow (() -> new CustomException (CLASSROOM_NOT_FOUND ));
320323
321324 // 자녀가 아니면 접근 불가함.
322- if (!student .getId ().equals (classroomStudent .getStudent ().getId ())){
325+ if (!student .getId ().equals (classroomStudent .getStudent ().getId ())) {
323326 throw new CustomException (HANDLE_ACCESS_DENIED );
324327 }
325328
0 commit comments