Skip to content

Commit

Permalink
fix: 다른 메서드 사용 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@smartandhandsome
smartandhandsome committed Feb 5, 2024
1 parent 863c476 commit 0dc9e20
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 158 deletions.
2 changes: 1 addition & 1 deletion src/main/java/coffeemeet/server/chatting/current/service/ChattingRoomService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public ChattingListDto searchMessages(Long requestedUserId, Long roomId, Long la

@Transactional
public void exitChattingRoom(Long requestUserId, Long roomId, Long chattingRoomLastMessageId) {
userCommand.exitChattingRoom(requestUserId);
userCommand.updateExitedChattingRoomUser(roomId, requestUserId);
chattingRoomMigrationProcessor.migrate(roomId, chattingRoomLastMessageId);
applicationEventPublisher.publishEvent(
new ChattingRoomNotificationEvent(roomId, "채팅이 종료되었습니다!")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/coffeemeet/server/user/implement/UserCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void updatePunishedUser(Long userId) {
user.punished();
}

public void updateChattingRoomExitedUser(Long roomId, Long requestUserId) {
public void updateExitedChattingRoomUser(Long roomId, Long requestUserId) {
ChattingRoom chattingRoom = chattingRoomQuery.getChattingRoomById(roomId);
List<User> chattingRoomUsers = userQuery.getUsersByRoom(chattingRoom);
chattingRoomUserValidator.validateUserInChattingRoom(requestUserId, chattingRoomUsers);
Expand Down
260 changes: 104 additions & 156 deletions src/test/java/coffeemeet/server/chatting/current/service/ChattingRoomServiceTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,156 +1,104 @@
//package coffeemeet.server.chatting.current.service;
//
//import static coffeemeet.server.common.fixture.ChattingFixture.chattingMessages;
//import static coffeemeet.server.common.fixture.ChattingFixture.chattingRoom;
//import static coffeemeet.server.common.fixture.ChattingFixture.chattingRoomHistory;
//import static coffeemeet.server.common.fixture.UserFixture.chattingRoomUsers;
//import static org.assertj.core.api.Assertions.assertThat;
//import static org.mockito.ArgumentMatchers.any;
//import static org.mockito.BDDMockito.given;
//import static org.mockito.BDDMockito.then;
//
//import coffeemeet.server.chatting.current.domain.ChattingMessage;
//import coffeemeet.server.chatting.current.domain.ChattingRoom;
//import coffeemeet.server.chatting.current.implement.ChattingMessageQuery;
//import coffeemeet.server.chatting.current.implement.ChattingRoomMigrationProcessor;
//import coffeemeet.server.chatting.current.implement.ChattingRoomCommand;
//import coffeemeet.server.chatting.current.implement.ChattingRoomQuery;
//import coffeemeet.server.chatting.current.implement.ChattingRoomUserValidator;
//import coffeemeet.server.chatting.current.service.dto.ChattingListDto;
//import coffeemeet.server.chatting.current.service.dto.ChattingRoomStatusDto;
//import coffeemeet.server.chatting.history.domain.ChattingRoomHistory;
//import coffeemeet.server.common.fixture.ChattingFixture;
//import coffeemeet.server.user.domain.User;
//import coffeemeet.server.user.implement.UserQuery;
//import java.util.Comparator;
//import java.util.List;
//import org.assertj.core.api.Assertions;
//import org.junit.jupiter.api.DisplayName;
//import org.junit.jupiter.api.Test;
//import org.junit.jupiter.api.extension.ExtendWith;
//import org.junit.jupiter.params.ParameterizedTest;
//import org.junit.jupiter.params.provider.CsvSource;
//import org.mockito.InjectMocks;
//import org.mockito.Mock;
//import org.mockito.junit.jupiter.MockitoExtension;
//
//@ExtendWith(MockitoExtension.class)
//class ChattingRoomServiceTest {
//
// @InjectMocks
// private ChattingRoomService chattingRoomService;
// @Mock
// private ChattingRoomCommand chattingRoomCommand;
// @Mock
// private ChattingRoomQuery chattingRoomQuery;
// @Mock
// private ChattingMessageQuery chattingMessageQuery;
// @Mock
// private ChattingRoomMigrationProcessor chattingRoomMigrationProcessor;
// @Mock
// private UserQuery userQuery;
// @Mock
// private ChattingRoomUserValidator chattingRoomUserValidator;
//
// @DisplayName("채팅방을 만들 수 있다.")
// @Test
// void createChattingRoomTest() {
// // given
// ChattingRoom chattingRoom = chattingRoom();
// given(chattingRoomCommand.createChattingRoom()).willReturn(chattingRoom);
//
// // when
// Long roomId = chattingRoomService.createChattingRoom();
//
// // then
// Assertions.assertThat(roomId).isEqualTo(chattingRoom.getId());
// }
//
// @DisplayName("채팅 메세지를 조회할 수 있다.")
// @ParameterizedTest
// @CsvSource(value = {"51, 50"})
// void searchMessagesTest(Long lastMessageId, int pageSize) {
// // given
// ChattingRoom chattingRoom = chattingRoom();
// Long chattingRoomId = chattingRoom.getId();
// List<ChattingMessage> chattingMessages = chattingMessages(pageSize);
//
// List<User> chattingRoomUsers = chattingRoomUsers();
// Long requestUserId = chattingRoomUsers.get(0).getId();
// chattingRoomUsers.forEach(user -> {
// user.exitChattingRoom();
// user.matching();
// user.completeMatching(chattingRoom);
// });
//
// given(chattingRoomQuery.getChattingRoomById(chattingRoomId)).willReturn(chattingRoom);
// given(userQuery.getUsersByRoom(chattingRoom)).willReturn(chattingRoomUsers);
// given(chattingMessageQuery.getChattingMessagesLessThanMessageId(chattingRoom, lastMessageId,
// pageSize)).willReturn(
// chattingMessages);
//
// // when
// ChattingListDto responses = chattingRoomService.searchMessages(requestUserId, chattingRoomId,
// lastMessageId,
// pageSize);
//
// // then
// assertThat(responses.contents()).hasSize(pageSize);
// }
//
// @DisplayName("현재 채팅방 백업 및 삭제 후, 유저의 상태 변경 및 알람 전송을 할 수 있다.")
// @Test
// void deleteChattingRoomTest() {
// // given
// ChattingRoom chattingRoom = chattingRoom();
// Long roomId = chattingRoom.getId();
// ChattingRoomHistory chattingRoomHistory = chattingRoomHistory();
//
// List<User> chattingRoomUsers = chattingRoomUsers();
// Long requestUserId = chattingRoomUsers.get(0).getId();
// chattingRoomUsers.forEach(user -> {
// user.exitChattingRoom();
// user.matching();
// user.completeMatching(chattingRoom);
// });
//
// int size = 10;
// List<ChattingMessage> chattingMessages = chattingMessages(size);
// chattingMessages.sort(Comparator.comparingLong(ChattingMessage::getId));
// Long chattingRoomLastMessageId = chattingMessages.get(0).getId();
//
// given(chattingRoomQuery.getChattingRoomById(roomId)).willReturn(chattingRoom);
// given(userQuery.getUsersByRoom(chattingRoom)).willReturn(chattingRoomUsers);
// given(
// chattingRoomMigrationProcessor.backUpChattingRoom(chattingRoom, chattingRoomUsers)).willReturn(
// chattingRoomHistory);
//
// // when
// chattingRoomService.exitChattingRoom(requestUserId, roomId, chattingRoomLastMessageId);
//
// // then
// then(chattingRoomUserValidator).should()
// .validateUserInChattingRoom(requestUserId, chattingRoomUsers);
// then(chattingRoomMigrationProcessor).should()
// .migrateChattingMessagesToHistoryInChattingRoom(chattingRoom, chattingRoomHistory,
// chattingRoomLastMessageId);
// then(chattingRoomMigrationProcessor).should().deleteChattingRoom(chattingRoom, chattingRoomUsers);
// }
//
// @DisplayName("채팅방의 유무 상태를 조회할 수 있다.")
// @Test
// void checkChattingRoomStatusTest() {
// // given
// Long roomId = 1L;
// ChattingRoomStatusDto chattingRoomStatusDto = ChattingFixture.chatRoomStatusDto();
//
// given(chattingRoomQuery.existsBy(any())).willReturn(chattingRoomStatusDto.isExisted());
//
// // when
// ChattingRoomStatusDto response = chattingRoomService.checkChattingRoomStatus(roomId);
//
// // then
// assertThat(response).isEqualTo(chattingRoomStatusDto);
// }
//
//}
package coffeemeet.server.chatting.current.service;

import static coffeemeet.server.common.fixture.ChattingFixture.chattingMessages;
import static coffeemeet.server.common.fixture.ChattingFixture.chattingRoom;
import static coffeemeet.server.common.fixture.UserFixture.chattingRoomUsers;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;

import coffeemeet.server.chatting.current.domain.ChattingMessage;
import coffeemeet.server.chatting.current.domain.ChattingRoom;
import coffeemeet.server.chatting.current.implement.ChattingMessageQuery;
import coffeemeet.server.chatting.current.implement.ChattingRoomCommand;
import coffeemeet.server.chatting.current.implement.ChattingRoomMigrationProcessor;
import coffeemeet.server.chatting.current.implement.ChattingRoomQuery;
import coffeemeet.server.chatting.current.implement.ChattingRoomUserValidator;
import coffeemeet.server.chatting.current.service.dto.ChattingListDto;
import coffeemeet.server.chatting.current.service.dto.ChattingRoomStatusDto;
import coffeemeet.server.common.fixture.ChattingFixture;
import coffeemeet.server.user.domain.User;
import coffeemeet.server.user.implement.UserQuery;
import java.util.List;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;

@ExtendWith(MockitoExtension.class)
class ChattingRoomServiceTest {

@InjectMocks
private ChattingRoomService chattingRoomService;
@Mock
private ChattingRoomCommand chattingRoomCommand;
@Mock
private ChattingRoomQuery chattingRoomQuery;
@Mock
private ChattingMessageQuery chattingMessageQuery;
@Mock
private ChattingRoomMigrationProcessor chattingRoomMigrationProcessor;
@Mock
private UserQuery userQuery;
@Mock
private ChattingRoomUserValidator chattingRoomUserValidator;

@DisplayName("채팅 메세지를 조회할 수 있다.")
@ParameterizedTest
@CsvSource(value = {"51, 50"})
void searchMessagesTest(Long lastMessageId, int pageSize) {
// given
ChattingRoom chattingRoom = chattingRoom();
Long chattingRoomId = chattingRoom.getId();
List<ChattingMessage> chattingMessages = chattingMessages(pageSize);

List<User> chattingRoomUsers = chattingRoomUsers();
Long requestUserId = chattingRoomUsers.get(0).getId();
chattingRoomUsers.forEach(user -> {
user.exitChattingRoom();
user.matching();
user.completeMatching(chattingRoom);
});

given(chattingRoomQuery.getChattingRoomById(chattingRoomId)).willReturn(chattingRoom);
given(userQuery.getUsersByRoom(chattingRoom)).willReturn(chattingRoomUsers);
given(chattingMessageQuery.getChattingMessagesLessThanMessageId(chattingRoom, lastMessageId,
pageSize)).willReturn(
chattingMessages);

// when
ChattingListDto responses = chattingRoomService.searchMessages(requestUserId, chattingRoomId,
lastMessageId,
pageSize);

// then
assertThat(responses.contents()).hasSize(pageSize);
}

@DisplayName("현재 채팅방 백업 및 삭제 후, 유저의 상태 변경 및 알람 전송을 할 수 있다.")
@Test
void deleteChattingRoomTest() {
// TODO: 2024/02/05 테스트 작성
}

@DisplayName("채팅방의 유무 상태를 조회할 수 있다.")
@Test
void checkChattingRoomStatusTest() {
// given
Long roomId = 1L;
ChattingRoomStatusDto chattingRoomStatusDto = ChattingFixture.chatRoomStatusDto();

given(chattingRoomQuery.existsBy(any())).willReturn(chattingRoomStatusDto.isExisted());

// when
ChattingRoomStatusDto response = chattingRoomService.checkChattingRoomStatus(roomId);

// then
assertThat(response).isEqualTo(chattingRoomStatusDto);
}

}

0 comments on commit 0dc9e20

Please sign in to comment.