Merge pull request #247 from prgrms-web-devcourse-final-project/fix/alarm-async2(WR9-143)

Fix/alarm async2(wr9 143)

Author: LeeVell

src/main/java/io/crops/warmletter/domain/share/repository/ShareProposalRepository.java

@@ -9,12 +9,14 @@ public interface ShareProposalRepository extends JpaRepository<ShareProposal,Lon
     @Query("SELECT m.zipCode " +
             "FROM ShareProposal proposal " +
             "JOIN Member m ON proposal.requesterId = m.id " +
-            "WHERE proposal.requesterId = :requesterId")
-    String findZipCodeByRequesterId(Long requesterId);
+            "WHERE proposal.id = :id " +
+            "AND proposal.requesterId = :requesterId ")
+    String findZipCodeByRequesterId(Long id, 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);
+            "WHERE proposal.id = :id " +
+            "AND proposal.recipientId = :recipientId ")
+    String findZipCodeByRecipientId(Long id, Long recipientId);
 }

src/main/java/io/crops/warmletter/domain/share/service/ShareProposalService.java

@@ -14,7 +14,6 @@
 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;
@@ -79,8 +78,8 @@ public ShareProposalStatusResponse approveShareProposal(Long shareProposalId) {
                 .build();
         sharePost = sharePostRepository.save(sharePost);
         // 알림 전송(양쪽 다)
-        String requestZipCode = shareProposalRepository.findZipCodeByRequesterId(shareProposal.getRequesterId());
-        String recipientZipCode = shareProposalRepository.findZipCodeByRecipientId(shareProposal.getRecipientId());
+        String requestZipCode = shareProposalRepository.findZipCodeByRequesterId(shareProposalId, shareProposal.getRequesterId());
+        String recipientZipCode = shareProposalRepository.findZipCodeByRecipientId(shareProposalId, shareProposal.getRecipientId());
         notificationPublisher.publishEvent(NotificationRequest.builder()
                 .senderZipCode(recipientZipCode)
                 .receiverId(shareProposal.getRequesterId())

src/main/java/io/crops/warmletter/domain/timeline/facade/NotificationFacade.java

@@ -1,7 +1,6 @@
 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;

src/main/java/io/crops/warmletter/domain/timeline/service/NotificationService.java

@@ -1,6 +1,5 @@
 package io.crops.warmletter.domain.timeline.service;
 
-import io.crops.warmletter.domain.auth.exception.UnauthorizedException;
 import io.crops.warmletter.domain.auth.facade.AuthFacade;
 import io.crops.warmletter.domain.timeline.dto.response.NotificationResponse;
 import io.crops.warmletter.domain.timeline.entity.Timeline;
@@ -9,6 +8,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,7 +57,9 @@ protected void handleTimeout(Long memberId, SseEmitter emitter) {
     }
 
     // 편지 수신, 신고 조치, 공유 요청, 공유 게시글 등록 시 호출 필요
-    public void createNotification(String senderZipCode, Long receiverId, AlarmType alarmType, String data){
+    @Transactional
+    public void createNotification(String senderZipCode, Long receiverId, AlarmType alarmType, String data) {
+
         Timeline.TimelineBuilder builder = Timeline.builder()
                 .memberId(receiverId)
                 // data = LETTER: letterId / REPORT: adminMemo, 경고횟수 / SHARE: shareProposalId / POSTED: sharePostId
@@ -111,6 +113,7 @@ protected void sendEventToClient(Long receiverId, NotificationResponse notificat
     }
 
     // 연결을 확인하기 위한 Heartbeat를 30초마다 실행
+    @Async
     @Scheduled(fixedRate = 30000)
     public void sendHeartbeat() {
         NotificationResponse notificationResponse = NotificationResponse.builder()

src/main/java/io/crops/warmletter/global/config/AsyncConfig.java

@@ -0,0 +1,9 @@
+package io.crops.warmletter.global.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+@Configuration
+@EnableAsync
+public class AsyncConfig {
+}