From 0084eac64ad84efc4bf882457337cf9f4b4dc6cd Mon Sep 17 00:00:00 2001 From: BAEK0111 Date: Wed, 22 Oct 2025 21:14:28 +0900 Subject: [PATCH] =?UTF-8?q?fix/#38=20-=20=EC=B1=84=ED=8C=85=20=EC=A0=84?= =?UTF-8?q?=EC=86=A1=20=EC=8B=9C=20=EC=95=8C=EB=A6=BC=20=EC=A0=84=EC=86=A1?= =?UTF-8?q?=20@Transactional=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assu/server/domain/chat/controller/ChatController.java | 6 +++++- .../assu/server/domain/chat/service/ChatServiceImpl.java | 1 - .../domain/partnership/service/PartnershipServiceImpl.java | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/assu/server/domain/chat/controller/ChatController.java b/src/main/java/com/assu/server/domain/chat/controller/ChatController.java index 9395a09..176b23a 100644 --- a/src/main/java/com/assu/server/domain/chat/controller/ChatController.java +++ b/src/main/java/com/assu/server/domain/chat/controller/ChatController.java @@ -12,6 +12,7 @@ import com.assu.server.global.util.PresenceTracker; import com.assu.server.global.util.PrincipalDetails; import io.swagger.v3.oas.annotations.Operation; +import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.handler.annotation.MessageMapping; @@ -70,6 +71,7 @@ public BaseResponse> "- receiverId: Request Body, Long\n" + "- message: Request Body, String\n" ) + @Transactional @MessageMapping("/send") public void handleMessage(@Payload ChatRequestDTO.ChatMessageRequestDTO request) { // 먼저 접속 여부 확인 후 unreadCount 계산 @@ -99,14 +101,16 @@ public void handleMessage(@Payload ChatRequestDTO.ChatMessageRequestDTO request) updateDTO ); Member sender = memberRepository.findById(request.getSenderId()).orElse(null); - String senderName = ""; + String senderName; if (sender.getRole()== UserRole.ADMIN) { senderName = sender.getAdminProfile().getName(); } else { senderName = sender.getPartnerProfile().getName(); } + log.info(">>>>>>>>메시지 전송은 될걸"); notificationCommandService.sendChat(request.getReceiverId(), request.getRoomId(), senderName, request.getMessage()); + log.info(">>>>>>>>알림이 가나"); } } diff --git a/src/main/java/com/assu/server/domain/chat/service/ChatServiceImpl.java b/src/main/java/com/assu/server/domain/chat/service/ChatServiceImpl.java index 14bc8e3..a4f7ad0 100644 --- a/src/main/java/com/assu/server/domain/chat/service/ChatServiceImpl.java +++ b/src/main/java/com/assu/server/domain/chat/service/ChatServiceImpl.java @@ -128,7 +128,6 @@ public ChatResponseDTO.SendMessageResponseDTO sendGuideMessage(ChatRequestDTO.Ch ChatResponseDTO.SendMessageResponseDTO responseDTO = ChatConverter.toSendMessageDTO(saved); simpMessagingTemplate.convertAndSend("/sub/chat/" + request.getRoomId(), responseDTO); - notificationCommandService.sendChat(receiver.getId(), room.getId(), sender.getAdminProfile().getName(), "제안서 초안이 도착했습니다. 확인해 주세요"); return responseDTO; } diff --git a/src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java b/src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java index 3557eb5..89955e4 100644 --- a/src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java +++ b/src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java @@ -311,6 +311,7 @@ public PartnershipResponseDTO.UpdateResponseDTO updatePartnershipStatus(Long par 0 ); chatService.sendGuideMessage(guideMessageRequest); + notificationService.sendChat(adminId, chattingRoom.getId(), partner.getName(), guideMessage); } else if (next.equals(ActivationStatus.ACTIVE)) { String guideMessage = "축하드립니다!\n" + "제휴 계약이 성립되었습니다. 제휴 계약서를 다시한번 확인해 보세요!"; @@ -322,6 +323,7 @@ public PartnershipResponseDTO.UpdateResponseDTO updatePartnershipStatus(Long par 0 ); chatService.sendGuideMessage(guideMessageRequest); + notificationService.sendChat(partnerId, chattingRoom.getId(), admin.getName(), guideMessage); } return PartnershipResponseDTO.UpdateResponseDTO.builder() @@ -452,6 +454,7 @@ public PartnershipResponseDTO.CreateDraftResponseDTO createDraftPartnership(Part // 5. 완성된 DTO를 사용해서 안내 메시지를 전송합니다. chatService.sendGuideMessage(guideMessageRequest); + notificationService.sendChat(partner.getId(), chattingRoom.getId(), admin.getName(), guideMessage); return PartnershipConverter.toCreateDraftResponseDTO(draftPaper); }