From 3d010430ad644aae84177168aa8f7a53570d38f0 Mon Sep 17 00:00:00 2001 From: sunsetkk Date: Fri, 1 Aug 2025 21:44:37 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix(chat):=20isMine=3Dfalse=20=EA=B3=A0?= =?UTF-8?q?=EC=A0=95=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deepwebide_be/chat/dto/response/ChatMessageBroadcast.java | 4 ++-- .../deepwebide_be/chat/service/ChatMessageWriteService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/deepdirect/deepwebide_be/chat/dto/response/ChatMessageBroadcast.java b/src/main/java/com/deepdirect/deepwebide_be/chat/dto/response/ChatMessageBroadcast.java index 3c69221..0c22666 100644 --- a/src/main/java/com/deepdirect/deepwebide_be/chat/dto/response/ChatMessageBroadcast.java +++ b/src/main/java/com/deepdirect/deepwebide_be/chat/dto/response/ChatMessageBroadcast.java @@ -45,7 +45,7 @@ public class ChatMessageBroadcast { private boolean isMine; - public static ChatMessageBroadcast of(ChatMessage message, User sender, Long repositoryId, CodeReferenceResponse codeReference) { + public static ChatMessageBroadcast of(ChatMessage message, User sender, Long repositoryId, CodeReferenceResponse codeReference, Long currentUserId) { return ChatMessageBroadcast.builder() .repositoryId(repositoryId) .type(ChatMessageType.CHAT) //일반 채팅 @@ -56,7 +56,7 @@ public static ChatMessageBroadcast of(ChatMessage message, User sender, Long rep .message(message.getMessage()) .codeReference(codeReference) .sentAt(message.getSentAt()) - .isMine(false) + .isMine(sender.getId().equals(currentUserId)) .build(); } diff --git a/src/main/java/com/deepdirect/deepwebide_be/chat/service/ChatMessageWriteService.java b/src/main/java/com/deepdirect/deepwebide_be/chat/service/ChatMessageWriteService.java index 1710e41..93c6693 100644 --- a/src/main/java/com/deepdirect/deepwebide_be/chat/service/ChatMessageWriteService.java +++ b/src/main/java/com/deepdirect/deepwebide_be/chat/service/ChatMessageWriteService.java @@ -73,6 +73,6 @@ public ChatMessageBroadcast saveChatMessage(Long userId, ChatMessageRequest requ // 3. 응답 DTO 변환 CodeReferenceResponse codeReferenceResponse = reference != null ? CodeReferenceResponse.from(reference) : null; - return ChatMessageBroadcast.of(chatMessage, sender, repositoryId, codeReferenceResponse); + return ChatMessageBroadcast.of(chatMessage, sender, repositoryId, codeReferenceResponse, userId); } } From 202e43c999ba6a1a79e372a7f0175a7f14d179be Mon Sep 17 00:00:00 2001 From: sunsetkk Date: Fri, 1 Aug 2025 22:20:50 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix(chat):=20redis=20=EC=B1=84=EB=84=90=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95=20DP-178?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deepwebide_be/chat/controller/ChatWebSocketController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/deepdirect/deepwebide_be/chat/controller/ChatWebSocketController.java b/src/main/java/com/deepdirect/deepwebide_be/chat/controller/ChatWebSocketController.java index 83ede51..652d62d 100644 --- a/src/main/java/com/deepdirect/deepwebide_be/chat/controller/ChatWebSocketController.java +++ b/src/main/java/com/deepdirect/deepwebide_be/chat/controller/ChatWebSocketController.java @@ -38,6 +38,6 @@ public void sendMessage( ChatMessageBroadcast broadcast = chatMessageWriteService.saveChatMessage(userId, request); // 3. Redis 채널로 publish - redisPublisher.publish("chatroom:" + request.getRepositoryId(), broadcast); + redisPublisher.publish("chat:" + request.getRepositoryId(), broadcast); } } \ No newline at end of file From 0285f7c7ff6e8984eec85f2ae3efa3b88a792efe Mon Sep 17 00:00:00 2001 From: sunsetkk Date: Fri, 1 Aug 2025 22:22:41 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix(chat):=20redis=20=EC=B1=84=EB=84=90=20?= =?UTF-8?q?=EC=A4=91=EB=B3=B5=20=EA=B5=AC=EB=8F=85=20=ED=98=84=EC=83=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20DP-178?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/deepdirect/deepwebide_be/global/config/RedisConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/deepdirect/deepwebide_be/global/config/RedisConfig.java b/src/main/java/com/deepdirect/deepwebide_be/global/config/RedisConfig.java index d9de65b..8bb047c 100644 --- a/src/main/java/com/deepdirect/deepwebide_be/global/config/RedisConfig.java +++ b/src/main/java/com/deepdirect/deepwebide_be/global/config/RedisConfig.java @@ -25,7 +25,7 @@ public class RedisConfig { public RedisMessageListenerContainer redisMessageListenerContainer() { RedisMessageListenerContainer container = new RedisMessageListenerContainer(); container.setConnectionFactory(connectionFactory); - container.addMessageListener(redisSubscriber, new PatternTopic("chat:*")); +// container.addMessageListener(redisSubscriber, new PatternTopic("chat:*")); return container; } From 953ab80b799c1338a3eb62cfe91f733238871033 Mon Sep 17 00:00:00 2001 From: sunsetkk Date: Fri, 1 Aug 2025 22:37:06 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix(chat):=20isMine=20=E2=86=92=20IsMine=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20DP-178?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat/dto/response/ChatMessageBroadcast.java | 9 ++++----- .../deepwebide_be/chat/util/RedisSubscriber.java | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/deepdirect/deepwebide_be/chat/dto/response/ChatMessageBroadcast.java b/src/main/java/com/deepdirect/deepwebide_be/chat/dto/response/ChatMessageBroadcast.java index 0c22666..4f88248 100644 --- a/src/main/java/com/deepdirect/deepwebide_be/chat/dto/response/ChatMessageBroadcast.java +++ b/src/main/java/com/deepdirect/deepwebide_be/chat/dto/response/ChatMessageBroadcast.java @@ -5,7 +5,6 @@ import com.deepdirect.deepwebide_be.member.domain.User; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -41,8 +40,8 @@ public class ChatMessageBroadcast { @Schema(description = "보낸 시간") private LocalDateTime sentAt; - @Schema(description = "내 메시지 여부", name = "IsMine") - private boolean isMine; + @Schema(description = "내 메시지 여부") + private boolean IsMine; public static ChatMessageBroadcast of(ChatMessage message, User sender, Long repositoryId, CodeReferenceResponse codeReference, Long currentUserId) { @@ -56,7 +55,7 @@ public static ChatMessageBroadcast of(ChatMessage message, User sender, Long rep .message(message.getMessage()) .codeReference(codeReference) .sentAt(message.getSentAt()) - .isMine(sender.getId().equals(currentUserId)) + .IsMine(sender.getId().equals(currentUserId)) .build(); } @@ -71,7 +70,7 @@ public static ChatMessageBroadcast system(User user, ChatMessageType type, Strin .message(message) .codeReference(null) .sentAt(LocalDateTime.now()) - .isMine(false) + .IsMine(false) .build(); } } \ No newline at end of file diff --git a/src/main/java/com/deepdirect/deepwebide_be/chat/util/RedisSubscriber.java b/src/main/java/com/deepdirect/deepwebide_be/chat/util/RedisSubscriber.java index a8e91c1..2d0f97c 100644 --- a/src/main/java/com/deepdirect/deepwebide_be/chat/util/RedisSubscriber.java +++ b/src/main/java/com/deepdirect/deepwebide_be/chat/util/RedisSubscriber.java @@ -4,7 +4,6 @@ import com.deepdirect.deepwebide_be.chat.dto.response.ChatSystemMessageResponse; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.sentry.Sentry; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.connection.Message; @@ -45,7 +44,7 @@ public void onMessage(Message message, byte[] pattern) { .message(broadcast.getMessage()) .codeReference(broadcast.getCodeReference()) .sentAt(broadcast.getSentAt()) - .isMine(false) + .IsMine(false) .build(); messagingTemplate.convertAndSend("/sub/repositories/" + repositoryId + "/chat", response);