Merge pull request #282 from prgrms-web-devcourse-final-project/refactor/EA3-205-attendance

[EA3-205] refactor: 출석 기능 리팩터링

Author: hyeunS-P

src/main/java/grep/neogulcoder/domain/attendance/controller/AttendanceController.java

@@ -5,6 +5,7 @@
 import grep.neogulcoder.global.auth.Principal;
 import grep.neogulcoder.global.response.ApiResponse;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,17 +17,17 @@ public class AttendanceController implements AttendanceSpecification {
     private final AttendanceService attendanceService;
 
     @GetMapping
-    public ApiResponse<AttendanceInfoResponse> getAttendances(@PathVariable("studyId") Long studyId,
-                                                              @AuthenticationPrincipal Principal userDetails) {
+    public ResponseEntity<ApiResponse<AttendanceInfoResponse>> getAttendances(@PathVariable("studyId") Long studyId,
+                                                                              @AuthenticationPrincipal Principal userDetails) {
         AttendanceInfoResponse attendances = attendanceService.getAttendances(studyId, userDetails.getUserId());
-        return ApiResponse.success(attendances);
+        return ResponseEntity.ok(ApiResponse.success(attendances));
     }
 
     @PostMapping
-    public ApiResponse<Long> createAttendance(@PathVariable("studyId") Long studyId,
+    public ResponseEntity<ApiResponse<Long>> createAttendance(@PathVariable("studyId") Long studyId,
                                               @AuthenticationPrincipal Principal userDetails) {
         Long userId = userDetails.getUserId();
         Long id = attendanceService.createAttendance(studyId, userId);
-        return ApiResponse.success(id);
+        return ResponseEntity.ok(ApiResponse.success(id));
     }
 }

src/main/java/grep/neogulcoder/domain/attendance/controller/AttendanceSpecification.java

@@ -5,13 +5,14 @@
 import grep.neogulcoder.global.response.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.http.ResponseEntity;
 
 @Tag(name = "Attendance", description = "출석 API")
 public interface AttendanceSpecification {
 
     @Operation(summary = "출석 조회", description = "일주일 단위로 출석을 조회합니다.")
-    ApiResponse<AttendanceInfoResponse> getAttendances(Long studyId, Principal userDetails);
+    ResponseEntity<ApiResponse<AttendanceInfoResponse>> getAttendances(Long studyId, Principal userDetails);
 
     @Operation(summary = "출석 체크", description = "스터디에 출석을 합니다.")
-    ApiResponse<Long> createAttendance(Long studyId, Principal userDetails);
+    ResponseEntity<ApiResponse<Long>> createAttendance(Long studyId, Principal userDetails);
 }

src/main/java/grep/neogulcoder/domain/attendance/controller/dto/response/AttendanceInfoResponse.java

@@ -10,10 +10,10 @@
 public class AttendanceInfoResponse {
 
     @Schema(description = "출석일 목록")
-    private List<AttendanceResponse> attendances;
+    private final List<AttendanceResponse> attendances;
 
     @Schema(description = "출석률", example = "50")
-    private int attendanceRate;
+    private final int attendanceRate;
 
     @Builder
     private AttendanceInfoResponse(List<AttendanceResponse> attendances, int attendanceRate) {

src/main/java/grep/neogulcoder/domain/attendance/controller/dto/response/AttendanceResponse.java

@@ -11,13 +11,13 @@
 public class AttendanceResponse {
 
     @Schema(description = "스터디 Id", example = "1")
-    private Long studyId;
+    private final Long studyId;
 
     @Schema(description = "유저 Id", example = "2")
-    private Long userId;
+    private final Long userId;
 
     @Schema(description = "출석일", example = "2025-07-10")
-    private LocalDate attendanceDate;
+    private final LocalDate attendanceDate;
 
     @Builder
     private AttendanceResponse(Long studyId, Long userId, LocalDate attendanceDate) {

src/main/java/grep/neogulcoder/domain/attendance/service/AttendanceService.java

@@ -32,8 +32,7 @@ public class AttendanceService {
     private final StudyMemberRepository studyMemberRepository;
 
     public AttendanceInfoResponse getAttendances(Long studyId, Long userId) {
-        Study study = studyRepository.findByIdAndActivatedTrue(studyId)
-            .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+        Study study = getStudyById(studyId);
 
         List<Attendance> attendances = attendanceRepository.findByStudyIdAndUserId(studyId, userId);
         List<AttendanceResponse> responses = attendances.stream()
@@ -47,23 +46,26 @@ public AttendanceInfoResponse getAttendances(Long studyId, Long userId) {
 
     @Transactional
     public Long createAttendance(Long studyId, Long userId) {
-        Study study = studyRepository.findByIdAndActivatedTrue(studyId)
-            .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
-
+        getStudyById(studyId);
         validateNotAlreadyChecked(studyId, userId);
 
         Attendance attendance = Attendance.create(studyId, userId);
         attendanceRepository.save(attendance);
         return attendance.getId();
     }
 
+    private Study getStudyById(Long studyId) {
+        return studyRepository.findById(studyId)
+            .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+    }
+
     private int getAttendanceRate(Long studyId, Long userId, Study study, List<AttendanceResponse> responses) {
-        LocalDate start = study.getStartDate().toLocalDate();
-        LocalDate participated = studyMemberRepository.findCreatedDateByStudyIdAndUserId(studyId, userId).toLocalDate();
-        LocalDate attendanceStart = start.isAfter(participated) ? start : participated;
-        LocalDate end = study.getEndDate().toLocalDate();
+        LocalDate startDay = study.getStartDate().toLocalDate();
+        LocalDate participatedDay = studyMemberRepository.findCreatedDateByStudyIdAndUserId(studyId, userId).toLocalDate();
+        LocalDate attendanceStartDay = startDay.isAfter(participatedDay) ? startDay : participatedDay;
+        LocalDate endDay = study.getEndDate().toLocalDate();
 
-        int totalDays = (int) ChronoUnit.DAYS.between(attendanceStart, end) + 1;
+        int totalDays = (int) ChronoUnit.DAYS.between(attendanceStartDay, endDay) + 1;
         int attendDays = responses.size();
         int attendanceRate = totalDays == 0 ? 0 : Math.round(((float) attendDays / totalDays) * 100);