Merge pull request #271 from prgrms-web-devcourse-final-project/fix/alarm/invite-error

[EA3-201]Fix: 초대 수락/거절 시 받은 사람 ID와 알림 ID를 통해 찾도록 변경

Author: endorsement0912

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

@@ -37,6 +37,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;
@@ -113,18 +114,27 @@ 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));
         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 +258,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 +273,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();
+    }
 }