From 2ef06e45ba8c025c7c49823404564498e649fb77 Mon Sep 17 00:00:00 2001 From: JunYoung-C Date: Thu, 26 Jan 2023 15:29:39 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20senderId=EB=A5=BC=20request?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=B0=9B=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sptp/backend/message/service/MessageService.java | 4 ++-- .../com/sptp/backend/message/web/MessageController.java | 6 ++++-- .../com/sptp/backend/message/web/dto/MessageRequest.java | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/sptp/backend/message/service/MessageService.java b/src/main/java/com/sptp/backend/message/service/MessageService.java index 86dfae9a..cae1ea2f 100644 --- a/src/main/java/com/sptp/backend/message/service/MessageService.java +++ b/src/main/java/com/sptp/backend/message/service/MessageService.java @@ -22,9 +22,9 @@ public class MessageService { private final ChatRoomRepository chatRoomRepository; private final MemberRepository memberRepository; - public void saveMessage(Long loginMemberId, MessageRequest messageRequest) { + public void saveMessage(MessageRequest messageRequest) { - Member sender = memberRepository.findById(loginMemberId) + Member sender = memberRepository.findById(messageRequest.getSenderId()) .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_MEMBER)); ChatRoom chatRoom = chatRoomRepository.findById(messageRequest.getChatRoomId()) diff --git a/src/main/java/com/sptp/backend/message/web/MessageController.java b/src/main/java/com/sptp/backend/message/web/MessageController.java index d1e326a7..b20d3bf8 100644 --- a/src/main/java/com/sptp/backend/message/web/MessageController.java +++ b/src/main/java/com/sptp/backend/message/web/MessageController.java @@ -22,8 +22,10 @@ public class MessageController { private final SimpMessagingTemplate simpMessagingTemplate; @MessageMapping("/send") - public void chat(@Valid MessageRequest messageRequest, @AuthenticationPrincipal CustomUserDetails userDetails) { - messageService.saveMessage(userDetails.getMember().getId(), messageRequest); + public void chat(@Valid MessageRequest messageRequest) { + + messageService.saveMessage(messageRequest); + MessageResponse messageResponse = MessageResponse.builder() .chatRoomId(messageRequest.getChatRoomId()) .message(messageRequest.getMessage()) diff --git a/src/main/java/com/sptp/backend/message/web/dto/MessageRequest.java b/src/main/java/com/sptp/backend/message/web/dto/MessageRequest.java index beb2418c..75f4495b 100644 --- a/src/main/java/com/sptp/backend/message/web/dto/MessageRequest.java +++ b/src/main/java/com/sptp/backend/message/web/dto/MessageRequest.java @@ -12,6 +12,9 @@ @Builder public class MessageRequest { + @NotNull(message = "보내는 사람의 고유 번호는 필수입니다.") + private Long senderId; + @NotNull(message = "채팅방 고유 번호는 필수입니다.") private Long chatRoomId; From 737bbdef0be19b4cd4f3c7f9814b21adacf20d8c Mon Sep 17 00:00:00 2001 From: JunYoung-C Date: Thu, 26 Jan 2023 15:29:58 +0900 Subject: [PATCH 2/2] =?UTF-8?q?test:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD=20=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sptp/backend/message/service/MessageServiceTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/sptp/backend/message/service/MessageServiceTest.java b/src/test/java/com/sptp/backend/message/service/MessageServiceTest.java index c5a93cd0..cc43e7b5 100644 --- a/src/test/java/com/sptp/backend/message/service/MessageServiceTest.java +++ b/src/test/java/com/sptp/backend/message/service/MessageServiceTest.java @@ -44,7 +44,7 @@ class MessageServiceTest { class saveMessageTest { long senderId = 1L; long receiverId = 2L; - long artWorkId = 4L; + long artWorkId = 3L; long chatRoomId = 4L; Member sender; Member receiver; @@ -78,6 +78,7 @@ void init() { .build(); messageRequest = MessageRequest.builder() + .senderId(senderId) .chatRoomId(chatRoomId) .message("test") .build(); @@ -97,7 +98,7 @@ void success() { //when //then - assertThatNoException().isThrownBy(() -> messageService.saveMessage(senderId, messageRequest)); + assertThatNoException().isThrownBy(() -> messageService.saveMessage(messageRequest)); } @Test @@ -108,7 +109,7 @@ void failByNotFoundMember() { //when //then - assertThatThrownBy(() -> messageService.saveMessage(senderId, messageRequest)) + assertThatThrownBy(() -> messageService.saveMessage(messageRequest)) .isInstanceOf(CustomException.class) .message().isEqualTo(ErrorCode.NOT_FOUND_MEMBER.getDetail()); } @@ -124,7 +125,7 @@ void failByNotFoundChatRoom() { //when //then - assertThatThrownBy(() -> messageService.saveMessage(senderId, messageRequest)) + assertThatThrownBy(() -> messageService.saveMessage(messageRequest)) .isInstanceOf(CustomException.class) .message().isEqualTo(ErrorCode.NOT_FOUND_CHAT_ROOM.getDetail()); }