From 8d4ecff59ebb4bd16333b7729fc84177055b98e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8F=99=ED=9B=88?= <2dh2@naver.com> Date: Tue, 17 Feb 2026 15:09:56 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EB=8B=A8=EC=B2=B4=20=EC=B1=84?= =?UTF-8?q?=ED=8C=85=20=EC=95=8C=EB=A6=BC=EC=97=90=EC=84=9C=20=EC=A0=9C?= =?UTF-8?q?=EB=AA=A9=EC=97=90=20=EB=B0=9C=EC=86=A1=EC=9E=90=EA=B0=80=20?= =?UTF-8?q?=EC=95=84=EB=8B=8C=20=EB=8F=99=EC=95=84=EB=A6=AC=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../konect/domain/chat/group/service/GroupChatService.java | 3 ++- .../domain/notification/service/NotificationService.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/gg/agit/konect/domain/chat/group/service/GroupChatService.java b/src/main/java/gg/agit/konect/domain/chat/group/service/GroupChatService.java index a4714a9c0..1911d16cf 100644 --- a/src/main/java/gg/agit/konect/domain/chat/group/service/GroupChatService.java +++ b/src/main/java/gg/agit/konect/domain/chat/group/service/GroupChatService.java @@ -158,6 +158,7 @@ public GroupChatMessageResponse sendMessage(Integer clubId, Integer userId, Stri Integer messageId = message.getId(); Integer senderId = sender.getId(); String senderName = sender.getName(); + String clubName = room.getClub().getName(); String messageContent = message.getContent(); LocalDateTime createdAt = message.getCreatedAt(); @@ -170,7 +171,7 @@ public GroupChatMessageResponse sendMessage(Integer clubId, Integer userId, Stri notificationService.sendGroupChatNotification( roomId, senderId, - senderName, + clubName, messageContent, filteredRecipients ); diff --git a/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java b/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java index d24effaa1..fb4680924 100644 --- a/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java +++ b/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java @@ -197,7 +197,7 @@ public void sendChatNotification(Integer receiverId, Integer roomId, String send public void sendGroupChatNotification( Integer roomId, Integer senderId, - String senderName, + String clubName, String messageContent, List recipientUserIds ) { @@ -235,7 +235,7 @@ public void sendGroupChatNotification( } List messages = tokens.stream() - .map(token -> new ExpoPushMessage(token, senderName, truncatedBody, data)) + .map(token -> new ExpoPushMessage(token, clubName, truncatedBody, data)) .toList(); HttpHeaders headers = new HttpHeaders(); From eca1f6b88122f0cd9d2c8617faa5c60bf315cdcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8F=99=ED=9B=88?= <2dh2@naver.com> Date: Tue, 17 Feb 2026 15:13:27 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EB=8B=A8=EC=B2=B4=20=EC=B1=84?= =?UTF-8?q?=ED=8C=85=20=EC=95=8C=EB=A6=BC=EC=97=90=EC=84=9C=20=EB=AF=B8?= =?UTF-8?q?=EB=A6=AC=EB=B3=B4=EA=B8=B0=EC=97=90=20=EB=B0=9C=EC=86=A1?= =?UTF-8?q?=EC=9E=90=20=EC=9D=B4=EB=A6=84=20=EC=B6=94=EA=B0=80=EB=A1=9C=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../konect/domain/chat/group/service/GroupChatService.java | 1 + .../domain/notification/service/NotificationService.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/gg/agit/konect/domain/chat/group/service/GroupChatService.java b/src/main/java/gg/agit/konect/domain/chat/group/service/GroupChatService.java index 1911d16cf..85f4f0252 100644 --- a/src/main/java/gg/agit/konect/domain/chat/group/service/GroupChatService.java +++ b/src/main/java/gg/agit/konect/domain/chat/group/service/GroupChatService.java @@ -172,6 +172,7 @@ public GroupChatMessageResponse sendMessage(Integer clubId, Integer userId, Stri roomId, senderId, clubName, + senderName, messageContent, filteredRecipients ); diff --git a/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java b/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java index fb4680924..6caadb56d 100644 --- a/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java +++ b/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java @@ -198,6 +198,7 @@ public void sendGroupChatNotification( Integer roomId, Integer senderId, String clubName, + String senderName, String messageContent, List recipientUserIds ) { @@ -213,6 +214,7 @@ public void sendGroupChatNotification( } String truncatedBody = buildPreview(messageContent); + String previewBody = senderName + ": " + truncatedBody; Map data = new HashMap<>(); data.put("path", "chats/rooms/" + roomId + "?type=GROUP"); @@ -235,7 +237,7 @@ public void sendGroupChatNotification( } List messages = tokens.stream() - .map(token -> new ExpoPushMessage(token, clubName, truncatedBody, data)) + .map(token -> new ExpoPushMessage(token, clubName, previewBody, data)) .toList(); HttpHeaders headers = new HttpHeaders(); From 052a3bb70cdbef20cd530e460e2fc8d1a2d38111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8F=99=ED=9B=88?= <2dh2@naver.com> Date: Tue, 17 Feb 2026 15:14:01 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=EB=94=A5=EB=A7=81=ED=81=AC=EC=97=90?= =?UTF-8?q?=20=EC=BF=BC=EB=A6=AC=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/notification/service/NotificationService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java b/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java index 6caadb56d..b5eec80c1 100644 --- a/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java +++ b/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java @@ -131,7 +131,7 @@ public void sendChatNotification(Integer receiverId, Integer roomId, String send String truncatedBody = buildPreview(messageContent); Map data = new HashMap<>(); - data.put("path", "chats/rooms/" + roomId + "?type=DIRECT"); + data.put("path", "chats/rooms/" + roomId); List messages = tokens.stream() .map(token -> new ExpoPushMessage(token, senderName, truncatedBody, data)) @@ -216,7 +216,7 @@ public void sendGroupChatNotification( String truncatedBody = buildPreview(messageContent); String previewBody = senderName + ": " + truncatedBody; Map data = new HashMap<>(); - data.put("path", "chats/rooms/" + roomId + "?type=GROUP"); + data.put("path", "chats/rooms/" + roomId); for (Integer recipientId : filteredRecipients) { try {