Merge pull request #239 from prgrms-web-devcourse-final-project/refactor/alarm(WR9-139)

LeeVell · web-flow · commit bfe3c5e945cb · 2025-03-11T14:23:05.000+09:00
Refactor/alarm(wr9 139)
diff --git a/src/main/java/io/crops/warmletter/domain/letter/service/LetterService.java b/src/main/java/io/crops/warmletter/domain/letter/service/LetterService.java
@@ -5,7 +5,6 @@
 import io.crops.warmletter.domain.letter.dto.request.CreateLetterRequest;
 import io.crops.warmletter.domain.letter.dto.request.EvaluateLetterRequest;
 import io.crops.warmletter.domain.letter.dto.request.TemporarySaveLetterRequest;
-import io.crops.warmletter.domain.letter.dto.response.LetterDraftResponse;
 import io.crops.warmletter.domain.letter.dto.response.LetterResponse;
 import io.crops.warmletter.domain.letter.entity.Letter;
 import io.crops.warmletter.domain.letter.entity.LetterMatching;
@@ -17,17 +16,17 @@
 import io.crops.warmletter.domain.member.exception.MemberNotFoundException;
 import io.crops.warmletter.domain.member.facade.MemberFacade;
 import io.crops.warmletter.domain.member.repository.MemberRepository;
+import io.crops.warmletter.domain.timeline.dto.request.NotificationRequest;
 import io.crops.warmletter.domain.timeline.enums.AlarmType;
-import io.crops.warmletter.domain.timeline.facade.NotificationFacade;
 import io.crops.warmletter.global.error.exception.BusinessException;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static io.crops.warmletter.global.error.common.ErrorCode.INVALID_INPUT_VALUE;
@@ -44,7 +43,7 @@ public class LetterService {
     private final MemberFacade memberFacade;
     private final AuthFacade authFacade;
 
-    private final NotificationFacade notificationFacade;
+    private final ApplicationEventPublisher notificationPublisher;
 
     @Transactional
     public LetterResponse createLetter(CreateLetterRequest request) {
@@ -109,7 +108,12 @@ public LetterResponse createLetter(CreateLetterRequest request) {
 
         // 알림 전송
         if(request.getReceiverId() != null){
-            notificationFacade.sendNotification(zipCode,request.getReceiverId(), AlarmType.SENDING,null);
+            notificationPublisher.publishEvent(NotificationRequest.builder()
+                    .senderZipCode(zipCode)
+                    .receiverId(request.getReceiverId())
+                    .alarmType(AlarmType.SENDING)
+                    .data(null)
+                    .build());
         }
 
         return LetterResponse.fromEntity(savedLetter, zipCode);
diff --git a/src/main/java/io/crops/warmletter/domain/report/service/ReportService.java b/src/main/java/io/crops/warmletter/domain/report/service/ReportService.java
@@ -28,10 +28,12 @@
 import io.crops.warmletter.domain.share.exception.ShareProposalNotFoundException;
 import io.crops.warmletter.domain.share.repository.SharePostRepository;
 import io.crops.warmletter.domain.share.repository.ShareProposalRepository;
+import io.crops.warmletter.domain.timeline.dto.request.NotificationRequest;
 import io.crops.warmletter.domain.timeline.enums.AlarmType;
 import io.crops.warmletter.domain.timeline.facade.NotificationFacade;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -56,7 +58,8 @@ public class ReportService {
     private final ReportModerationService reportModerationService;
 
     private final AuthFacade authFacde;
-    private final NotificationFacade notificationFacade;
+
+    private final ApplicationEventPublisher notificationPublisher;
 
     @Transactional
     public UpdateReportResponse updateReport(Long reportId, UpdateReportRequest request) {
@@ -81,7 +84,12 @@ public UpdateReportResponse updateReport(Long reportId, UpdateReportRequest requ
             }
             resolvePendingReports(report);
             // targetMemberId로 알림 전송
-            notificationFacade.sendNotification(null, targetMemberId, AlarmType.REPORT, report.getAdminMemo()+"§"+reportedMember.getWarningCount());
+            notificationPublisher.publishEvent(NotificationRequest.builder()
+                    .senderZipCode(null)
+                    .receiverId(targetMemberId)
+                    .alarmType(AlarmType.REPORT)
+                    .data(report.getAdminMemo()+"§"+reportedMember.getWarningCount())
+                    .build());
         }
         return new UpdateReportResponse(report,reportedMember);
     }
@@ -142,7 +150,13 @@ public void updateReportWithAIResult(Long reportId, Map<String, String> moderati
                         .orElseThrow(MemberNotFoundException::new);
                 reportedMember.increaseWarningCount();
                 memberRepository.save(reportedMember);
-                notificationFacade.sendNotification(null, targetMemberId, AlarmType.REPORT, report.getAdminMemo()+"§"+reportedMember.getWarningCount());
+                // 알림
+                notificationPublisher.publishEvent(NotificationRequest.builder()
+                        .senderZipCode(null)
+                        .receiverId(targetMemberId)
+                        .alarmType(AlarmType.REPORT)
+                        .data(report.getAdminMemo()+"§"+reportedMember.getWarningCount())
+                        .build());
             }
             resolvePendingReports(report);
         }
diff --git a/src/main/java/io/crops/warmletter/domain/share/repository/ShareProposalRepository.java b/src/main/java/io/crops/warmletter/domain/share/repository/ShareProposalRepository.java
@@ -1,10 +1,20 @@
 package io.crops.warmletter.domain.share.repository;
 import io.crops.warmletter.domain.share.entity.ShareProposal;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface ShareProposalRepository extends JpaRepository<ShareProposal,Long >, ShareProposalRepositoryCustom {
-
+    @Query("SELECT m.zipCode " +
+            "FROM ShareProposal proposal " +
+            "JOIN Member m ON proposal.requesterId = m.id " +
+            "WHERE proposal.requesterId = :requesterId")
     String findZipCodeByRequesterId(Long requesterId);
+
+    @Query("SELECT m.zipCode " +
+            "FROM ShareProposal proposal " +
+            "JOIN Member m ON proposal.recipientId = m.id " +
+            "WHERE proposal.recipientId = :recipientId")
+    String findZipCodeByRecipientId(Long recipientId);
 }
diff --git a/src/main/java/io/crops/warmletter/domain/share/service/ShareProposalService.java b/src/main/java/io/crops/warmletter/domain/share/service/ShareProposalService.java
@@ -12,9 +12,11 @@
 import io.crops.warmletter.domain.share.exception.ShareAccessException;
 import io.crops.warmletter.domain.share.exception.ShareProposalNotFoundException;
 import io.crops.warmletter.domain.share.repository.*;
+import io.crops.warmletter.domain.timeline.dto.request.NotificationRequest;
 import io.crops.warmletter.domain.timeline.enums.AlarmType;
 import io.crops.warmletter.domain.timeline.facade.NotificationFacade;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
@@ -29,7 +31,7 @@ public class ShareProposalService {
     private final SharePostRepository sharePostRepository;
     private final AuthFacade authFacade;
 
-    private final NotificationFacade notificationFacade;
+    private final ApplicationEventPublisher notificationPublisher;
 
     @Transactional
     public ShareProposalResponse requestShareProposal(ShareProposalRequest request) {
@@ -48,15 +50,18 @@ public ShareProposalResponse requestShareProposal(ShareProposalRequest request)
             throw new ShareProposalNotFoundException();
         }
         // 알림 전송
-        notificationFacade.sendNotification(response.getZipCode(), request.getRecipientId(), AlarmType.SHARE, response.getShareProposalId().toString());
+        notificationPublisher.publishEvent(NotificationRequest.builder()
+                .senderZipCode(response.getZipCode())
+                .receiverId(request.getRecipientId())
+                .alarmType(AlarmType.SHARE)
+                .data(response.getShareProposalId().toString())
+                .build());
         return response;
     }
 
     @Transactional
     public ShareProposalStatusResponse approveShareProposal(Long shareProposalId) {
-
         Long memberId = authFacade.getCurrentUserId();
-
         ShareProposal shareProposal = shareProposalRepository.findById(shareProposalId)
                 .orElseThrow(() -> new ShareProposalNotFoundException());
 
@@ -73,11 +78,21 @@ public ShareProposalStatusResponse approveShareProposal(Long shareProposalId) {
                 .isActive(true)
                 .build();
         sharePost = sharePostRepository.save(sharePost);
-        // 알림 전송(양쪽다)
+        // 알림 전송(양쪽 다)
         String requestZipCode = shareProposalRepository.findZipCodeByRequesterId(shareProposal.getRequesterId());
-        String recipientZipCode = shareProposalRepository.findZipCodeByRequesterId(shareProposal.getRecipientId());
-        notificationFacade.sendNotification(recipientZipCode, shareProposal.getRequesterId(), AlarmType.POSTED, sharePost.getId().toString());
-        notificationFacade.sendNotification(requestZipCode, shareProposal.getRecipientId(), AlarmType.POSTED, sharePost.getId().toString());
+        String recipientZipCode = shareProposalRepository.findZipCodeByRecipientId(shareProposal.getRecipientId());
+        notificationPublisher.publishEvent(NotificationRequest.builder()
+                .senderZipCode(recipientZipCode)
+                .receiverId(shareProposal.getRequesterId())
+                .alarmType(AlarmType.POSTED)
+                .data(sharePost.getId().toString())
+                .build());
+        notificationPublisher.publishEvent(NotificationRequest.builder()
+                .senderZipCode(requestZipCode)
+                .receiverId(shareProposal.getRecipientId())
+                .alarmType(AlarmType.POSTED)
+                .data(sharePost.getId().toString())
+                .build());
         return ShareProposalStatusResponse.builder()
                 .shareProposalId(shareProposal.getId())
                 .status(shareProposal.getStatus())
diff --git a/src/main/java/io/crops/warmletter/domain/timeline/dto/request/NotificationRequest.java b/src/main/java/io/crops/warmletter/domain/timeline/dto/request/NotificationRequest.java
@@ -0,0 +1,14 @@
+package io.crops.warmletter.domain.timeline.dto.request;
+
+import io.crops.warmletter.domain.timeline.enums.AlarmType;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class NotificationRequest {
+    String senderZipCode;
+    Long receiverId;
+    AlarmType alarmType;
+    String data;
+}
diff --git a/src/main/java/io/crops/warmletter/domain/timeline/facade/NotificationFacade.java b/src/main/java/io/crops/warmletter/domain/timeline/facade/NotificationFacade.java
@@ -1,17 +1,27 @@
 package io.crops.warmletter.domain.timeline.facade;
 
+import io.crops.warmletter.domain.timeline.dto.request.NotificationRequest;
 import io.crops.warmletter.domain.timeline.enums.AlarmType;
 import io.crops.warmletter.domain.timeline.service.NotificationService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
 
 @Component
 @RequiredArgsConstructor
 public class NotificationFacade {
 
     private final NotificationService notificationService;
 
-    public void sendNotification(String senderZipCode, Long receiverId, AlarmType alarmType, String data) {
-        notificationService.createNotification(senderZipCode, receiverId, alarmType, data);
+    @Async
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    public void sendNotification(NotificationRequest notificationRequest) {
+        notificationService.createNotification(
+                notificationRequest.getSenderZipCode(),
+                notificationRequest.getReceiverId(),
+                notificationRequest.getAlarmType(),
+                notificationRequest.getData());
     }
 }
diff --git a/src/main/java/io/crops/warmletter/domain/timeline/service/NotificationService.java b/src/main/java/io/crops/warmletter/domain/timeline/service/NotificationService.java
@@ -27,24 +27,7 @@ public class NotificationService {
     private final TimelineRepository timelineRepository;
 
     public SseEmitter subscribeNotification(){
-        Long memberId;
-        try {
-            memberId = authFacade.getCurrentUserId();
-        } catch (UnauthorizedException e){
-            log.warn("SSE 구독 실패: 인증되지 않은 사용자");
-            SseEmitter emitter = new SseEmitter(0L);
-            NotificationResponse notificationResponse = NotificationResponse.builder()
-                    .title("Unauthorized")
-                    .alarmType("TEST").build();
-            try{
-                emitter.send(SseEmitter.event()
-                        .data(notificationResponse));
-            }catch (IOException ioException){
-                log.warn("SSE 에러 전송 실패 - Unauthorized");
-            }
-            emitter.complete();
-            return emitter;
-        }
+        Long memberId = authFacade.getCurrentUserId();
 
         SseEmitter emitter = new SseEmitter(600_000L); // 10분 후 타임아웃 설정
 
diff --git a/src/main/java/io/crops/warmletter/global/schedule/DeliverySchedule.java b/src/main/java/io/crops/warmletter/global/schedule/DeliverySchedule.java
@@ -4,12 +4,14 @@
 import io.crops.warmletter.domain.letter.enums.Status;
 import io.crops.warmletter.domain.letter.repository.LetterRepository;
 import io.crops.warmletter.domain.member.repository.MemberRepository;
+import io.crops.warmletter.domain.timeline.dto.request.NotificationRequest;
 import io.crops.warmletter.domain.timeline.dto.response.LetterAlarmResponse;
 import io.crops.warmletter.domain.timeline.enums.AlarmType;
 import io.crops.warmletter.domain.timeline.facade.NotificationFacade;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.Scheduled;
 
@@ -25,7 +27,8 @@
 public class DeliverySchedule {
 
     private final LetterRepository letterRepository;
-    private final NotificationFacade notificationFacade;
+
+    private final ApplicationEventPublisher notificationPublisher;
 
     @Transactional
     @Scheduled(cron = "0 */1 * * * *", zone = "Asia/Seoul")
@@ -55,11 +58,12 @@ public void processDeliveryCompletion() {
                 letter.updateStatus(Status.DELIVERED);
                 log.info("편지 ID: {} 배송 완료 처리됨", letter.getId());
                 // 도착 알림 전송
-                notificationFacade.sendNotification(
-                        senderZipCodes.get(letter.getWriterId()),
-                        letter.getReceiverId(),
-                        AlarmType.LETTER,
-                        letter.getId().toString());
+                notificationPublisher.publishEvent(NotificationRequest.builder()
+                        .senderZipCode(senderZipCodes.get(letter.getWriterId()))
+                        .receiverId(letter.getReceiverId())
+                        .alarmType(AlarmType.LETTER)
+                        .data(letter.getId().toString())
+                        .build());
             }
 
             // 변경사항 저장
diff --git a/src/test/java/io/crops/warmletter/domain/letter/service/LetterServiceTest.java b/src/test/java/io/crops/warmletter/domain/letter/service/LetterServiceTest.java
@@ -17,6 +17,7 @@
 import io.crops.warmletter.domain.member.enums.Role;
 import io.crops.warmletter.domain.member.facade.MemberFacade;
 import io.crops.warmletter.domain.member.repository.MemberRepository;
+import io.crops.warmletter.domain.timeline.dto.request.NotificationRequest;
 import io.crops.warmletter.domain.timeline.facade.NotificationFacade;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -25,6 +26,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import java.lang.reflect.Field;
@@ -61,6 +63,9 @@ class LetterServiceTest {
     @Mock
     private NotificationFacade notificationFacade;
 
+    @Mock
+    private ApplicationEventPublisher notificationPublisher;
+
     @InjectMocks
     private LetterService letterService;
 
@@ -406,7 +411,7 @@ void writeDirectLetter_success() {
         );
         //verify 메서드로 letterRepository.save() 메서드가 정확히 1번 호출되었는지 확인
         verify(letterRepository).save(any(Letter.class));
-        verify(notificationFacade).sendNotification(anyString(), anyLong(), any(), eq(null));
+        verify(notificationPublisher).publishEvent(any(NotificationRequest.class));
     }
 
     @Test
@@ -479,7 +484,7 @@ void createLetter_deletesSavedLetterWhenLetterIdProvided() {
         // then
         verify(letterRepository).delete(temporarySavedLetter);
         verify(letterRepository).save(any(Letter.class));
-
+        verify(notificationPublisher).publishEvent(any(NotificationRequest.class));
         // 응답 검증
         assertAll("편지 응답 검증",
                 () -> assertNotNull(response),
@@ -557,7 +562,7 @@ void createLetter_doesNotDeleteNonSavedLetter() {
         // then
         verify(letterRepository, never()).delete(nonSavedLetter);
         verify(letterRepository).save(any(Letter.class));
-
+        verify(notificationPublisher).publishEvent(any(NotificationRequest.class));
         // 응답 검증
         assertAll("편지 응답 검증",
                 () -> assertNotNull(response),
diff --git a/src/test/java/io/crops/warmletter/domain/report/service/ReportServiceTest.java b/src/test/java/io/crops/warmletter/domain/report/service/ReportServiceTest.java
diff --git a/src/test/java/io/crops/warmletter/domain/share/service/ShareProposalServiceTest.java b/src/test/java/io/crops/warmletter/domain/share/service/ShareProposalServiceTest.java
diff --git a/src/test/java/io/crops/warmletter/domain/timeline/facade/NotificationFacadeTest.java b/src/test/java/io/crops/warmletter/domain/timeline/facade/NotificationFacadeTest.java
diff --git a/src/test/java/io/crops/warmletter/domain/timeline/service/NotificationServiceTest.java b/src/test/java/io/crops/warmletter/domain/timeline/service/NotificationServiceTest.java
