Merge branch 'develop' into feature/add/alarm/time

endorsement0912 · web-flow · commit 1133fd4e011c · 2025-07-27T17:35:39.000+09:00
diff --git a/src/main/java/grep/neogulcoder/domain/alram/service/AlarmService.java b/src/main/java/grep/neogulcoder/domain/alram/service/AlarmService.java
@@ -6,6 +6,8 @@
 import grep.neogulcoder.domain.alram.repository.AlarmRepository;
 import grep.neogulcoder.domain.alram.type.AlarmType;
 import grep.neogulcoder.domain.alram.type.DomainType;
+import grep.neogulcoder.domain.recruitment.post.RecruitmentPost;
+import grep.neogulcoder.domain.recruitment.post.repository.RecruitmentPostRepository;
 import grep.neogulcoder.domain.study.Study;
 import grep.neogulcoder.domain.study.StudyMember;
 import grep.neogulcoder.domain.study.enums.StudyMemberRole;
@@ -15,6 +17,10 @@
 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.studyapplication.StudyApplication;
+import grep.neogulcoder.domain.studyapplication.event.ApplicationEvent;
+import grep.neogulcoder.domain.studyapplication.event.ApplicationStatusChangedEvent;
+import grep.neogulcoder.domain.studyapplication.repository.ApplicationRepository;
 import grep.neogulcoder.domain.timevote.event.TimeVotePeriodCreatedEvent;
 import grep.neogulcoder.global.exception.business.BusinessException;
 import grep.neogulcoder.global.exception.business.NotFoundException;
@@ -25,9 +31,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import static grep.neogulcoder.domain.study.exception.code.StudyErrorCode.STUDY_LEADER_NOT_FOUND;
-import static grep.neogulcoder.domain.study.exception.code.StudyErrorCode.STUDY_NOT_FOUND;
-import static grep.neogulcoder.domain.studyapplication.exception.code.ApplicationErrorCode.APPLICATION_PARTICIPANT_LIMIT_EXCEEDED;
+import static grep.neogulcoder.domain.recruitment.RecruitmentErrorCode.NOT_FOUND;
+import static grep.neogulcoder.domain.study.exception.code.StudyErrorCode.*;
+import static grep.neogulcoder.domain.studyapplication.exception.code.ApplicationErrorCode.*;
 
 @Service
 @RequiredArgsConstructor
@@ -39,6 +45,8 @@ public class AlarmService {
     private final StudyRepository studyRepository;
     private final StudyMemberQueryRepository studyMemberQueryRepository;
     private final StudyMemberRepository studyMemberRepository;
+    private final RecruitmentPostRepository recruitmentPostRepository;
+    private final ApplicationRepository applicationRepository;
 
     @Transactional
     public void saveAlarm(Long receiverId, AlarmType alarmType, DomainType domainType,
@@ -159,6 +167,32 @@ public void handleTimeVotePeriodCreatedEvent(TimeVotePeriodCreatedEvent event) {
         }
     }
 
+    @EventListener
+    public void handleApplicationEvent(ApplicationEvent event) {
+        RecruitmentPost recruitmentPost = recruitmentPostRepository.findByIdAndActivatedTrue(event.recruitmentPostId())
+            .orElseThrow(() -> new BusinessException(NOT_FOUND));
+
+        saveAlarm(
+            recruitmentPost.getUserId(),
+            AlarmType.STUDY_APPLICATION,
+            DomainType.RECRUITMENT_POST,
+            event.recruitmentPostId()
+        );
+    }
+
+    @EventListener
+    public void handleApplicationStatusChangedEvent(ApplicationStatusChangedEvent event) {
+        StudyApplication application = applicationRepository.findByIdAndActivatedTrue(event.applicationId())
+            .orElseThrow(() -> new BusinessException(APPLICATION_NOT_FOUND));
+
+        saveAlarm(
+            application.getUserId(),
+            event.alarmType(),
+            DomainType.STUDY_APPLICATION,
+            application.getId()
+        );
+    }
+
     private Alarm findValidAlarm(Long alarmId) {
         return alarmRepository.findById(alarmId)
             .orElseThrow(() -> new NotFoundException(AlarmErrorCode.ALARM_NOT_FOUND));
diff --git a/src/main/java/grep/neogulcoder/domain/alram/type/AlarmType.java b/src/main/java/grep/neogulcoder/domain/alram/type/AlarmType.java
@@ -1,5 +1,11 @@
 package grep.neogulcoder.domain.alram.type;
 
 public enum AlarmType {
-    INVITE, STUDY_EXTEND, STUDY_EXTENSION_REMINDER, TIME_VOTE_REQUEST
+    INVITE,
+    STUDY_EXTEND,
+    STUDY_EXTENSION_REMINDER,
+    TIME_VOTE_REQUEST,
+    STUDY_APPLICATION,
+    STUDY_APPLICATION_APPROVED,
+    STUDY_APPLICATION_REJECTED
 }
diff --git a/src/main/java/grep/neogulcoder/domain/alram/type/DomainType.java b/src/main/java/grep/neogulcoder/domain/alram/type/DomainType.java
@@ -1,5 +1,8 @@
 package grep.neogulcoder.domain.alram.type;
 
 public enum DomainType {
-    STUDY, TIME_VOTE
+    STUDY,
+    TIME_VOTE,
+    RECRUITMENT_POST,
+    STUDY_APPLICATION
 }
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/controller/GroupChatRestController.java b/src/main/java/grep/neogulcoder/domain/groupchat/controller/GroupChatRestController.java
@@ -1,5 +1,6 @@
 package grep.neogulcoder.domain.groupchat.controller;
 
+import grep.neogulcoder.domain.groupchat.controller.dto.response.ChatMessagePagingResponse;
 import grep.neogulcoder.domain.groupchat.controller.dto.response.GroupChatMessageResponseDto;
 import grep.neogulcoder.domain.groupchat.service.GroupChatService;
 import grep.neogulcoder.global.response.ApiResponse;
@@ -17,15 +18,13 @@ public class GroupChatRestController implements GroupChatRestSpecification {
     // 과거 채팅 메시지 페이징 조회 (무한 스크롤용)
     @Override
     @GetMapping("/study/{studyId}/messages")
-    public ApiResponse<PageResponse<GroupChatMessageResponseDto>> getMessages(
+    public ApiResponse<ChatMessagePagingResponse> getMessages(
         @PathVariable("studyId") Long studyId,
         @RequestParam(defaultValue = "0") int page,
         @RequestParam(defaultValue = "20") int size
     ) {
         // 서비스에서 페이징된 메시지 조회
-        PageResponse<GroupChatMessageResponseDto> pageResponse =
-            groupChatService.getMessages(studyId, page, size);
-
-        return ApiResponse.success(pageResponse);
+        ChatMessagePagingResponse response = groupChatService.getMessages(studyId, page, size);
+        return ApiResponse.success(response);
     }
 }
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/controller/GroupChatRestSpecification.java b/src/main/java/grep/neogulcoder/domain/groupchat/controller/GroupChatRestSpecification.java
@@ -1,5 +1,6 @@
 package grep.neogulcoder.domain.groupchat.controller;
 
+import grep.neogulcoder.domain.groupchat.controller.dto.response.ChatMessagePagingResponse;
 import grep.neogulcoder.domain.groupchat.controller.dto.response.GroupChatMessageResponseDto;
 import grep.neogulcoder.global.response.ApiResponse;
 import grep.neogulcoder.global.response.PageResponse;
@@ -73,7 +74,7 @@ public interface GroupChatRestSpecification {
         """
     )
 
-    ApiResponse<PageResponse<GroupChatMessageResponseDto>> getMessages(
+    ApiResponse<ChatMessagePagingResponse> getMessages(
         @Parameter(description = "스터디 ID", example = "1")
         @PathVariable("studyId") Long studyId,
 
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/controller/dto/response/ChatMessagePagingResponse.java b/src/main/java/grep/neogulcoder/domain/groupchat/controller/dto/response/ChatMessagePagingResponse.java
@@ -0,0 +1,44 @@
+package grep.neogulcoder.domain.groupchat.controller.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Getter;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+@Getter
+public class ChatMessagePagingResponse {
+
+    @Schema(description = "채팅 메시지 목록")
+    private final List<GroupChatMessageResponseDto> content;
+
+    @Schema(description = "현재 페이지 번호", example = "0")
+    private final int currentPage;
+
+    @Schema(description = "페이지 크기", example = "20")
+    private final int size;
+
+    @Schema(description = "전체 페이지 수", example = "5")
+    private final int totalPages;
+
+    @Schema(description = "전체 메시지 수", example = "100")
+    private final long totalElements;
+
+    @Schema(description = "다음 페이지 존재 여부", example = "true")
+    private final boolean hasNext;
+
+    @Builder
+    private ChatMessagePagingResponse(Page<GroupChatMessageResponseDto> page) {
+        this.content = page.getContent();
+        this.currentPage = page.getNumber();
+        this.size = page.getSize();
+        this.totalPages = page.getTotalPages();
+        this.totalElements = page.getTotalElements();
+        this.hasNext = page.hasNext();
+    }
+
+    public static ChatMessagePagingResponse of(Page<GroupChatMessageResponseDto> page) {
+        return new ChatMessagePagingResponse(page);
+    }
+}
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/repository/GroupChatMessageRepository.java b/src/main/java/grep/neogulcoder/domain/groupchat/repository/GroupChatMessageRepository.java
@@ -11,7 +11,8 @@ public interface GroupChatMessageRepository extends JpaRepository<GroupChatMessa
 
     // 채팅방(roomId)에 속한 메시지를 전송 시간 내림차순으로 페이징 조회
     @Query("SELECT m FROM GroupChatMessage m " +
-        "WHERE m.groupChatRoom.roomId = :roomId " +
+        "JOIN FETCH m.groupChatRoom r " +
+        "WHERE r.roomId = :roomId " +
         "ORDER BY m.sentAt ASC")
     Page<GroupChatMessage> findMessagesByRoomIdAsc(@Param("roomId") Long roomId, Pageable pageable);
 
diff --git a/src/main/java/grep/neogulcoder/domain/groupchat/service/GroupChatService.java b/src/main/java/grep/neogulcoder/domain/groupchat/service/GroupChatService.java
@@ -1,5 +1,6 @@
 package grep.neogulcoder.domain.groupchat.service;
 
+import grep.neogulcoder.domain.groupchat.controller.dto.response.ChatMessagePagingResponse;
 import grep.neogulcoder.domain.groupchat.entity.GroupChatMessage;
 import grep.neogulcoder.domain.groupchat.entity.GroupChatRoom;
 import grep.neogulcoder.domain.groupchat.controller.dto.requset.GroupChatMessageRequestDto;
@@ -63,7 +64,8 @@ public GroupChatMessageResponseDto saveMessage(GroupChatMessageRequestDto reques
     }
 
     // 과거 채팅 메시지 페이징 조회 (무한 스크롤용)
-    public PageResponse<GroupChatMessageResponseDto> getMessages(Long studyId, int page, int size) {
+    @Transactional(readOnly = true)
+    public ChatMessagePagingResponse getMessages(Long studyId, int page, int size) {
         GroupChatRoom room = roomRepository.findByStudyId(studyId)
             .orElseThrow(() -> new IllegalArgumentException("채팅방이 존재하지 않습니다."));
 
@@ -81,12 +83,7 @@ public PageResponse<GroupChatMessageResponseDto> getMessages(Long studyId, int p
             return GroupChatMessageResponseDto.from(message, sender);
         });
 
-        // PageResponse로 감싸서 반환
-        return new PageResponse<>(
-            "/api/chat/study/" + studyId + "/messages",
-            messagePage,
-            5 // 페이지 버튼 개수
-        );
+        return ChatMessagePagingResponse.of(messagePage);
     }
 
 
diff --git a/src/main/java/grep/neogulcoder/domain/recruitment/post/controller/dto/request/RecruitmentPostUpdateRequest.java b/src/main/java/grep/neogulcoder/domain/recruitment/post/controller/dto/request/RecruitmentPostUpdateRequest.java
@@ -27,22 +27,22 @@ public class RecruitmentPostUpdateRequest {
 
     @Future
     @Schema(example = "2025-07-21T23:59:59", description = "모집글 마감 기간")
-    private LocalDateTime expiredDateTime;
+    private LocalDateTime expiredDate;
 
     @Builder
-    private RecruitmentPostUpdateRequest(String subject, String content, int recruitmentCount, LocalDateTime expiredDateTime) {
+    private RecruitmentPostUpdateRequest(String subject, String content, int recruitmentCount, LocalDateTime expiredDate) {
         this.subject = subject;
         this.content = content;
         this.recruitmentCount = recruitmentCount;
-        this.expiredDateTime = expiredDateTime;
+        this.expiredDate = expiredDate;
     }
 
     public RecruitmentPostUpdateServiceRequest toServiceRequest() {
         return RecruitmentPostUpdateServiceRequest.builder()
                 .subject(this.subject)
                 .content(this.content)
                 .recruitmentCount(this.recruitmentCount)
-                .expiredDateTime(this.expiredDateTime)
+                .expiredDateTime(this.expiredDate)
                 .build();
     }
 
diff --git a/src/main/java/grep/neogulcoder/domain/studyapplication/event/ApplicationEvent.java b/src/main/java/grep/neogulcoder/domain/studyapplication/event/ApplicationEvent.java
@@ -0,0 +1,4 @@
+package grep.neogulcoder.domain.studyapplication.event;
+
+public record ApplicationEvent(Long recruitmentPostId, Long applicationId) {
+}
diff --git a/src/main/java/grep/neogulcoder/domain/studyapplication/event/ApplicationStatusChangedEvent.java b/src/main/java/grep/neogulcoder/domain/studyapplication/event/ApplicationStatusChangedEvent.java
@@ -0,0 +1,6 @@
+package grep.neogulcoder.domain.studyapplication.event;
+
+import grep.neogulcoder.domain.alram.type.AlarmType;
+
+public record ApplicationStatusChangedEvent(Long applicationId, AlarmType alarmType) {
+}
diff --git a/src/main/java/grep/neogulcoder/domain/studyapplication/provider/ApplicationApprovedMessageProvider.java b/src/main/java/grep/neogulcoder/domain/studyapplication/provider/ApplicationApprovedMessageProvider.java
@@ -0,0 +1,43 @@
+package grep.neogulcoder.domain.studyapplication.provider;
+
+import grep.neogulcoder.domain.alram.type.*;
+import grep.neogulcoder.domain.recruitment.post.RecruitmentPost;
+import grep.neogulcoder.domain.recruitment.post.repository.RecruitmentPostRepository;
+import grep.neogulcoder.domain.studyapplication.StudyApplication;
+import grep.neogulcoder.domain.studyapplication.repository.ApplicationRepository;
+import grep.neogulcoder.global.exception.business.NotFoundException;
+import grep.neogulcoder.global.provider.MessageProvidable;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import static grep.neogulcoder.domain.recruitment.RecruitmentErrorCode.*;
+import static grep.neogulcoder.domain.studyapplication.exception.code.ApplicationErrorCode.*;
+
+@Component
+@RequiredArgsConstructor
+public class ApplicationApprovedMessageProvider implements MessageProvidable {
+
+    private final ApplicationRepository applicationRepository;
+    private final RecruitmentPostRepository recruitmentPostRepository;
+
+    @Override
+    public boolean isSupport(AlarmType alarmType) {
+        return alarmType == AlarmType.STUDY_APPLICATION_APPROVED;
+    }
+
+    @Override
+    public String provideMessage(DomainType domainType, Long domainId) {
+        if (domainType != DomainType.STUDY_APPLICATION) {
+            throw new IllegalArgumentException("스터디 신청 승인 알림은 STUDY_APPLICATION 도메인에만 해당됩니다.");
+        }
+
+        StudyApplication application = applicationRepository.findByIdAndActivatedTrue(domainId)
+            .orElseThrow(() -> new NotFoundException(APPLICATION_NOT_FOUND));
+
+        String subject = recruitmentPostRepository.findById(application.getRecruitmentPostId())
+            .map(RecruitmentPost::getSubject)
+            .orElseThrow(() -> new NotFoundException(NOT_FOUND));
+
+        return String.format("당신이 지원한 '%s' 스터디가 승인되었습니다.", subject);
+    }
+}
diff --git a/src/main/java/grep/neogulcoder/domain/studyapplication/provider/ApplicationMessageProvider.java b/src/main/java/grep/neogulcoder/domain/studyapplication/provider/ApplicationMessageProvider.java
@@ -0,0 +1,37 @@
+package grep.neogulcoder.domain.studyapplication.provider;
+
+import grep.neogulcoder.domain.alram.type.AlarmType;
+import grep.neogulcoder.domain.alram.type.DomainType;
+import grep.neogulcoder.domain.recruitment.post.RecruitmentPost;
+import grep.neogulcoder.domain.recruitment.post.repository.RecruitmentPostRepository;
+import grep.neogulcoder.global.exception.business.NotFoundException;
+import grep.neogulcoder.global.provider.MessageProvidable;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import static grep.neogulcoder.domain.recruitment.RecruitmentErrorCode.*;
+
+@Component
+@RequiredArgsConstructor
+public class ApplicationMessageProvider implements MessageProvidable {
+
+    private final RecruitmentPostRepository recruitmentPostRepository;
+
+    @Override
+    public boolean isSupport(AlarmType alarmType) {
+        return alarmType == AlarmType.STUDY_APPLICATION;
+    }
+
+    @Override
+    public String provideMessage(DomainType domainType, Long domainId) {
+        if (domainType != DomainType.RECRUITMENT_POST) {
+            throw new IllegalArgumentException("스터디 신청 알림은 RECRUITMENT_POST 도메인에만 해당됩니다.");
+        }
+
+        String recruitmentPostSubject = recruitmentPostRepository.findByIdAndActivatedTrue(domainId)
+            .map(RecruitmentPost::getSubject)
+            .orElseThrow(() -> new NotFoundException(NOT_FOUND));
+
+        return String.format("모집글 '%s'에 새로운 신청이 들어왔습니다.", recruitmentPostSubject);
+    }
+}
diff --git a/src/main/java/grep/neogulcoder/domain/studyapplication/provider/ApplicationRejectedMessageProvider.java b/src/main/java/grep/neogulcoder/domain/studyapplication/provider/ApplicationRejectedMessageProvider.java
@@ -0,0 +1,44 @@
+package grep.neogulcoder.domain.studyapplication.provider;
+
+import grep.neogulcoder.domain.alram.type.AlarmType;
+import grep.neogulcoder.domain.alram.type.DomainType;
+import grep.neogulcoder.domain.recruitment.post.RecruitmentPost;
+import grep.neogulcoder.domain.recruitment.post.repository.RecruitmentPostRepository;
+import grep.neogulcoder.domain.studyapplication.StudyApplication;
+import grep.neogulcoder.domain.studyapplication.repository.ApplicationRepository;
+import grep.neogulcoder.global.exception.business.NotFoundException;
+import grep.neogulcoder.global.provider.MessageProvidable;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import static grep.neogulcoder.domain.recruitment.RecruitmentErrorCode.*;
+import static grep.neogulcoder.domain.studyapplication.exception.code.ApplicationErrorCode.*;
+
+@Component
+@RequiredArgsConstructor
+public class ApplicationRejectedMessageProvider implements MessageProvidable {
+
+    private final ApplicationRepository applicationRepository;
+    private final RecruitmentPostRepository recruitmentPostRepository;
+
+    @Override
+    public boolean isSupport(AlarmType alarmType) {
+        return alarmType == AlarmType.STUDY_APPLICATION_REJECTED;
+    }
+
+    @Override
+    public String provideMessage(DomainType domainType, Long domainId) {
+        if (domainType != DomainType.STUDY_APPLICATION) {
+            throw new IllegalArgumentException("스터디 신청 거절 알림은 STUDY_APPLICATION 도메인에만 해당됩니다.");
+        }
+
+        StudyApplication application = applicationRepository.findByIdAndActivatedTrue(domainId)
+            .orElseThrow(() -> new NotFoundException(APPLICATION_NOT_FOUND));
+
+        String subject = recruitmentPostRepository.findById(application.getRecruitmentPostId())
+            .map(RecruitmentPost::getSubject)
+            .orElseThrow(() -> new NotFoundException(NOT_FOUND));
+
+        return String.format("당신이 지원한 '%s' 스터디가 거절되었습니다.", subject);
+    }
+}
diff --git a/src/main/java/grep/neogulcoder/domain/studyapplication/service/ApplicationService.java b/src/main/java/grep/neogulcoder/domain/studyapplication/service/ApplicationService.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`package grep.neogulcoder.domain.alram.type;`
`2`	`2`
`3`	`3`	`public enum DomainType {`
`4`		`- STUDY, TIME_VOTE`
	`4`	`+ STUDY,`
	`5`	`+ TIME_VOTE,`
	`6`	`+ RECRUITMENT_POST,`
	`7`	`+ STUDY_APPLICATION`
`5`	`8`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package grep.neogulcoder.domain.studyapplication.event;
++
 +public record ApplicationEvent(Long recruitmentPostId, Long applicationId) {
 +}