[EA3-68] chore: develop → main 브랜치 머지

build.gradle

@@ -86,9 +86,11 @@ dependencies {
 	// 배포 관련 의존성
 //	 runtimeOnly 'org.postgresql:postgresql'
 	 implementation 'org.springframework.boot:spring-boot-devtools'
-
 	 implementation 'com.google.cloud:spring-cloud-gcp-starter-secretmanager:4.9.1'
 	 implementation 'com.google.cloud:google-cloud-storage:2.38.0'
+
+    // WebSocket + STOMP 통신용
+    implementation 'org.springframework.boot:spring-boot-starter-websocket'
 }
 
 tasks.named('test') {

src/main/java/grep/neogul_coder/domain/attendance/Attendance.java

@@ -2,15 +2,18 @@
 
 import grep.neogul_coder.global.entity.BaseEntity;
 import jakarta.persistence.*;
+import lombok.Builder;
+import lombok.Getter;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
+@Getter
 @Entity
 public class Attendance extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long attendanceId;
+    private Long id;
 
     @Column(nullable = false)
     private Long studyId;
@@ -19,5 +22,22 @@ public class Attendance extends BaseEntity {
     private Long userId;
 
     @Column(nullable = false)
-    private LocalDate attendanceDate;
+    private LocalDateTime attendanceDate;
+
+    protected Attendance() {}
+
+    @Builder
+    private Attendance(Long studyId, Long userId, LocalDateTime attendanceDate) {
+        this.studyId = studyId;
+        this.userId = userId;
+        this.attendanceDate = attendanceDate;
+    }
+
+    public static Attendance create(Long studyId, Long userId) {
+        return Attendance.builder()
+            .studyId(studyId)
+            .userId(userId)
+            .attendanceDate(LocalDateTime.now())
+            .build();
+    }
 }

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

@@ -1,25 +1,32 @@
 package grep.neogul_coder.domain.attendance.controller;
 
-import grep.neogul_coder.domain.attendance.controller.dto.response.AttendanceResponse;
+import grep.neogul_coder.domain.attendance.controller.dto.response.AttendanceInfoResponse;
+import grep.neogul_coder.domain.attendance.service.AttendanceService;
+import grep.neogul_coder.global.auth.Principal;
 import grep.neogul_coder.global.response.ApiResponse;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
-@RequestMapping("/api/attendances")
+@RequestMapping("/api/studies/{studyId}/attendances")
+@RequiredArgsConstructor
 @RestController
 public class AttendanceController implements AttendanceSpecification {
 
+    private final AttendanceService attendanceService;
+
     @GetMapping
-    public ApiResponse<List<AttendanceResponse>> getAttendances() {
-        return ApiResponse.success(List.of(new AttendanceResponse()));
+    public ApiResponse<AttendanceInfoResponse> getAttendances(@PathVariable("studyId") Long studyId,
+                                                              @AuthenticationPrincipal Principal userDetails) {
+        AttendanceInfoResponse attendances = attendanceService.getAttendances(studyId, userDetails.getUserId());
+        return ApiResponse.success(attendances);
     }
 
     @PostMapping
-    public ApiResponse<Void> createAttendance() {
-        return ApiResponse.noContent();
+    public ApiResponse<Long> createAttendance(@PathVariable("studyId") Long studyId,
+                                              @AuthenticationPrincipal Principal userDetails) {
+        Long userId = userDetails.getUserId();
+        Long id = attendanceService.createAttendance(studyId, userId);
+        return ApiResponse.success(id);
     }
 }

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

@@ -1,6 +1,8 @@
 package grep.neogul_coder.domain.attendance.controller;
 
+import grep.neogul_coder.domain.attendance.controller.dto.response.AttendanceInfoResponse;
 import grep.neogul_coder.domain.attendance.controller.dto.response.AttendanceResponse;
+import grep.neogul_coder.global.auth.Principal;
 import grep.neogul_coder.global.response.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -11,8 +13,8 @@
 public interface AttendanceSpecification {
 
     @Operation(summary = "출석 조회", description = "일주일 단위로 출석을 조회합니다.")
-    ApiResponse<List<AttendanceResponse>> getAttendances();
+    ApiResponse<AttendanceInfoResponse> getAttendances(Long studyId, Principal userDetails);
 
     @Operation(summary = "출석 체크", description = "스터디에 출석을 합니다.")
-    ApiResponse<Void> createAttendance();
+    ApiResponse<Long> createAttendance(Long studyId, Principal userDetails);
 }

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

@@ -0,0 +1,30 @@
+package grep.neogul_coder.domain.attendance.controller.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+public class AttendanceInfoResponse {
+
+    @Schema(description = "출석일 목록")
+    private List<AttendanceResponse> attendances;
+
+    @Schema(description = "출석률", example = "50")
+    private int attendanceRate;
+
+    @Builder
+    private AttendanceInfoResponse(List<AttendanceResponse> attendances, int attendanceRate) {
+        this.attendances = attendances;
+        this.attendanceRate = attendanceRate;
+    }
+
+    public static AttendanceInfoResponse of(List<AttendanceResponse> responses, int attendanceRate) {
+        return AttendanceInfoResponse.builder()
+            .attendances(responses)
+            .attendanceRate(attendanceRate)
+            .build();
+    }
+}

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

@@ -1,6 +1,8 @@
 package grep.neogul_coder.domain.attendance.controller.dto.response;
 
+import grep.neogul_coder.domain.attendance.Attendance;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
 import lombok.Getter;
 
 import java.time.LocalDate;
@@ -16,4 +18,19 @@ public class AttendanceResponse {
 
     @Schema(description = "출석일", example = "2025-07-10")
     private LocalDate attendanceDate;
+
+    @Builder
+    private AttendanceResponse(Long studyId, Long userId, LocalDate attendanceDate) {
+        this.studyId = studyId;
+        this.userId = userId;
+        this.attendanceDate = attendanceDate;
+    }
+
+    public static AttendanceResponse from(Attendance attendance) {
+        return AttendanceResponse.builder()
+            .studyId(attendance.getStudyId())
+            .userId(attendance.getUserId())
+            .attendanceDate(attendance.getAttendanceDate().toLocalDate())
+            .build();
+    }
 }

src/main/java/grep/neogul_coder/domain/attendance/exception/code/AttendanceErrorCode.java

@@ -0,0 +1,21 @@
+package grep.neogul_coder.domain.attendance.exception.code;
+
+import grep.neogul_coder.global.response.code.ErrorCode;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+public enum AttendanceErrorCode implements ErrorCode {
+
+    ATTENDANCE_ALREADY_CHECKED("A001", HttpStatus.BAD_REQUEST, "출석은 하루에 한 번만 가능합니다.");
+
+    private final String code;
+    private final HttpStatus status;
+    private final String message;
+
+    AttendanceErrorCode(String code, HttpStatus status, String message) {
+        this.code = code;
+        this.status = status;
+        this.message = message;
+    }
+}

src/main/java/grep/neogul_coder/domain/attendance/repository/AttendanceRepository.java

@@ -0,0 +1,19 @@
+package grep.neogul_coder.domain.attendance.repository;
+
+import grep.neogul_coder.domain.attendance.Attendance;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public interface AttendanceRepository extends JpaRepository<Attendance, Long> {
+    @Query("select count(a) > 0 from Attendance a where a.studyId = :studyId and a.userId = :userId and a.attendanceDate between :startOfDay and :endOfDay")
+    boolean existsTodayAttendance(@Param("studyId") Long studyId,
+                                  @Param("userId") Long userId,
+                                  @Param("startOfDay") LocalDateTime startOfDay,
+                                  @Param("endOfDay") LocalDateTime endOfDay);
+
+    List<Attendance> findByStudyIdAndUserId(Long studyId, Long userId);
+}

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

@@ -0,0 +1,81 @@
+package grep.neogul_coder.domain.attendance.service;
+
+import grep.neogul_coder.domain.attendance.Attendance;
+import grep.neogul_coder.domain.attendance.controller.dto.response.AttendanceInfoResponse;
+import grep.neogul_coder.domain.attendance.controller.dto.response.AttendanceResponse;
+import grep.neogul_coder.domain.attendance.repository.AttendanceRepository;
+import grep.neogul_coder.domain.study.Study;
+import grep.neogul_coder.domain.study.repository.StudyMemberRepository;
+import grep.neogul_coder.domain.study.repository.StudyRepository;
+import grep.neogul_coder.global.exception.business.BusinessException;
+import grep.neogul_coder.global.exception.business.NotFoundException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+import static grep.neogul_coder.domain.attendance.exception.code.AttendanceErrorCode.ATTENDANCE_ALREADY_CHECKED;
+import static grep.neogul_coder.domain.study.exception.code.StudyErrorCode.STUDY_NOT_FOUND;
+
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+@Service
+public class AttendanceService {
+
+    private final AttendanceRepository attendanceRepository;
+    private final StudyRepository studyRepository;
+    private final StudyMemberRepository studyMemberRepository;
+
+    public AttendanceInfoResponse getAttendances(Long studyId, Long userId) {
+        Study study = studyRepository.findByIdAndActivatedTrue(studyId)
+            .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+
+        List<Attendance> attendances = attendanceRepository.findByStudyIdAndUserId(studyId, userId);
+        List<AttendanceResponse> responses = attendances.stream()
+            .map(AttendanceResponse::from)
+            .toList();
+
+        int attendanceRate = getAttendanceRate(studyId, userId, study, responses);
+
+        return AttendanceInfoResponse.of(responses, attendanceRate);
+    }
+
+    @Transactional
+    public Long createAttendance(Long studyId, Long userId) {
+        Study study = studyRepository.findByIdAndActivatedTrue(studyId)
+            .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+
+        validateNotAlreadyChecked(studyId, userId);
+
+        Attendance attendance = Attendance.create(studyId, userId);
+        attendanceRepository.save(attendance);
+        return attendance.getId();
+    }
+
+    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();
+
+        int totalDays = (int) ChronoUnit.DAYS.between(attendanceStart, end) + 1;
+        int attendDays = responses.size();
+        int attendanceRate = totalDays == 0 ? 0 : Math.round(((float) attendDays / totalDays) * 100);
+
+        return attendanceRate;
+    }
+
+    private void validateNotAlreadyChecked(Long studyId, Long userId) {
+        LocalDateTime startOfDay = LocalDate.now().atStartOfDay();
+        LocalDateTime endOfDay = LocalDate.now().atTime(LocalTime.MAX);
+
+        if (attendanceRepository.existsTodayAttendance(studyId, userId, startOfDay, endOfDay)) {
+            throw new BusinessException(ATTENDANCE_ALREADY_CHECKED);
+        }
+    }
+}

src/main/java/grep/neogul_coder/domain/groupchat/controller/GroupChatRestController.java

@@ -0,0 +1,31 @@
+package grep.neogul_coder.domain.groupchat.controller;
+
+import grep.neogul_coder.domain.groupchat.controller.dto.response.GroupChatMessageResponseDto;
+import grep.neogul_coder.domain.groupchat.service.GroupChatService;
+import grep.neogul_coder.global.response.ApiResponse;
+import grep.neogul_coder.global.response.PageResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/chat")
+public class GroupChatRestController implements GroupChatRestSpecification {
+
+    private final GroupChatService groupChatService;
+
+    // 과거 채팅 메시지 페이징 조회 (무한 스크롤용)
+    @Override
+    @GetMapping("/room/{roomId}/messages")
+    public ApiResponse<PageResponse<GroupChatMessageResponseDto>> getMessages(
+        @PathVariable("roomId") Long roomId,
+        @RequestParam(defaultValue = "0") int page,
+        @RequestParam(defaultValue = "20") int size
+    ) {
+        // 서비스에서 페이징된 메시지 조회
+        PageResponse<GroupChatMessageResponseDto> pageResponse =
+            groupChatService.getMessages(roomId, page, size);
+
+        return ApiResponse.success(pageResponse);
+    }
+}