From 97f7dd3283480e7d7a4214ef7194f4239412ac71 Mon Sep 17 00:00:00 2001 From: andrew Date: Mon, 10 Feb 2025 15:05:45 +0900 Subject: [PATCH 1/2] =?UTF-8?q?CLAP-361=20Fix=20:=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=EC=9E=90=20=EB=A7=A4=ED=95=91=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/application/service/history/PostCommentService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/clap/server/application/service/history/PostCommentService.java b/src/main/java/clap/server/application/service/history/PostCommentService.java index 416a14db..fcedc2cf 100644 --- a/src/main/java/clap/server/application/service/history/PostCommentService.java +++ b/src/main/java/clap/server/application/service/history/PostCommentService.java @@ -54,7 +54,7 @@ public void save(Long memberId, Long taskId, CreateCommentRequest request) { Member processor = task.getProcessor(); Member requester = task.getRequester(); - if (member.getMemberInfo().getRole() == MemberRole.ROLE_USER) { + if (member.getMemberInfo().getRole() == requester.getMemberInfo().getRole()) { publishNotification(processor, task, request.content(), requester.getNickname()); } else { publishNotification(requester, task, request.content(), processor.getNickname()); From 9b187e1de4867d6b355e5a37bd3a9fde207bb0af Mon Sep 17 00:00:00 2001 From: joowojr Date: Mon, 10 Feb 2025 23:01:13 +0900 Subject: [PATCH 2/2] =?UTF-8?q?CLAP-361=20Fix:=20=EB=8C=93=EA=B8=80=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20=EC=95=8C=EB=A6=BC=20=EB=A7=A4=ED=95=91=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/service/history/PostCommentService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/clap/server/application/service/history/PostCommentService.java b/src/main/java/clap/server/application/service/history/PostCommentService.java index fcedc2cf..eaa20d31 100644 --- a/src/main/java/clap/server/application/service/history/PostCommentService.java +++ b/src/main/java/clap/server/application/service/history/PostCommentService.java @@ -25,6 +25,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import java.util.Objects; + @ApplicationService @RequiredArgsConstructor public class PostCommentService implements SaveCommentUsecase, SaveCommentAttachmentUsecase { @@ -54,10 +56,10 @@ public void save(Long memberId, Long taskId, CreateCommentRequest request) { Member processor = task.getProcessor(); Member requester = task.getRequester(); - if (member.getMemberInfo().getRole() == requester.getMemberInfo().getRole()) { - publishNotification(processor, task, request.content(), requester.getNickname()); + if (Objects.equals(member.getMemberId(), requester.getMemberId())) { + publishNotification(processor, task, request.content(), member.getNickname()); } else { - publishNotification(requester, task, request.content(), processor.getNickname()); + publishNotification(requester, task, request.content(), member.getNickname()); } }