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

src/main/java/grep/neogulcoder/domain/alram/controller/AlarmController.java

@@ -21,14 +21,19 @@ public class AlarmController implements AlarmSpecification {
     private final AlarmService alarmService;
 
     @GetMapping("/my")
-    public ApiResponse<List<AlarmResponse>> getAllAlarm(
-        @AuthenticationPrincipal Principal userDetails) {
+    public ApiResponse<List<AlarmResponse>> getAllAlarms(@AuthenticationPrincipal Principal userDetails) {
         return ApiResponse.success(alarmService.getAllAlarms(userDetails.getUserId()));
     }
 
+    @GetMapping("/unchecked/my")
+    public ApiResponse<List<AlarmResponse>> getAllUncheckedAlarm(
+        @AuthenticationPrincipal Principal userDetails) {
+        return ApiResponse.success(alarmService.getAllUncheckedAlarms(userDetails.getUserId()));
+    }
+
     @PostMapping("/my/check/all")
     public ApiResponse<Void> checkAlarm(@AuthenticationPrincipal Principal userDetails) {
-        alarmService.checkAllAlarm(userDetails.getUserId());
+        alarmService.checkAllAlarmWithoutInvite(userDetails.getUserId());
         return ApiResponse.noContent();
     }
 

src/main/java/grep/neogulcoder/domain/alram/controller/AlarmSpecification.java

@@ -11,8 +11,11 @@
 @Tag(name = "Alarm", description = "알림 관련 API 명세")
 public interface AlarmSpecification {
 
-    @Operation(summary = "내 알림 목록 조회", description = "로그인한 사용자의 알림 목록을 조회합니다.")
-    ApiResponse<List<AlarmResponse>> getAllAlarm(@AuthenticationPrincipal Principal userDetails);
+    @Operation(summary = "읽음 여부 관련 없이 내 전체 알림 목록 조회", description = "로그인한 사용자의 전체 알림 목록을 조회합니다.")
+    ApiResponse<List<AlarmResponse>> getAllAlarms(@AuthenticationPrincipal Principal userDetails);
+
+    @Operation(summary = "내 읽지 않은 알림 목록 조회", description = "로그인한 사용자의 읽지 않은 알림 목록을 조회합니다.")
+    ApiResponse<List<AlarmResponse>> getAllUncheckedAlarm(@AuthenticationPrincipal Principal userDetails);
 
     @Operation(summary = "내 알림 전체 읽음 처리", description = "로그인한 사용자의 모든 알림을 읽음 처리합니다.")
     ApiResponse<Void> checkAlarm(@AuthenticationPrincipal Principal userDetails);

src/main/java/grep/neogulcoder/domain/alram/controller/dto/response/AlarmResponse.java

@@ -1,6 +1,5 @@
 package grep.neogulcoder.domain.alram.controller.dto.response;
 
-import grep.neogulcoder.domain.alram.entity.Alarm;
 import grep.neogulcoder.domain.alram.type.AlarmType;
 import grep.neogulcoder.domain.alram.type.DomainType;
 import lombok.Builder;
@@ -21,26 +20,30 @@ public class AlarmResponse {
 
     private String message;
 
+    private boolean checked;
+
     public static AlarmResponse toResponse(Long id, Long receiverUserId, AlarmType alarmType, DomainType domainType,
-        Long domainId, String message) {
+                                           Long domainId, String message, boolean checked) {
         return AlarmResponse.builder()
-            .id(id)
-            .receiverUserId(receiverUserId)
-            .alarmType(alarmType)
-            .domainType(domainType)
-            .domainId(domainId)
-            .message(message)
-            .build();
+                .id(id)
+                .receiverUserId(receiverUserId)
+                .alarmType(alarmType)
+                .domainType(domainType)
+                .domainId(domainId)
+                .message(message)
+                .checked(checked)
+                .build();
     }
 
     @Builder
     private AlarmResponse(Long id, Long receiverUserId, AlarmType alarmType, DomainType domainType,
-        Long domainId, String message) {
+                          Long domainId, String message, boolean checked) {
         this.id = id;
         this.receiverUserId = receiverUserId;
         this.alarmType = alarmType;
         this.domainType = domainType;
         this.domainId = domainId;
         this.message = message;
+        this.checked = checked;
     }
 }

src/main/java/grep/neogulcoder/domain/alram/repository/AlarmRepository.java

@@ -6,5 +6,6 @@
 
 public interface AlarmRepository  extends JpaRepository<Alarm, Long> {
     List<Alarm> findAllByReceiverUserIdAndCheckedFalse(Long receiverUserId);
+    List<Alarm> findAllByReceiverUserId(Long receiverUserId);
 
 }

src/main/java/grep/neogulcoder/domain/alram/service/AlarmService.java

@@ -15,10 +15,13 @@
 import grep.neogulcoder.domain.study.repository.StudyMemberQueryRepository;
 import grep.neogulcoder.domain.study.repository.StudyMemberRepository;
 import grep.neogulcoder.domain.study.repository.StudyRepository;
+import grep.neogulcoder.domain.timevote.event.TimeVotePeriodCreatedEvent;
 import grep.neogulcoder.global.exception.business.BusinessException;
 import grep.neogulcoder.global.exception.business.NotFoundException;
 import grep.neogulcoder.global.provider.finder.MessageFinder;
+
 import java.util.List;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
@@ -44,33 +47,47 @@ public void saveAlarm(Long receiverId, AlarmType alarmType, DomainType domainTyp
         alarmRepository.save(Alarm.init(alarmType, receiverId, domainType, domainId, message));
     }
 
-    public List<AlarmResponse> getAllAlarms(Long receiverUserId) {
+    public List<AlarmResponse> getAllUncheckedAlarms(Long receiverUserId) {
         return alarmRepository.findAllByReceiverUserIdAndCheckedFalse(receiverUserId).stream()
-            .map(alarm -> AlarmResponse.toResponse(
-                alarm.getId(),
-                alarm.getReceiverUserId(),
-                alarm.getAlarmType(),
-                alarm.getDomainType(),
-                alarm.getDomainId(),
-                alarm.getMessage()))
-            .toList();
+                .map(alarm -> AlarmResponse.toResponse(
+                        alarm.getId(),
+                        alarm.getReceiverUserId(),
+                        alarm.getAlarmType(),
+                        alarm.getDomainType(),
+                        alarm.getDomainId(),
+                        alarm.getMessage(),
+                        alarm.isChecked()))
+                .toList();
+    }
+
+    public List<AlarmResponse> getAllAlarms(Long receiverUserId) {
+        return alarmRepository.findAllByReceiverUserId(receiverUserId).stream()
+                .map(alarm -> AlarmResponse.toResponse(
+                        alarm.getId(),
+                        alarm.getReceiverUserId(),
+                        alarm.getAlarmType(),
+                        alarm.getDomainType(),
+                        alarm.getDomainId(),
+                        alarm.getMessage(),
+                        alarm.isChecked()))
+                .toList();
     }
 
     @Transactional
-    public void checkAllAlarm(Long receiverUserId) {
+    public void checkAllAlarmWithoutInvite(Long receiverUserId) {
         List<Alarm> alarms = alarmRepository.findAllByReceiverUserIdAndCheckedFalse(receiverUserId);
         alarms.stream()
-            .filter(alarm -> alarm.getAlarmType() != AlarmType.INVITE)
-            .forEach(Alarm::checkAlarm);
+                .filter(alarm -> alarm.getAlarmType() != AlarmType.INVITE)
+                .forEach(Alarm::checkAlarm);
     }
 
     @EventListener
     public void handleStudyInviteEvent(StudyInviteEvent event) {
         saveAlarm(
-            event.targetUserId(),
-            AlarmType.INVITE,
-            DomainType.STUDY,
-            event.studyId()
+                event.targetUserId(),
+                AlarmType.INVITE,
+                DomainType.STUDY,
+                event.studyId()
         );
     }
 
@@ -82,7 +99,7 @@ public void acceptInvite(Long targetUserId, Long alarmId) {
         Alarm alarm = findValidAlarm(alarmId);
         Long studyId = alarm.getDomainId();
         Study study = findValidStudy(studyId);
-        StudyMember.createMember(study,targetUserId);
+        StudyMember.createMember(study, targetUserId);
         alarm.checkAlarm();
     }
 
@@ -99,10 +116,10 @@ public void handleStudyExtendEvent(StudyExtendEvent event) {
         for (StudyMember member : members) {
             if (!member.isLeader()) {
                 saveAlarm(
-                    member.getUserId(),
-                    AlarmType.STUDY_EXTEND,
-                    DomainType.STUDY,
-                    event.studyId()
+                        member.getUserId(),
+                        AlarmType.STUDY_EXTEND,
+                        DomainType.STUDY,
+                        event.studyId()
                 );
             }
         }
@@ -111,23 +128,39 @@ public void handleStudyExtendEvent(StudyExtendEvent event) {
     @EventListener
     public void handleStudyExtensionReminderEvent(StudyExtensionReminderEvent event) {
         StudyMember leader = studyMemberRepository.findByStudyIdAndRoleAndActivatedTrue(event.studyId(), StudyMemberRole.LEADER)
-            .orElseThrow(() -> new BusinessException(STUDY_LEADER_NOT_FOUND));
+                .orElseThrow(() -> new BusinessException(STUDY_LEADER_NOT_FOUND));
 
         saveAlarm(
-            leader.getUserId(),
-            AlarmType.STUDY_EXTENSION_REMINDER,
-            DomainType.STUDY,
-            event.studyId()
+                leader.getUserId(),
+                AlarmType.STUDY_EXTENSION_REMINDER,
+                DomainType.STUDY,
+                event.studyId()
         );
     }
 
+    @EventListener
+    public void handleTimeVotePeriodCreatedEvent(TimeVotePeriodCreatedEvent event) {
+        List<StudyMember> members = studyMemberRepository.findAllByStudyIdAndActivatedTrue(event.studyId());
+
+        for (StudyMember member : members) {
+            if (!member.getUserId().equals(event.excludedUserId())) {
+                saveAlarm(
+                    member.getUserId(),
+                    AlarmType.TIME_VOTE_REQUEST,
+                    DomainType.TIME_VOTE,
+                    event.studyId()
+                );
+            }
+        }
+    }
+
     private Alarm findValidAlarm(Long alarmId) {
         return alarmRepository.findById(alarmId).orElseThrow(() -> new NotFoundException(AlarmErrorCode.ALARM_NOT_FOUND));
     }
 
     private Study findValidStudy(Long studyId) {
         return studyRepository.findById(studyId)
-            .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
+                .orElseThrow(() -> new NotFoundException(STUDY_NOT_FOUND));
     }
 
     private void validateParticipantStudyLimit(Long userId) {

src/main/java/grep/neogulcoder/domain/alram/type/AlarmType.java

@@ -1,5 +1,5 @@
 package grep.neogulcoder.domain.alram.type;
 
 public enum AlarmType {
-    INVITE, STUDY_EXTEND, STUDY_EXTENSION_REMINDER
+    INVITE, STUDY_EXTEND, STUDY_EXTENSION_REMINDER, TIME_VOTE_REQUEST
 }

src/main/java/grep/neogulcoder/domain/recruitment/comment/controller/RecruitmentPostCommentController.java

@@ -10,29 +10,30 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-@RequestMapping("/recruitment-posts/comments")
+@RequestMapping("/recruitment-posts")
 @RequiredArgsConstructor
 @RestController
 public class RecruitmentPostCommentController implements RecruitmentPostCommentSpecification {
 
     private final RecruitmentPostCommentService commentService;
 
-    @PostMapping
-    public ApiResponse<Long> save(@RequestBody @Valid RecruitmentCommentSaveRequest request,
+    @PostMapping("/{post-id}/comments")
+    public ApiResponse<Long> save(@PathVariable("post-id") long postId,
+                                  @RequestBody @Valid RecruitmentCommentSaveRequest request,
                                   @AuthenticationPrincipal Principal userDetails) {
-        long commentId = commentService.save(request, userDetails.getUserId());
+        long commentId = commentService.save(postId, request, userDetails.getUserId());
         return ApiResponse.success(commentId);
     }
 
-    @PutMapping("/{comment-id}")
+    @PutMapping("/comments/{comment-id}")
     public ApiResponse<Void> update(@PathVariable("comment-id") long commentId,
                                     @RequestBody RecruitmentCommentUpdateRequest request,
                                     @AuthenticationPrincipal Principal userDetails) {
         commentService.update(request, commentId, userDetails.getUserId());
         return ApiResponse.noContent();
     }
 
-    @DeleteMapping("/{comment-id}")
+    @DeleteMapping("/comments/{comment-id}")
     public ApiResponse<Void> delete(@PathVariable("comment-id") long commentId,
                                     @AuthenticationPrincipal Principal userDetails) {
         commentService.delete(commentId, userDetails.getUserId());

src/main/java/grep/neogulcoder/domain/recruitment/comment/controller/RecruitmentPostCommentSpecification.java

@@ -11,7 +11,7 @@
 public interface RecruitmentPostCommentSpecification {
 
     @Operation(summary = "모집글 댓글 작성", description = "모집글에 대한 댓글을 작성 합니다.")
-    ApiResponse<Long> save(RecruitmentCommentSaveRequest request, Principal userDetails);
+    ApiResponse<Long> save(long postId, RecruitmentCommentSaveRequest request, Principal userDetails);
 
     @Operation(summary = "모집글 댓글 수정", description = "모집글에 대한 댓글을 수정 합니다.")
     ApiResponse<Void> update(long commentId, RecruitmentCommentUpdateRequest request, Principal userDetails);

src/main/java/grep/neogulcoder/domain/recruitment/comment/controller/dto/request/RecruitmentCommentSaveRequest.java

@@ -8,16 +8,13 @@
 @Getter
 public class RecruitmentCommentSaveRequest {
 
-    @Schema(example = "2", description = "모집글 ID")
-    private long postId;
-
     @Schema(example = "저도 참여 할래요!", description = "모집글 내용")
     private String content;
 
     private RecruitmentCommentSaveRequest() {
     }
 
-    public RecruitmentPostComment toEntity(RecruitmentPost post, long userId){
+    public RecruitmentPostComment toEntity(RecruitmentPost post, long userId) {
         return RecruitmentPostComment.builder()
                 .recruitmentPost(post)
                 .userId(userId)

src/main/java/grep/neogulcoder/domain/recruitment/comment/service/RecruitmentPostCommentService.java

@@ -25,8 +25,8 @@ public class RecruitmentPostCommentService {
     private final RecruitmentPostCommentQueryRepository commentQueryRepository;
 
     @Transactional
-    public long save(RecruitmentCommentSaveRequest request, long userId) {
-        RecruitmentPost post = postRepository.findPostBy(request.getPostId())
+    public long save(long postId, RecruitmentCommentSaveRequest request, long userId) {
+        RecruitmentPost post = postRepository.findPostBy(postId)
                 .orElseThrow(() -> new NotFoundException(NOT_FOUND));
 
         return commentRepository.save(request.toEntity(post, userId)).getId();

src/main/java/grep/neogulcoder/domain/study/controller/StudyManagementController.java

@@ -49,11 +49,11 @@ public ApiResponse<Void> delegateLeader(@PathVariable("studyId") Long studyId,
     }
 
     @PostMapping("/extension")
-    public ApiResponse<Void> extendStudy(@PathVariable("studyId") Long studyId,
+    public ApiResponse<Long> extendStudy(@PathVariable("studyId") Long studyId,
                                          @RequestBody @Valid ExtendStudyRequest request,
                                          @AuthenticationPrincipal Principal userDetails) {
-        studyManagementService.extendStudy(studyId, request, userDetails.getUserId());
-        return ApiResponse.noContent();
+        Long extendStudyId = studyManagementService.extendStudy(studyId, request, userDetails.getUserId());
+        return ApiResponse.success(extendStudyId);
     }
 
     @PostMapping("/extension/participations")

src/main/java/grep/neogulcoder/domain/study/controller/StudyManagementSpecification.java

@@ -27,7 +27,7 @@ public interface StudyManagementSpecification {
     ApiResponse<Void> delegateLeader(Long studyId, DelegateLeaderRequest request, Principal userDetails);
 
     @Operation(summary = "스터디 연장", description = "스터디장이 스터디를 연장합니다.")
-    ApiResponse<Void> extendStudy(Long studyId, ExtendStudyRequest request, Principal userDetails);
+    ApiResponse<Long> extendStudy(Long studyId, ExtendStudyRequest request, Principal userDetails);
 
     @Operation(summary = "연장 스터디 참여", description = "스터디원이 연장된 스터디에 참여합니다.")
     ApiResponse<Void> registerExtensionParticipation(Long studyId, Principal userDetails);

src/main/java/grep/neogulcoder/domain/study/service/StudyManagementService.java

@@ -120,7 +120,7 @@ public void deleteUserFromStudies(Long userId) {
     }
 
     @Transactional
-    public void extendStudy(Long studyId, ExtendStudyRequest request, Long userId) {
+    public Long extendStudy(Long studyId, ExtendStudyRequest request, Long userId) {
         Study originStudy = findValidStudy(studyId);
 
         StudyMember leader = findValidStudyMember(studyId, userId);
@@ -141,6 +141,8 @@ public void extendStudy(Long studyId, ExtendStudyRequest request, Long userId) {
         studyMemberRepository.save(extendedLeader);
 
         eventPublisher.publishEvent(new StudyExtendEvent(originStudy.getId()));
+
+        return extendedStudy.getId();
     }
 
     @Transactional

src/main/java/grep/neogulcoder/domain/studyapplication/controller/dto/response/MyApplicationPagingResponse.java

@@ -13,7 +13,7 @@ public class MyApplicationPagingResponse {
     @Schema(
         description = "내가 신청한 스터디 목록",
         example = "[{" +
-            "\"applicationId\": 1," +
+            "\"recruitmentPostId\": 1," +
             "\"name\": \"자바 스터디\"," +
             "\"leaderNickname\": \"너굴\"," +
             "\"capacity\": 4," +

src/main/java/grep/neogulcoder/domain/studyapplication/controller/dto/response/MyApplicationResponse.java

@@ -12,8 +12,8 @@
 @Getter
 public class MyApplicationResponse {
 
-    @Schema(description = "신청 번호", example = "1")
-    private Long applicationId;
+    @Schema(description = "모집글 번호", example = "1")
+    private Long recruitmentPostId;
 
     @Schema(description = "스터디 이름", example = "자바 스터디")
     private String name;
@@ -49,9 +49,9 @@ public class MyApplicationResponse {
     private ApplicationStatus status;
 
     @QueryProjection
-    public MyApplicationResponse(Long applicationId, String name, String leaderNickname, int capacity, int currentCount, LocalDateTime startDate,
+    public MyApplicationResponse(Long recruitmentPostId, String name, String leaderNickname, int capacity, int currentCount, LocalDateTime startDate,
                                   String imageUrl,String introduction, Category category, StudyType studyType, boolean isRead, ApplicationStatus status) {
-        this.applicationId = applicationId;
+        this.recruitmentPostId = recruitmentPostId;
         this.name = name;
         this.leaderNickname = leaderNickname;
         this.capacity = capacity;