[EC-234 FE/refactor 마무리 수정 (#245)

* [EC-234] feat: 유고결석 신청일자 기간내인지 유효성 검증

* [EC-234] fix: 프론트 유고 결석 신청시 예외 메세지 처리

* [EC-234] feat: 유고결석 중복 신청 검증

* [EC-234] feat: 프론트엔드 유고결석 신청 유효성 검증

* [EC-234] feat: 처리된 유고 결석 신청은 취소 불가 예외 처리

* [EC-234] style: FE input box 폰트 적용

Author: devyejin

api/src/main/java/org/example/educheck/domain/absenceattendance/repository/AbsenceAttendanceRepository.java

@@ -2,12 +2,16 @@
 
 import org.example.educheck.domain.absenceattendance.dto.response.MyAbsenceAttendanceResponseDto;
 import org.example.educheck.domain.absenceattendance.entity.AbsenceAttendance;
+import org.example.educheck.domain.course.entity.Course;
+import org.example.educheck.domain.member.student.entity.Student;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.time.LocalDate;
+
 public interface AbsenceAttendanceRepository extends JpaRepository<AbsenceAttendance, Long> {
     Page<AbsenceAttendance> findByCourseId(Long courseId, Pageable pageable);
 
@@ -21,4 +25,5 @@ public interface AbsenceAttendanceRepository extends JpaRepository<AbsenceAttend
                     "WHERE a.course.id = :courseId AND a.student.id = :studentId")
     Page<MyAbsenceAttendanceResponseDto> findByStudentIdAndCourseId(@Param("studentId") Long studentId, @Param("courseId") Long courseId, Pageable pageable);
 
+    boolean existsByStudentAndCourseAndStartTimeLessThanEqualAndEndTimeGreaterThanEqual(Student student, Course course, LocalDate endDate, LocalDate startDate);
 }

api/src/main/java/org/example/educheck/domain/absenceattendance/service/AbsenceAttendanceService.java

@@ -11,6 +11,7 @@
 import org.example.educheck.domain.absenceattendanceattachmentfile.dto.response.AttachmentFileReposeDto;
 import org.example.educheck.domain.absenceattendanceattachmentfile.entity.AbsenceAttendanceAttachmentFile;
 import org.example.educheck.domain.absenceattendanceattachmentfile.repository.AbsenceAttendanceAttachmentFileRepository;
+import org.example.educheck.domain.course.entity.Course;
 import org.example.educheck.domain.course.repository.CourseRepository;
 import org.example.educheck.domain.member.entity.Member;
 import org.example.educheck.domain.member.entity.Role;
@@ -29,6 +30,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
@@ -66,6 +68,12 @@ private static void validateModifiable(AbsenceAttendance absenceAttendance) {
         }
     }
 
+    private static void validateAttendanceAbsenceCancellable(AbsenceAttendance absenceAttendance) {
+        if (absenceAttendance.getIsApprove().equals('T') || absenceAttendance.getIsApprove().equals('F')) {
+            throw new InvalidRequestException("처리된 신청 내역은 취소할 수 없습니다.");
+        }
+    }
+
     @Transactional
     @PreAuthorize("hasAnyAuthority('MIDDLE_ADMIN')")
     public void processAbsenceAttendanceService(Long courseId, Long absenceAttendancesId, ProcessAbsenceAttendanceRequestDto requestDto, Member member) {
@@ -114,9 +122,13 @@ public CreateAbsenceAttendanceResponseDto createAbsenceAttendance(Member member,
 
         validateRegistrationCourse(member, courseId);
 
+        Course course = getCourseById(courseId);
+        validateAbsenceAttendanceDate(requestDto.getStartDate(), requestDto.getEndDate(), course);
+        validateDuplicateAbsenceAttendance(member, course, requestDto.getStartDate(), requestDto.getEndDate());
+
+
         AbsenceAttendance absenceAttendance = AbsenceAttendance.builder()
-                .course(courseRepository.findById(courseId)
-                        .orElseThrow(() -> new ResourceNotFoundException("해당 교육 과정을 찾을 수 없습니다.")))
+                .course(course)
                 .student(member.getStudent())
                 .startTime(requestDto.getStartDate())
                 .endTime(requestDto.getEndDate())
@@ -131,6 +143,30 @@ public CreateAbsenceAttendanceResponseDto createAbsenceAttendance(Member member,
         return CreateAbsenceAttendanceResponseDto.from(savedAbsenceAttendance);
     }
 
+    private void validateDuplicateAbsenceAttendance(Member member, Course course, LocalDate startDate, LocalDate endDate) {
+        boolean isDuplicate = absenceAttendanceRepository.existsByStudentAndCourseAndStartTimeLessThanEqualAndEndTimeGreaterThanEqual(
+                member.getStudent(), course, endDate, startDate);
+
+        if (isDuplicate) {
+            throw new InvalidRequestException("해당 기간에 이미 유고결석 신청이 존재합니다.");
+        }
+    }
+
+    private void validateAbsenceAttendanceDate(LocalDate startDate, LocalDate endDate, Course course) {
+        if (startDate.isBefore(course.getStartDate()) || endDate.isAfter(course.getEndDate())) {
+            throw new InvalidRequestException("유고결석 신청 기간은 교육 과정 기간 내에 있어야 합니다.");
+        }
+
+        if (startDate.isAfter(endDate)) {
+            throw new InvalidRequestException("유고결석 시작일은 종료일보다 이후일 수 없습니다.");
+        }
+    }
+
+    private Course getCourseById(Long courseId) {
+        return courseRepository.findById(courseId)
+                .orElseThrow(() -> new ResourceNotFoundException("해당 교육 과정을 찾을 수 없습니다."));
+    }
+
     private void saveAttachmentFiles(MultipartFile[] files, AbsenceAttendance savedAbsenceAttendance) {
         log.info("첨부파일 저장 로직 동작");
         if (files != null && files.length > 0) {
@@ -178,14 +214,14 @@ public void cancelAttendanceAbsence(Member member, Long absenceAttendancesId) {
 
         AbsenceAttendance absenceAttendance = getAbsenceAttendance(absenceAttendancesId);
         validateMatchApplicant(member, absenceAttendance);
+        validateAttendanceAbsenceCancellable(absenceAttendance);
 
         markAttachementFilesForDeletion(absenceAttendance);
 
         absenceAttendance.markDeletionRequested();
         absenceAttendanceRepository.save(absenceAttendance);
     }
 
-
     @Transactional
     public UpdateAbsenceAttendanceReponseDto updateAttendanceAbsence(Member member, Long absenceAttendancesId, UpdateAbsenceAttendacneRequestDto requestDto, MultipartFile[] files) {
 

api/src/main/java/org/example/educheck/domain/studentCourseAttendance/service/StudentCourseAttendanceService.java

@@ -164,7 +164,6 @@ public TodayAttendanceResponseDto getTodayAttendances(Long courseId, Member memb
                 .map(TodayAttendanceStatus::from)
                 .toList();
 
-        //getAttendanceStatus() 를 기준으로 그룹화하고, 각 상태별 개수를 Map<String, Long> 형태로 저장
         Map<String, Long> statusCounts = studentRecords.stream()
                 .collect(Collectors.groupingBy(TodayAttendanceStatus::getStatus, Collectors.counting()));
 

api/src/main/java/org/example/educheck/global/common/exception/custom/common/InvalidRequestException.java

@@ -3,9 +3,6 @@
 import org.example.educheck.global.common.exception.ErrorCode;
 
 public class InvalidRequestException extends GlobalException {
-    public InvalidRequestException(ErrorCode errorCode) {
-        super(errorCode);
-    }
 
     public InvalidRequestException() {
         super(ErrorCode.INVALID_INPUT, ErrorCode.INVALID_INPUT.getMessage());

client/src/css/index.css

@@ -98,6 +98,11 @@ form input {
   font-family: Pretendard, 'Pretendard Variable', 'Noto Sans KR', sans-serif;
 }
 
+input {
+  border: none;
+  font-family: Pretendard, 'Pretendard Variable', 'Noto Sans KR', sans-serif;
+}
+
 ol,
 ul,
 li {

client/src/pages/staffStudentManage/StaffStudentManage.jsx

@@ -102,7 +102,6 @@ export default function StaffStudentManage() {
         updatedBirthday.day = '';
       }
 
-
       return updatedBirthday;
     });
   };
@@ -207,8 +206,14 @@ export default function StaffStudentManage() {
   return (
     <>
       <div>
-        <MainButton title="학습자 등록" handleClick={() => setOpenModal(true)} isEnable={true} />
         <div className={styles.studentsBox}>
+          <div>
+            <MainButton
+              title="학습자 등록"
+              handleClick={() => setOpenModal(true)}
+              isEnable={true}
+            />
+          </div>
           {students.map((student) => (
             <BaseListItem
               key={student.memberId}

client/src/pages/studentAttendanceAbsence/StudentAttendanceAbsence.jsx

@@ -242,11 +242,18 @@ export default function StudentAttendanceAbsence() {
       reason: uploadData.reason,
     };
 
+    if (new Date(jsonData.endDate) < new Date(jsonData.startDate)) {
+      alert('유고결석 종료일이 시작일 이전일 수 없습니다.');
+      return;
+    }
+
     formData.append('data', new Blob([JSON.stringify(jsonData)], { type: 'application/json' }));
 
-    files.forEach((file) => {
-      formData.append('files', file);
-    });
+    if (files && files.length > 0) {
+      files.forEach((file) => {
+        formData.append('files', file);
+      });
+    }
 
     try {
       const response = await absenceAttendancesApi.submitAbsenceAttendance(courseId, formData);
@@ -258,7 +265,7 @@ export default function StudentAttendanceAbsence() {
         }
       }
     } catch (error) {
-      console.error(error);
+      alert(error.response?.data?.message || error.message);
     }
   };
 

client/src/pages/studentAttendanceAbsence/StudentAttendanceAbsence.module.css

@@ -65,6 +65,7 @@
 
 .reason {
   height: 200px;
+  font-family: Pretendard, 'Pretendard Variable', 'Noto Sans KR', sans-serif;
 }
 
 .submitButton {