Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/130 fix send message #131

Merged
merged 2 commits into from
Jan 27, 2023
Merged

Fix/130 fix send message #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ef06e4
chore: senderId를 request에서 받도록 수정
JunYoung-C Jan 26, 2023
737bbde
test: 테스트 코드 변경 사항 반영
JunYoung-C Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/sptp/backend/message/service/MessageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/sptp/backend/message/web/MessageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/sptp/backend/message/web/dto/MessageRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
@Builder
public class MessageRequest {

@NotNull(message = "보내는 사람의 고유 번호는 필수입니다.")
private Long senderId;

@NotNull(message = "채팅방 고유 번호는 필수입니다.")
private Long chatRoomId;

Expand Down
9 changes: 5 additions & 4 deletions src/test/java/com/sptp/backend/message/service/MessageServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -78,6 +78,7 @@ void init() {
.build();

messageRequest = MessageRequest.builder()
.senderId(senderId)
.chatRoomId(chatRoomId)
.message("test")
.build();
Expand All @@ -97,7 +98,7 @@ void success() {

//when
//then
assertThatNoException().isThrownBy(() -> messageService.saveMessage(senderId, messageRequest));
assertThatNoException().isThrownBy(() -> messageService.saveMessage(messageRequest));
}

@Test
Expand All @@ -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());
}
Expand All @@ -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());
}
Expand Down