Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

import java.util.List;

public record PlayerListResponse(String host, List<PlayerResponse> players) {}
public record PlayerListResponse(String host, List<PlayerResponse> players, int currentUserCount) {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
package io.f1.backend.domain.game.dto.response;

public record RoomSettingResponse(
String roomName, int maxUserCount, int currentUserCount, boolean locked) {}
public record RoomSettingResponse(String roomName, int maxUserCount, boolean locked) {}
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ public static RoomSettingResponse toRoomSettingResponse(Room room) {
return new RoomSettingResponse(
room.getRoomSetting().roomName(),
room.getRoomSetting().maxUserCount(),
room.getPlayerSessionMap().size(),
room.getRoomSetting().locked());
}

Expand All @@ -63,7 +62,8 @@ public static PlayerListResponse toPlayerListResponse(Room room) {
.map(player -> new PlayerResponse(player.getNickname(), player.isReady()))
.toList();

return new PlayerListResponse(room.getHost().getNickname(), playerResponseList);
return new PlayerListResponse(
room.getHost().getNickname(), playerResponseList, playerResponseList.size());
}

public static RoomResponse toRoomResponse(Room room, Quiz quiz) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,14 @@ class RoomServiceTests {

@Mock private RoomRepository roomRepository;
@Mock private QuizService quizService;
@Mock private GameService gameService;
@Mock private TimerService timerService;
@Mock private ApplicationEventPublisher eventPublisher;
@Mock private MessageSender messageSender;

@BeforeEach
void setUp() {
MockitoAnnotations.openMocks(this); // @Mock 어노테이션이 붙은 필드들을 초기화합니다.

roomService =
new RoomService(
timerService, quizService, roomRepository, eventPublisher, messageSender);
roomService = new RoomService(quizService, roomRepository, eventPublisher, messageSender);

SecurityContextHolder.clearContext();
}
Expand Down