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

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

@@ -41,7 +41,7 @@ public ApiResponse<Void> respondToInvite(@AuthenticationPrincipal Principal prin
         if (accepted) {
             alarmService.acceptInvite(principal.getUserId(), alarmId);
         } else {
-            alarmService.rejectInvite(principal.getUserId());
+            alarmService.rejectInvite(principal.getUserId(), alarmId);
         }
 
         return ApiResponse.success(accepted ? "스터디 초대를 수락했습니다." : "스터디 초대를 거절했습니다.");

src/main/java/grep/neogulcoder/domain/alram/exception/code/AlarmErrorCode.java

@@ -7,7 +7,8 @@
 @Getter
 public enum AlarmErrorCode implements ErrorCode {
 
-    ALARM_NOT_FOUND("A001",HttpStatus.NOT_FOUND,"알람을 찾을 수 없습니다.");
+    ALARM_NOT_FOUND("A001",HttpStatus.NOT_FOUND,"알람을 찾을 수 없습니다."),
+    ALREADY_CHECKED("A002",HttpStatus.BAD_REQUEST,"이미 읽은 알림입니다.");
 
     private final String code;
     private final HttpStatus status;

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

@@ -2,10 +2,13 @@
 
 import grep.neogulcoder.domain.alram.entity.Alarm;
 import java.util.List;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface AlarmRepository  extends JpaRepository<Alarm, Long> {
     List<Alarm> findAllByReceiverUserIdAndCheckedFalse(Long receiverUserId);
     List<Alarm> findAllByReceiverUserId(Long receiverUserId);
-
+    Optional<Alarm> findByReceiverUserIdAndId(Long targetUserId, Long alarmId);
 }

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

@@ -18,6 +18,7 @@
 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.study.service.StudyManagementServiceFacade;
 import grep.neogulcoder.domain.studyapplication.StudyApplication;
 import grep.neogulcoder.domain.studyapplication.event.ApplicationEvent;
 import grep.neogulcoder.domain.studyapplication.event.ApplicationStatusChangedEvent;
@@ -37,6 +38,7 @@
 
 import java.util.List;
 
+import static grep.neogulcoder.domain.alram.exception.code.AlarmErrorCode.ALREADY_CHECKED;
 import static grep.neogulcoder.domain.recruitment.RecruitmentErrorCode.NOT_FOUND;
 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;
@@ -56,6 +58,7 @@ public class AlarmService {
     private final StudyMemberRepository studyMemberRepository;
     private final RecruitmentPostRepository recruitmentPostRepository;
     private final ApplicationRepository applicationRepository;
+    private final StudyManagementServiceFacade studyManagementServiceFacade;
 
     @Transactional
     public void saveAlarm(Long receiverId, AlarmType alarmType, DomainType domainType,
@@ -113,18 +116,28 @@ public void handleStudyInviteEvent(StudyInviteEvent event) {
     @Transactional
     public void acceptInvite(Long targetUserId, Long alarmId) {
 
+        if(isChecked(targetUserId, alarmId)){
+            throw new BusinessException(ALREADY_CHECKED);
+        }
+
         validateParticipantStudyLimit(targetUserId);
 
-        Alarm alarm = findValidAlarm(alarmId);
+        Alarm alarm = findValidAlarm(targetUserId, alarmId);
         Long studyId = alarm.getDomainId();
         Study study = findValidStudy(studyId);
         studyMemberRepository.save(StudyMember.createMember(study, targetUserId));
+        studyManagementServiceFacade.increaseMemberCount(study, targetUserId);
         alarm.checkAlarm();
     }
 
     @Transactional
-    public void rejectInvite(Long alarmId) {
-        Alarm alarm = findValidAlarm(alarmId);
+    public void rejectInvite(Long targetUserId,Long alarmId) {
+
+        if(isChecked(targetUserId, alarmId)){
+            throw new BusinessException(ALREADY_CHECKED);
+        }
+
+        Alarm alarm = findValidAlarm(targetUserId, alarmId);
         alarm.checkAlarm();
     }
 
@@ -248,9 +261,8 @@ public void handleStudyPostCommentEvent(StudyPostCommentEvent event) {
         );
     }
 
-    private Alarm findValidAlarm(Long alarmId) {
-        return alarmRepository.findById(alarmId)
-                .orElseThrow(() -> new NotFoundException(AlarmErrorCode.ALARM_NOT_FOUND));
+    private Alarm findValidAlarm(Long targetUserId, Long alarmId) {
+        return alarmRepository.findByReceiverUserIdAndId(targetUserId, alarmId).orElseThrow(() -> new NotFoundException(AlarmErrorCode.ALARM_NOT_FOUND));
     }
 
     private Study findValidStudy(Long studyId) {
@@ -264,4 +276,8 @@ private void validateParticipantStudyLimit(Long userId) {
             throw new BusinessException(APPLICATION_PARTICIPANT_LIMIT_EXCEEDED);
         }
     }
+
+    private boolean isChecked(Long targetUserId, Long alarmId) {
+        return findValidAlarm(targetUserId, alarmId).isChecked();
+    }
 }

src/main/java/grep/neogulcoder/domain/recruitment/post/repository/RecruitmentPostRepository.java

@@ -18,4 +18,6 @@ public interface RecruitmentPostRepository extends JpaRepository<RecruitmentPost
     void deactivateByStudyId(@Param("studyId") Long studyId);
 
     Page<RecruitmentPost> findBySubjectContainingIgnoreCase(String subject, Pageable pageable);
+
+    Optional<RecruitmentPost> findByStudyIdAndActivatedTrue(Long studyId);
 }

src/main/java/grep/neogulcoder/domain/study/Study.java

@@ -84,8 +84,8 @@ public void update(String name, Category category, int capacity, StudyType study
         this.imageUrl = imageUrl;
     }
 
-    public boolean isStarted() {
-        return this.startDate.isBefore(LocalDateTime.now());
+    public boolean isStarted(LocalDateTime currentDateTime) {
+        return this.startDate.isBefore(currentDateTime);
     }
 
     public void delete() {

src/main/java/grep/neogulcoder/domain/study/StudyMember.java

@@ -72,10 +72,6 @@ public void changeRoleMember() {
         this.role = StudyMemberRole.MEMBER;
     }
 
-    public boolean isParticipated() {
-        return this.participated;
-    }
-
     public void participate() {
         this.participated = true;
     }

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

@@ -11,6 +11,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -26,70 +27,70 @@ public class StudyController implements StudySpecification {
     private final StudyService studyService;
 
     @GetMapping
-    public ApiResponse<StudyItemPagingResponse> getMyStudies(@PageableDefault(size = 12) Pageable pageable,
-                                                             @RequestParam(required = false) Boolean finished,
-                                                             @AuthenticationPrincipal Principal userDetails) {
+    public ResponseEntity<ApiResponse<StudyItemPagingResponse>> getMyStudies(@PageableDefault(size = 12) Pageable pageable,
+                                                                             @RequestParam(required = false) Boolean finished,
+                                                                             @AuthenticationPrincipal Principal userDetails) {
         StudyItemPagingResponse myStudies = studyService.getMyStudiesPaging(pageable, userDetails.getUserId(), finished);
-        return ApiResponse.success(myStudies);
+        return ResponseEntity.ok(ApiResponse.success(myStudies));
     }
 
     @GetMapping("/main")
-    public ApiResponse<List<StudyItemResponse>> getMyUnfinishedStudies(@AuthenticationPrincipal Principal userDetails) {
+    public ResponseEntity<ApiResponse<List<StudyItemResponse>>> getMyUnfinishedStudies(@AuthenticationPrincipal Principal userDetails) {
         List<StudyItemResponse> unfinishedStudies = studyService.getMyUnfinishedStudies(userDetails.getUserId());
-        return ApiResponse.success(unfinishedStudies);
+        return ResponseEntity.ok(ApiResponse.success(unfinishedStudies));
     }
 
     @GetMapping("/{studyId}/header")
-    public ApiResponse<StudyHeaderResponse> getStudyHeader(@PathVariable("studyId") Long studyId) {
-        return ApiResponse.success(studyService.getStudyHeader(studyId));
+    public ResponseEntity<ApiResponse<StudyHeaderResponse>> getStudyHeader(@PathVariable("studyId") Long studyId) {
+        return ResponseEntity.ok(ApiResponse.success(studyService.getStudyHeader(studyId)));
     }
 
     @GetMapping("/{studyId}")
-    public ApiResponse<StudyResponse> getStudy(@PathVariable("studyId") Long studyId) {
-        return ApiResponse.success(studyService.getStudy(studyId));
+    public ResponseEntity<ApiResponse<StudyResponse>> getStudy(@PathVariable("studyId") Long studyId) {
+        return ResponseEntity.ok(ApiResponse.success(studyService.getStudy(studyId)));
     }
 
     @GetMapping("/me/images")
-    public ApiResponse<List<StudyImageResponse>> getStudyImages(@AuthenticationPrincipal Principal userDetails) {
+    public ResponseEntity<ApiResponse<List<StudyImageResponse>>> getStudyImages(@AuthenticationPrincipal Principal userDetails) {
         Long userId = userDetails.getUserId();
-        return ApiResponse.success(studyService.getStudyImages(userId));
+        return ResponseEntity.ok(ApiResponse.success(studyService.getStudyImages(userId)));
     }
 
     @GetMapping("/{studyId}/info")
-    public ApiResponse<StudyInfoResponse> getStudyInfo(@PathVariable("studyId") Long studyId,
+    public ResponseEntity<ApiResponse<StudyInfoResponse>> getStudyInfo(@PathVariable("studyId") Long studyId,
                                                        @AuthenticationPrincipal Principal userDetails) {
         Long userId = userDetails.getUserId();
-        return ApiResponse.success(studyService.getMyStudyContent(studyId, userId));
+        return ResponseEntity.ok(ApiResponse.success(studyService.getMyStudyContent(studyId, userId)));
     }
 
     @GetMapping("/{studyId}/me")
-    public ApiResponse<StudyMemberInfoResponse> getMyStudyMemberInfo(@PathVariable("studyId") Long studyId,
+    public ResponseEntity<ApiResponse<StudyMemberInfoResponse>> getMyStudyMemberInfo(@PathVariable("studyId") Long studyId,
                                                                      @AuthenticationPrincipal Principal userDetails) {
         Long userId = userDetails.getUserId();
-        return ApiResponse.success(studyService.getMyStudyMemberInfo(studyId, userId));
+        return ResponseEntity.ok(ApiResponse.success(studyService.getMyStudyMemberInfo(studyId, userId)));
     }
 
     @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ApiResponse<Long> createStudy(@RequestPart("request") @Valid StudyCreateRequest request,
+    public ResponseEntity<ApiResponse<Long>> createStudy(@RequestPart("request") @Valid StudyCreateRequest request,
                                          @RequestPart(value = "image", required = false) MultipartFile image,
                                          @AuthenticationPrincipal Principal userDetails) throws IOException {
         Long id = studyService.createStudy(request, userDetails.getUserId(), image);
-        return ApiResponse.success(id);
+        return ResponseEntity.ok(ApiResponse.success(id));
     }
 
     @PutMapping(value = "/{studyId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ApiResponse<Void> updateStudy(@PathVariable("studyId") Long studyId,
+    public ResponseEntity<ApiResponse<Void>> updateStudy(@PathVariable("studyId") Long studyId,
                                          @RequestPart @Valid StudyUpdateRequest request,
                                          @RequestPart(value = "image", required = false) MultipartFile image,
                                          @AuthenticationPrincipal Principal userDetails) throws IOException {
         studyService.updateStudy(studyId, request, userDetails.getUserId(), image);
-        return ApiResponse.noContent();
+        return ResponseEntity.ok(ApiResponse.noContent());
     }
 
     @DeleteMapping("/{studyId}")
-    public ApiResponse<Void> deleteStudy(@PathVariable("studyId") Long studyId,
+    public ResponseEntity<ApiResponse<Void>> deleteStudy(@PathVariable("studyId") Long studyId,
                                          @AuthenticationPrincipal Principal userDetails) {
         studyService.deleteStudy(studyId, userDetails.getUserId());
-        return ApiResponse.noContent();
+        return ResponseEntity.ok(ApiResponse.noContent());
     }
 }

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

@@ -9,6 +9,7 @@
 import grep.neogulcoder.global.response.ApiResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,51 +23,50 @@ public class StudyManagementController implements StudyManagementSpecification {
     private final StudyManagementService studyManagementService;
 
     @GetMapping("/extension")
-    public ApiResponse<StudyExtensionResponse> getStudyExtension(@PathVariable("studyId") Long studyId) {
+    public ResponseEntity<ApiResponse<StudyExtensionResponse>> getStudyExtension(@PathVariable("studyId") Long studyId) {
         StudyExtensionResponse studyExtension = studyManagementService.getStudyExtension(studyId);
-        return ApiResponse.success(studyExtension);
+        return ResponseEntity.ok(ApiResponse.success(studyExtension));
     }
 
     @GetMapping("/extension/participations")
-    public ApiResponse<List<ExtendParticipationResponse>> getExtendParticipations(@PathVariable("studyId") Long studyId) {
+    public ResponseEntity<ApiResponse<List<ExtendParticipationResponse>>> getExtendParticipations(@PathVariable("studyId") Long studyId) {
         List<ExtendParticipationResponse> extendParticipations = studyManagementService.getExtendParticipations(studyId);
-        return ApiResponse.success(extendParticipations);
+        return ResponseEntity.ok(ApiResponse.success(extendParticipations));
     }
 
     @DeleteMapping("/me")
-    public ApiResponse<Void> leaveStudy(@PathVariable("studyId") Long studyId,
+    public ResponseEntity<ApiResponse<Void>> leaveStudy(@PathVariable("studyId") Long studyId,
                                         @AuthenticationPrincipal Principal userDetails) {
         studyManagementService.leaveStudy(studyId, userDetails.getUserId());
-        return ApiResponse.noContent();
+        return ResponseEntity.ok(ApiResponse.noContent());
     }
 
     @PostMapping("/delegate")
-    public ApiResponse<Void> delegateLeader(@PathVariable("studyId") Long studyId,
+    public ResponseEntity<ApiResponse<Void>> delegateLeader(@PathVariable("studyId") Long studyId,
                                             @RequestBody DelegateLeaderRequest request,
                                             @AuthenticationPrincipal Principal userDetails) {
         studyManagementService.delegateLeader(studyId, userDetails.getUserId(), request.getNewLeaderId());
-        return ApiResponse.noContent();
+        return ResponseEntity.ok(ApiResponse.noContent());
     }
 
     @PostMapping("/extension")
-    public ApiResponse<Long> extendStudy(@PathVariable("studyId") Long studyId,
+    public ResponseEntity<ApiResponse<Long>> extendStudy(@PathVariable("studyId") Long studyId,
                                          @RequestBody @Valid ExtendStudyRequest request,
                                          @AuthenticationPrincipal Principal userDetails) {
         Long extendStudyId = studyManagementService.extendStudy(studyId, request, userDetails.getUserId());
-        return ApiResponse.success(extendStudyId);
+        return ResponseEntity.ok(ApiResponse.success(extendStudyId));
     }
 
     @PostMapping("/extension/participations")
-    public ApiResponse<Void> registerExtensionParticipation(@PathVariable("studyId") Long studyId,
+    public ResponseEntity<ApiResponse<Void>> registerExtensionParticipation(@PathVariable("studyId") Long studyId,
                                                             @AuthenticationPrincipal Principal userDetails) {
         studyManagementService.registerExtensionParticipation(studyId, userDetails.getUserId());
-        return ApiResponse.noContent();
+        return ResponseEntity.ok(ApiResponse.noContent());
     }
 
     @PostMapping("/invite/user")
-    public ApiResponse<Void> inviteUser(@PathVariable("studyId") Long studyId, @AuthenticationPrincipal Principal userDetails, String targetUserNickname) {
+    public ResponseEntity<ApiResponse<Void>> inviteUser(@PathVariable("studyId") Long studyId, @AuthenticationPrincipal Principal userDetails, String targetUserNickname) {
         studyManagementService.inviteTargetUser(studyId, userDetails.getUserId(), targetUserNickname);
-        return ApiResponse.noContent();
+        return ResponseEntity.ok(ApiResponse.noContent());
     }
-
 }

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

@@ -8,27 +8,31 @@
 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;
 
 import java.util.List;
 
 @Tag(name = "StudyManagement", description = "스터디 관리 API")
 public interface StudyManagementSpecification {
 
     @Operation(summary = "스터디 연장 여부 조회", description = "스터디 연장 여부를 조회합니다.")
-    ApiResponse<StudyExtensionResponse> getStudyExtension(Long studyId);
+    ResponseEntity<ApiResponse<StudyExtensionResponse>> getStudyExtension(Long studyId);
 
     @Operation(summary = "연장 스터디 참여 멤버 목록 조회", description = "연장 스터디에 참여하는 멤버 목록을 조회합니다.")
-    ApiResponse<List<ExtendParticipationResponse>> getExtendParticipations(Long studyId);
+    ResponseEntity<ApiResponse<List<ExtendParticipationResponse>>> getExtendParticipations(Long studyId);
 
     @Operation(summary = "스터디 탈퇴", description = "스터디를 탈퇴합니다.")
-    ApiResponse<Void> leaveStudy(Long studyId, Principal userDetails);
+    ResponseEntity<ApiResponse<Void>> leaveStudy(Long studyId, Principal userDetails);
 
     @Operation(summary = "스터디장 위임", description = "스터디원에게 스터디장을 위임합니다.")
-    ApiResponse<Void> delegateLeader(Long studyId, DelegateLeaderRequest request, Principal userDetails);
+    ResponseEntity<ApiResponse<Void>> delegateLeader(Long studyId, DelegateLeaderRequest request, Principal userDetails);
 
     @Operation(summary = "스터디 연장", description = "스터디장이 스터디를 연장합니다.")
-    ApiResponse<Long> extendStudy(Long studyId, ExtendStudyRequest request, Principal userDetails);
+    ResponseEntity<ApiResponse<Long>> extendStudy(Long studyId, ExtendStudyRequest request, Principal userDetails);
 
     @Operation(summary = "연장 스터디 참여", description = "스터디원이 연장된 스터디에 참여합니다.")
-    ApiResponse<Void> registerExtensionParticipation(Long studyId, Principal userDetails);
+    ResponseEntity<ApiResponse<Void>> registerExtensionParticipation(Long studyId, Principal userDetails);
+
+    @Operation(summary = "스터디 초대", description = "스터디장이 스터디에 초대합니다.")
+    ResponseEntity<ApiResponse<Void>> inviteUser(Long studyId, Principal userDetails, String targetUserNickname);
 }