[EC-240] fix: 유효성 검증 로직 수정 (#249)

devyejin · web-flow · commit 350bd9569228 · 2025-04-04T17:41:00.000+09:00
diff --git a/api/src/main/java/org/example/educheck/domain/absenceattendance/repository/AbsenceAttendanceRepository.java b/api/src/main/java/org/example/educheck/domain/absenceattendance/repository/AbsenceAttendanceRepository.java
@@ -26,4 +26,9 @@ public interface AbsenceAttendanceRepository extends JpaRepository<AbsenceAttend
     Page<MyAbsenceAttendanceResponseDto> findByStudentIdAndCourseId(@Param("studentId") Long studentId, @Param("courseId") Long courseId, Pageable pageable);
 
     boolean existsByStudentAndCourseAndStartTimeLessThanEqualAndEndTimeGreaterThanEqual(Student student, Course course, LocalDate endDate, LocalDate startDate);
+
+    boolean existsByStudentAndCourseAndStartTimeLessThanEqualAndEndTimeGreaterThanEqualAndDeletionRequestedAtIsNull(
+            Student student, Course course, LocalDate endDate, LocalDate startDate
+    );
+
 }
diff --git a/api/src/main/java/org/example/educheck/domain/absenceattendance/service/AbsenceAttendanceService.java b/api/src/main/java/org/example/educheck/domain/absenceattendance/service/AbsenceAttendanceService.java
@@ -147,9 +147,10 @@ public CreateAbsenceAttendanceResponseDto createAbsenceAttendance(Member member,
     }
 
     private void validateDuplicateAbsenceAttendance(Member member, Course course, LocalDate startDate, LocalDate endDate) {
-        boolean isDuplicate = absenceAttendanceRepository.existsByStudentAndCourseAndStartTimeLessThanEqualAndEndTimeGreaterThanEqual(
-                member.getStudent(), course, endDate, startDate);
+//        boolean isDuplicate = absenceAttendanceRepository.existsByStudentAndCourseAndStartTimeLessThanEqualAndEndTimeGreaterThanEqual(
+//                member.getStudent(), course, endDate, startDate);
 
+        boolean isDuplicate = absenceAttendanceRepository.existsByStudentAndCourseAndStartTimeLessThanEqualAndEndTimeGreaterThanEqualAndDeletionRequestedAtIsNull(member.getStudent(), course, endDate, startDate);
         if (isDuplicate) {
             throw new InvalidRequestException("해당 기간에 이미 유고결석 신청이 존재합니다.");
         }

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,9 @@ public interface AbsenceAttendanceRepository extends JpaRepository<AbsenceAttend`
`26`	`26`	`Page<MyAbsenceAttendanceResponseDto> findByStudentIdAndCourseId(@Param("studentId") Long studentId, @Param("courseId") Long courseId, Pageable pageable);`
`27`	`27`
`28`	`28`	`boolean existsByStudentAndCourseAndStartTimeLessThanEqualAndEndTimeGreaterThanEqual(Student student, Course course, LocalDate endDate, LocalDate startDate);`
	`29`	`+`
	`30`	`+ boolean existsByStudentAndCourseAndStartTimeLessThanEqualAndEndTimeGreaterThanEqualAndDeletionRequestedAtIsNull(`
	`31`	`+ Student student, Course course, LocalDate endDate, LocalDate startDate`
	`32`	`+ );`
	`33`	`+`
`29`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,9 +147,10 @@ public CreateAbsenceAttendanceResponseDto createAbsenceAttendance(Member member,`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`private void validateDuplicateAbsenceAttendance(Member member, Course course, LocalDate startDate, LocalDate endDate) {`
`150`		`- boolean isDuplicate = absenceAttendanceRepository.existsByStudentAndCourseAndStartTimeLessThanEqualAndEndTimeGreaterThanEqual(`
`151`		`- member.getStudent(), course, endDate, startDate);`
	`150`	`+// boolean isDuplicate = absenceAttendanceRepository.existsByStudentAndCourseAndStartTimeLessThanEqualAndEndTimeGreaterThanEqual(`
	`151`	`+// member.getStudent(), course, endDate, startDate);`
`152`	`152`
	`153`	`+ boolean isDuplicate = absenceAttendanceRepository.existsByStudentAndCourseAndStartTimeLessThanEqualAndEndTimeGreaterThanEqualAndDeletionRequestedAtIsNull(member.getStudent(), course, endDate, startDate);`
`153`	`154`	`if (isDuplicate) {`
`154`	`155`	`throw new InvalidRequestException("해당 기간에 이미 유고결석 신청이 존재합니다.");`
`155`	`156`	`}`