[EC-62] feat: 유고 결석 신청 처리 API 구현 (#49)

ysc13245 · web-flow · commit cfa3cf546c4f · 2025-03-22T23:11:37.000+09:00
* [EC-62] feat: AbsenceAttendance controller, service, repository 생성

* [EC-62] feat: AbsenceAttendance 클래스 멤버 변수 타입 변경
bool -&gt;

* [EC-62] feat: 유고 결석 신청 처리 기능 구현

* [EC-62] feat: 유고 결석 신청 처리 예외 처리
- 권한 체크
- 요청 body 형태가 잘못된 경우 예외 처리
- 패스 파라미터의 코스 id와 유고결석의 코스id가 일치하지 않을 경우 예외 처리
diff --git a/api/src/main/java/org/example/educheck/domain/absenceattendance/controller/AbsenceAttendanceController.java b/api/src/main/java/org/example/educheck/domain/absenceattendance/controller/AbsenceAttendanceController.java
@@ -0,0 +1,29 @@
+package org.example.educheck.domain.absenceattendance.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.example.educheck.domain.absenceattendance.dto.request.ProcessAbsenceAttendanceRequestDto;
+import org.example.educheck.domain.absenceattendance.service.AbsenceAttendanceService;
+import org.example.educheck.domain.member.entity.Member;
+import org.example.educheck.global.common.dto.ApiResponse;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("api/course/{courseId}/absence-attendances")
+public class AbsenceAttendanceController {
+    private final AbsenceAttendanceService absenceAttendanceService;
+
+
+    @PatchMapping("/{absesnceAttendancesId}")
+    public ResponseEntity<ApiResponse<Void>> processAbsenceAttendanceService(@PathVariable Long courseId, @PathVariable Long absesnceAttendancesId,
+                                                                             @RequestBody ProcessAbsenceAttendanceRequestDto requestDto,
+                                                                             @AuthenticationPrincipal Member member) {
+
+        absenceAttendanceService.processAbsenceAttendanceService(courseId, absesnceAttendancesId, requestDto, member);
+
+        return ResponseEntity.status(HttpStatus.OK).body(ApiResponse.ok("유고 결석 처리 성공", "OK", null));
+    }
+}
diff --git a/api/src/main/java/org/example/educheck/domain/absenceattendance/dto/request/ProcessAbsenceAttendanceRequestDto.java b/api/src/main/java/org/example/educheck/domain/absenceattendance/dto/request/ProcessAbsenceAttendanceRequestDto.java
@@ -0,0 +1,14 @@
+package org.example.educheck.domain.absenceattendance.dto.request;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProcessAbsenceAttendanceRequestDto {
+    @JsonProperty("isApprove")
+    private boolean isApprove;
+}
diff --git a/api/src/main/java/org/example/educheck/domain/absenceattendance/entity/AbsenceAttendance.java b/api/src/main/java/org/example/educheck/domain/absenceattendance/entity/AbsenceAttendance.java
@@ -4,6 +4,7 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.example.educheck.domain.course.entity.Course;
 import org.example.educheck.domain.member.staff.entity.Staff;
 import org.example.educheck.domain.member.student.entity.Student;
@@ -14,6 +15,7 @@
  * isApprove : T 승인 F 반려 null 대기
  */
 @Getter
+@Setter
 @Entity
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class AbsenceAttendance {
@@ -36,7 +38,7 @@ public class AbsenceAttendance {
 
     private LocalDateTime startTime;
     private LocalDateTime endTime;
-    private char isApprove;
+    private Character isApprove;
     private LocalDateTime approveDate;
     private String reason;
 }
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
@@ -0,0 +1,7 @@
+package org.example.educheck.domain.absenceattendance.repository;
+
+import org.example.educheck.domain.absenceattendance.entity.AbsenceAttendance;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface AbsenceAttendanceRepository extends JpaRepository<AbsenceAttendance, Long> {
+}
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
@@ -0,0 +1,53 @@
+package org.example.educheck.domain.absenceattendance.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.example.educheck.domain.absenceattendance.dto.request.ProcessAbsenceAttendanceRequestDto;
+import org.example.educheck.domain.absenceattendance.entity.AbsenceAttendance;
+import org.example.educheck.domain.absenceattendance.repository.AbsenceAttendanceRepository;
+import org.example.educheck.domain.member.entity.Member;
+import org.example.educheck.domain.member.repository.StaffRepository;
+import org.example.educheck.domain.member.staff.entity.Staff;
+import org.example.educheck.global.common.exception.custom.common.ResourceMismatchException;
+import org.example.educheck.global.common.exception.custom.common.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Slf4j
+public class AbsenceAttendanceService {
+    private final AbsenceAttendanceRepository absenceAttendanceRepository;
+    private final StaffRepository staffRepository;
+
+    @Transactional
+    @PreAuthorize("hasAnyAuthority('MIDDLE_ADMIN')")
+    public void processAbsenceAttendanceService(Long courseId, Long absesnceAttendancesId, ProcessAbsenceAttendanceRequestDto requestDto, Member member) {
+
+
+        AbsenceAttendance absenceAttendance =
+                absenceAttendanceRepository.findById(absesnceAttendancesId)
+                        .orElseThrow(() -> new ResourceNotFoundException("유교 결석 조회 불가"));
+
+        Staff staff =
+                staffRepository.findByMember(member)
+                        .orElseThrow(() -> new ResourceNotFoundException("회원 정보를 찾을 수 없습니다."));
+
+        if (absenceAttendance.getCourse().getId() != courseId) {
+            throw new ResourceMismatchException();
+        }
+
+        absenceAttendance.setStaff(staff);
+        absenceAttendance.setApproveDate(LocalDateTime.now());
+        absenceAttendance.setIsApprove(
+                String.valueOf(
+                                requestDto.isApprove()
+                        )
+                        .toUpperCase().charAt(0)
+        );
+    }
+}
diff --git a/api/src/main/java/org/example/educheck/domain/member/repository/StaffRepository.java b/api/src/main/java/org/example/educheck/domain/member/repository/StaffRepository.java
@@ -1,5 +1,6 @@
 package org.example.educheck.domain.member.repository;
 
+import org.example.educheck.domain.member.entity.Member;
 import org.example.educheck.domain.member.staff.entity.Staff;
 import org.springframework.data.jpa.repository.JpaRepository;
 
@@ -8,4 +9,6 @@
 public interface StaffRepository extends JpaRepository<Staff, Long> {
 
     Optional<Staff> findByMemberId(Long memberId);
+
+    Optional<Staff> findByMember(Member member);
 }
diff --git a/api/src/main/java/org/example/educheck/domain/member/student/entity/Student.java b/api/src/main/java/org/example/educheck/domain/member/student/entity/Student.java
@@ -35,9 +35,10 @@ public class Student {
     private List<Registration> registrations = new ArrayList<>();
 
     @Builder
-    public Student(Member member, Status status, char courseParticipationStatus) {
+    public Student(Member member, Status status, char courseParticipationStatus, List<Registration> registrations) {
         this.member = member;
         this.status = status;
         this.courseParticipationStatus = courseParticipationStatus;
+        this.registrations = registrations;
     }
 }
diff --git a/api/src/main/java/org/example/educheck/global/common/exception/handler/GlobalExceptionHandler.java b/api/src/main/java/org/example/educheck/global/common/exception/handler/GlobalExceptionHandler.java
@@ -5,6 +5,7 @@
 import org.example.educheck.global.common.exception.custom.LoginValidationException;
 import org.example.educheck.global.common.exception.custom.common.GlobalException;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.MissingRequestCookieException;
@@ -52,10 +53,21 @@ public ResponseEntity<ApiResponse<Object>> methodArgumentNotValidHandler(
     }
 
     @ExceptionHandler(MissingRequestCookieException.class)
-    public ResponseEntity<ApiResponse<Object>> missingRequestCookieException(MissingRequestCookieException ex) {
+    public ResponseEntity<ApiResponse<Object>> handleMissingRequestCookieException(MissingRequestCookieException ex) {
+
         return ResponseEntity
                 .status(ErrorCode.UNAUTHORIZED.getStatus())
                 .body(ApiResponse.error(ErrorCode.UNAUTHORIZED.getMessage(),
                         ErrorCode.UNAUTHORIZED.getCode()));
+
+    }
+
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    public ResponseEntity<ApiResponse<Object>> handleHttpMessageNotReadableException(HttpMessageNotReadableException ex) {
+
+        return ResponseEntity
+                .status(ErrorCode.INVALID_INPUT.getStatus())
+                .body(ApiResponse.error(ErrorCode.INVALID_INPUT.getMessage(),
+                        ErrorCode.INVALID_INPUT.getCode()));
     }
 }
diff --git a/api/src/main/java/org/example/educheck/global/security/config/SecurityConfig.java b/api/src/main/java/org/example/educheck/global/security/config/SecurityConfig.java
@@ -7,6 +7,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -17,6 +18,7 @@
 @EnableWebSecurity
 @Configuration
 @RequiredArgsConstructor
+@EnableGlobalMethodSecurity(prePostEnabled = true)
 public class SecurityConfig {
     private final JwtAuthenticationFilter jwtAuthenticationFilter;
     private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
diff --git a/api/src/main/java/org/example/educheck/global/security/jwt/JwtTokenUtil.java b/api/src/main/java/org/example/educheck/global/security/jwt/JwtTokenUtil.java
@@ -6,6 +6,7 @@
 import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.security.Keys;
 import jakarta.annotation.PostConstruct;
+import org.example.educheck.global.common.exception.custom.LoginValidationException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
@@ -45,7 +46,7 @@ private String createToken(Authentication authentication, long validityMilliSeco
             field.setAccessible(true);
             email = field.get(principal).toString();
         } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new RuntimeException(e);
+            throw new LoginValidationException();
         }
         Claims claims = Jwts.claims().setSubject(email);
         claims.put("roles", authentication.getAuthorities()

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,10 @@ public class Student {`
`35`	`35`	`private List<Registration> registrations = new ArrayList<>();`
`36`	`36`
`37`	`37`	`@Builder`
`38`		`- public Student(Member member, Status status, char courseParticipationStatus) {`
	`38`	`+ public Student(Member member, Status status, char courseParticipationStatus, List<Registration> registrations) {`
`39`	`39`	`this.member = member;`
`40`	`40`	`this.status = status;`
`41`	`41`	`this.courseParticipationStatus = courseParticipationStatus;`
	`42`	`+ this.registrations = registrations;`
`42`	`43`	`}`
`43`	`44`	`}`