Merge branch 'dev' into refactor/letter-temporary-save(WR9-112)

leeys9423 · web-flow · commit 5a1a3f02140a · 2025-03-07T16:29:10.000+09:00
diff --git a/src/main/java/io/crops/warmletter/domain/auth/service/AuthService.java b/src/main/java/io/crops/warmletter/domain/auth/service/AuthService.java
@@ -72,7 +72,7 @@ public TokenResponse reissue(String refreshToken, HttpServletResponse response)
                     .httpOnly(true)    // JavaScript에서 쿠키에 접근할 수 없도록 설정
                     .secure(true)      // HTTPS에서만 쿠키가 전송되도록 설정
                     .sameSite("None")  // 크로스 도메인 요청 허용
-                    .domain("serverDomain")
+                    .domain(serverDomain)
                     .path("/")         // 쿠키가 유효한 경로 설정
                     .maxAge(Duration.ofDays(14))  // 쿠키의 유효기간 설정 (14일)
                     .build();
diff --git a/src/main/java/io/crops/warmletter/domain/letter/dto/response/LetterResponse.java b/src/main/java/io/crops/warmletter/domain/letter/dto/response/LetterResponse.java
@@ -76,14 +76,14 @@ public static LetterResponse fromEntity(Letter letter, String zipCode) {
     }
 
     //이전편지 변환
-    public static LetterResponse fromEntityForPreviousLetters(Letter letter, String zipCode, Long myId, Long matchingId) {
+    public static LetterResponse fromEntityForPreviousLetters(Letter letter, String zipCode, Long matchingId) {
         return LetterResponse.builder()
                 .letterId(letter.getId()) //이전 편지의 정보들
                 .zipCode(zipCode)
                 .title(letter.getTitle())
                 .content(letter.getContent())
                 .category(letter.getCategory())
-                .memberId(myId)         //편지를 쓴 자기 자신의 id -> 이전 편지의 정보가 아님~!
+                .memberId(letter.getWriterId()) //이전 편지를 쓴 사용자
                 .matchingId(matchingId)
                 .build();
     }
diff --git a/src/main/java/io/crops/warmletter/domain/letter/repository/LetterMatchingRepository.java b/src/main/java/io/crops/warmletter/domain/letter/repository/LetterMatchingRepository.java
@@ -43,7 +43,7 @@ public interface LetterMatchingRepository extends JpaRepository<LetterMatching,
             "FROM LetterMatching lm " +
             "LEFT JOIN Letter l ON lm.id = l.matchingId AND l.status = 'DELIVERED' AND l.isActive = true " +
             "JOIN Member m ON (CASE WHEN lm.firstMemberId = :myId THEN lm.secondMemberId ELSE lm.firstMemberId END) = m.id " +
-            "WHERE (lm.firstMemberId = :myId OR lm.secondMemberId = :myId) AND lm.isActive = true " +
+            "WHERE (lm.firstMemberId = :myId OR lm.secondMemberId = :myId) " +
             "GROUP BY lm.id, m.zipCode, lm.isActive " +
             "ORDER BY lm.id DESC")
     List<MailboxResponse> findMailboxDetails(@Param("myId") Long myId);
diff --git a/src/main/java/io/crops/warmletter/domain/letter/repository/LetterRepository.java b/src/main/java/io/crops/warmletter/domain/letter/repository/LetterRepository.java
@@ -5,6 +5,7 @@
 import io.crops.warmletter.domain.letter.entity.Letter;
 import io.crops.warmletter.domain.letter.enums.Category;
 import io.crops.warmletter.domain.letter.enums.Status;
+import io.crops.warmletter.domain.timeline.dto.response.LetterAlarmResponse;
 import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -14,6 +15,7 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 
@@ -66,4 +68,12 @@ List<LetterDraftResponse> findDraftLettersWithMatching(@Param("writerId") Long w
     Optional<Letter> findByIdAndWriterIdAndStatusIsSAVED(Long id, Long writerId);
 
     List<Letter> findByStatusAndDeliveryCompletedAtLessThanEqual(Status status, LocalDateTime now);
+
+    @Query("SELECT new io.crops.warmletter.domain.timeline.dto.response.LetterAlarmResponse(" +
+            "l.writerId, m.zipCode) " +
+            "FROM Letter l " +
+            "JOIN Member m ON l.writerId = m.id " +
+            "WHERE l.status = 'IN_DELIVERY' " +
+            "AND l.deliveryCompletedAt <= :now")
+    List<LetterAlarmResponse> findZipCodeByLettersToComplete(LocalDateTime now);
 }
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
@@ -99,8 +99,9 @@ public LetterResponse createLetter(CreateLetterRequest request) {
 
         String zipCode = authFacade.getZipCode();
 
+        // 알림 전송
         if(request.getReceiverId() != null){
-            notificationFacade.sendNotification(zipCode,request.getReceiverId(), AlarmType.LETTER,savedLetter.getId().toString());
+            notificationFacade.sendNotification(zipCode,request.getReceiverId(), AlarmType.SENDING,null);
         }
 
         return LetterResponse.fromEntity(savedLetter, zipCode);
@@ -114,7 +115,7 @@ public List<LetterResponse> getPreviousLetters(Long letterId) {
 
         if(parentLetterId == null){
             String zipCode = memberRepository.findById(letter.getWriterId()).orElseThrow(MemberNotFoundException::new).getZipCode();
-            LetterResponse response = LetterResponse.fromEntityForPreviousLetters(letter,zipCode,myId, null);
+            LetterResponse response = LetterResponse.fromEntityForPreviousLetters(letter, zipCode, null);
             return List.of(response);
 
         }else{
@@ -130,7 +131,7 @@ public List<LetterResponse> getPreviousLetters(Long letterId) {
             for (Letter findLetter : lettersByParentId) {
                 if(findLetter.getStatus().equals(Status.DELIVERED)){
                     String zipCode = memberRepository.findById(findLetter.getWriterId()).orElseThrow(MemberNotFoundException::new).getZipCode();
-                    LetterResponse response = LetterResponse.fromEntityForPreviousLetters(findLetter,zipCode, myId, letterMatching.getId());
+                    LetterResponse response = LetterResponse.fromEntityForPreviousLetters(findLetter, zipCode, letterMatching.getId());
                     responses.add(response);
                 }
             }
diff --git a/src/main/java/io/crops/warmletter/domain/report/service/ReportModerationService.java b/src/main/java/io/crops/warmletter/domain/report/service/ReportModerationService.java
@@ -1,5 +1,6 @@
 package io.crops.warmletter.domain.report.service;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.crops.warmletter.domain.report.enums.ReasonType;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -26,14 +27,30 @@ public Map<String, String> moderateText(String text, ReasonType reasonType, Stri
         Map<String, Object> requestBody = buildRequestBody(prompt);
         HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(requestBody, headers);
 
-        ResponseEntity<Map> response = new RestTemplate().exchange(apiUrl, HttpMethod.POST, requestEntity, Map.class);
+        log.info("사용 중인 API URL: {}", apiUrl);
 
-        if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
-            log.info("AI Studio 응답: {}", response.getBody());
-            Map<String, String> result = parseResponse(response.getBody());
-            if (result != null) {
-                return result;
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            String jsonRequestBody = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(requestBody);
+
+            log.info("API 요청 시작 - URL: {}", apiUrl);
+            log.info("JSON 요청 바디: \n{}", jsonRequestBody);
+            log.info("요청 헤더: {}", headers);
+
+            ResponseEntity<Map> response = new RestTemplate().exchange(apiUrl, HttpMethod.POST, requestEntity, Map.class);
+
+
+            log.info("API 응답 코드: {}", response.getStatusCode());
+            log.info("API 응답 바디: {}", response.getBody());
+
+            if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
+                Map<String, String> result = parseResponse(response.getBody());
+                if (result != null) {
+                    return result;
+                }
             }
+        } catch (Exception e) {
+            log.error("🚨 API 요청 실패: {}", e.getMessage(), e);
         }
         return defaultResult("AI 응답 없음 또는 오류 발생");
     }
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
@@ -80,7 +80,7 @@ public UpdateReportResponse updateReport(Long reportId, UpdateReportRequest requ
                 memberRepository.save(reportedMember);
             }
             resolvePendingReports(report);
-            // targetMemberId로 알림 전송 TODO : 배포 후 테스트 예정
+            // targetMemberId로 알림 전송
             notificationFacade.sendNotification(null, targetMemberId, AlarmType.REPORT, report.getAdminMemo()+"§"+reportedMember.getWarningCount());
         }
         return new UpdateReportResponse(report,reportedMember);
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
@@ -45,7 +45,7 @@ public ShareProposalResponse requestShareProposal(ShareProposalRequest request)
         if (response == null) {
             throw new ShareProposalNotFoundException();
         }
-        // 알림 전송 TODO : 배포 후 테스트 예정
+        // 알림 전송
         notificationFacade.sendNotification(response.getZipCode(), request.getRecipientId(), AlarmType.SHARE, response.getShareProposalId().toString());
         return response;
     }
@@ -71,7 +71,7 @@ public ShareProposalStatusResponse approveShareProposal(Long shareProposalId) {
                 .isActive(true)
                 .build();
         sharePost = sharePostRepository.save(sharePost);
-        // 알림 전송(양쪽다) / 인가 값이 없어서 일단 우편번호는 임시값으로 대체 TODO : 배포 후 테스트 예정
+        // 알림 전송(양쪽다) / 인가 값이 없어서 일단 우편번호는 임시값으로 대체
         notificationFacade.sendNotification("승인요청자", shareProposal.getRequesterId(), AlarmType.POSTED, sharePost.getId().toString());
         notificationFacade.sendNotification("승인수락자", shareProposal.getRecipientId(), AlarmType.POSTED, sharePost.getId().toString());
         return ShareProposalStatusResponse.builder()
diff --git a/src/main/java/io/crops/warmletter/domain/timeline/controller/NotificationController.java b/src/main/java/io/crops/warmletter/domain/timeline/controller/NotificationController.java
@@ -1,18 +1,13 @@
 package io.crops.warmletter.domain.timeline.controller;
 
-import io.crops.warmletter.domain.timeline.dto.response.ReadNotificationResponse;
 import io.crops.warmletter.domain.timeline.service.NotificationService;
-import io.crops.warmletter.global.response.BaseResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-import java.util.List;
-
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/notifications")
diff --git a/src/main/java/io/crops/warmletter/domain/timeline/dto/response/LetterAlarmResponse.java b/src/main/java/io/crops/warmletter/domain/timeline/dto/response/LetterAlarmResponse.java
@@ -0,0 +1,11 @@
+package io.crops.warmletter.domain.timeline.dto.response;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class LetterAlarmResponse {
+    private Long writerId;
+    private String zipCode;
+}
diff --git a/src/main/java/io/crops/warmletter/domain/timeline/enums/AlarmType.java b/src/main/java/io/crops/warmletter/domain/timeline/enums/AlarmType.java
@@ -2,5 +2,5 @@
 
 public enum AlarmType {
     // 편지수신, 신고처리, 공유요청, 게시판 게시됨
-    LETTER, REPORT, SHARE, POSTED
+    SENDING, LETTER, REPORT, SHARE, POSTED
 }
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
@@ -2,24 +2,22 @@
 
 import io.crops.warmletter.domain.auth.facade.AuthFacade;
 import io.crops.warmletter.domain.timeline.dto.response.NotificationResponse;
-import io.crops.warmletter.domain.timeline.dto.response.ReadNotificationResponse;
 import io.crops.warmletter.domain.timeline.entity.Timeline;
 import io.crops.warmletter.domain.timeline.enums.AlarmType;
-import io.crops.warmletter.domain.timeline.exception.NotificationNotFoundException;
 import io.crops.warmletter.domain.timeline.repository.TimelineRepository;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class NotificationService {
@@ -33,8 +31,8 @@ public SseEmitter subscribeNotification(){
 
         emitters.put(memberId, emitter);
 
-        emitter.onCompletion(() -> emitters.remove(memberId)); // 연결 종료 시 제거
-        emitter.onTimeout(() -> emitters.remove(memberId)); // 타임아웃 시 제거
+        emitter.onCompletion(() -> handleCompletion(memberId));
+        emitter.onTimeout(() -> handleTimeout(memberId, emitter));
 
         NotificationResponse notificationResponse = NotificationResponse.builder()
                 .title("사용자 " + memberId + " EventStream 생성")
@@ -45,6 +43,17 @@ public SseEmitter subscribeNotification(){
         return emitter;
     }
 
+    protected void handleCompletion(Long memberId) {
+        emitters.remove(memberId);
+        log.info("SSE 연결 종료");
+    }
+
+    protected void handleTimeout(Long memberId, SseEmitter emitter) {
+        emitters.remove(memberId);
+        log.info("SSE 연결 타임아웃 발생");
+        emitter.complete();
+    }
+
     // 편지 수신, 신고 조치, 공유 요청, 공유 게시글 등록 시 호출 필요
     @Transactional
     public void createNotification(String senderZipCode, Long receiverId, AlarmType alarmType, String data){
@@ -55,9 +64,12 @@ public void createNotification(String senderZipCode, Long receiverId, AlarmType
                 .alarmType(alarmType);
 
         switch(alarmType) {
-            case LETTER:
+            case SENDING:
                 builder.title(senderZipCode+"님이 편지를 보냈습니다.");
                 break;
+            case LETTER:
+                builder.title(senderZipCode+"님의 편지가 도착했습니다.");
+                break;
             case REPORT:
                 builder.title("따숨님, 최근 활동에 대해 경고를 받으셨어요.");
                 break;
@@ -82,16 +94,17 @@ public void createNotification(String senderZipCode, Long receiverId, AlarmType
         sendEventToClient(receiverId,notificationResponse);
     }
 
-    private void sendEventToClient(Long receiverId, NotificationResponse notificationResponse){
+    protected void sendEventToClient(Long receiverId, NotificationResponse notificationResponse){
         SseEmitter emitter = emitters.get(receiverId);
         if (emitter != null) {
             try {
                 emitter.send(SseEmitter.event()
                         .data(notificationResponse, MediaType.APPLICATION_JSON));
+                log.info("사용자 ID : {}으로 알림 전송 성공", receiverId);
             } catch (IOException e) {
-                emitter.complete();
                 emitters.remove(receiverId);
-
+                log.warn("사용자 ID : {}으로 알림 전송 실패",receiverId);
+                emitter.complete();
             }
         }
     }
@@ -107,8 +120,9 @@ public void sendHeartbeat() {
                         .name("heartbeat")
                         .data("ping"));
             } catch (IOException e) {
-                emitter.complete();
                 emitters.remove(memberId);
+                log.warn("사용자 ID : {} 대상 Heartbeat 전송 실패",memberId);
+                emitter.complete();
             }
         }
     }
diff --git a/src/main/java/io/crops/warmletter/global/jwt/filter/JwtAuthenticationFilter.java b/src/main/java/io/crops/warmletter/global/jwt/filter/JwtAuthenticationFilter.java
@@ -57,6 +57,11 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         filterChain.doFilter(request, response);
     }
 
+    @Override
+    protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
+        return request.getRequestURI().equals("/api/reissue");
+    }
+
     // 헤더에서 토큰 추출
     private String resolveToken(HttpServletRequest request) {
         String bearerToken = request.getHeader("Authorization");
diff --git a/src/main/java/io/crops/warmletter/global/oauth/handler/OAuth2AuthenticationSuccessHandler.java b/src/main/java/io/crops/warmletter/global/oauth/handler/OAuth2AuthenticationSuccessHandler.java
@@ -45,7 +45,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
                 .httpOnly(true)    // JavaScript에서 쿠키에 접근할 수 없도록 설정
                 .secure(true)      // HTTPS에서만 쿠키가 전송되도록 설정
                 .sameSite("None")  // 크로스 도메인 요청 허용
-                .domain("13.209.132.150.nip.io")
+                .domain(serverDomain)
                 .path("/")         // 쿠키가 유효한 경로 설정
                 .maxAge(Duration.ofDays(14))  // 쿠키의 유효기간 설정 (14일)
                 .build();
diff --git a/src/main/java/io/crops/warmletter/global/schedule/DeliverySchedule.java b/src/main/java/io/crops/warmletter/global/schedule/DeliverySchedule.java
@@ -3,6 +3,10 @@
 import io.crops.warmletter.domain.letter.entity.Letter;
 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.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;
@@ -12,13 +16,16 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Configuration
 @RequiredArgsConstructor
 public class DeliverySchedule {
 
     private final LetterRepository letterRepository;
+    private final NotificationFacade notificationFacade;
 
     @Transactional
     @Scheduled(cron = "0 */1 * * * *", zone = "Asia/Seoul")
@@ -31,6 +38,10 @@ public void processDeliveryCompletion() {
         // 배송 완료 조건을 만족하는 편지 목록 조회 (배송 중이면서 배송 완료 시간이 현재보다 이전인 편지)
         List<Letter> lettersToComplete = letterRepository.findByStatusAndDeliveryCompletedAtLessThanEqual(
                 Status.IN_DELIVERY, now);
+        // lettersToComplete 조건을 만족하는 편지를 보낸 사람의 zipCode 조회
+        List<LetterAlarmResponse> zipCodeData = letterRepository.findZipCodeByLettersToComplete(now);
+        Map<Long, String> senderZipCodes = zipCodeData.stream()
+                .collect(Collectors.toMap(LetterAlarmResponse::getWriterId, LetterAlarmResponse::getZipCode));
 
         if (!lettersToComplete.isEmpty()) {
             log.info("배송 완료 처리할 편지 수: {}", lettersToComplete.size());
@@ -39,6 +50,12 @@ public void processDeliveryCompletion() {
             for (Letter letter : lettersToComplete) {
                 letter.updateStatus(Status.DELIVERED);
                 log.info("편지 ID: {} 배송 완료 처리됨", letter.getId());
+                // 도착 알림 전송
+                notificationFacade.sendNotification(
+                        senderZipCodes.get(letter.getWriterId()),
+                        letter.getReceiverId(),
+                        AlarmType.LETTER,
+                        letter.getId().toString());
             }
 
             // 변경사항 저장
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
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
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

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public UpdateReportResponse updateReport(Long reportId, UpdateReportRequest requ`
`80`	`80`	`memberRepository.save(reportedMember);`
`81`	`81`	`}`
`82`	`82`	`resolvePendingReports(report);`
`83`		`- // targetMemberId로 알림 전송 TODO : 배포 후 테스트 예정`
	`83`	`+ // targetMemberId로 알림 전송`
`84`	`84`	`notificationFacade.sendNotification(null, targetMemberId, AlarmType.REPORT, report.getAdminMemo()+"§"+reportedMember.getWarningCount());`
`85`	`85`	`}`
`86`	`86`	`return new UpdateReportResponse(report,reportedMember);`