diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/response/PlayerListResponse.java b/backend/src/main/java/io/f1/backend/domain/game/dto/response/PlayerListResponse.java index df09741c..97889ab1 100644 --- a/backend/src/main/java/io/f1/backend/domain/game/dto/response/PlayerListResponse.java +++ b/backend/src/main/java/io/f1/backend/domain/game/dto/response/PlayerListResponse.java @@ -2,4 +2,4 @@ import java.util.List; -public record PlayerListResponse(String host, List players) {} +public record PlayerListResponse(String host, List players, int currentUserCount) {} diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/response/RoomSettingResponse.java b/backend/src/main/java/io/f1/backend/domain/game/dto/response/RoomSettingResponse.java index 019aeff7..92cd7cbf 100644 --- a/backend/src/main/java/io/f1/backend/domain/game/dto/response/RoomSettingResponse.java +++ b/backend/src/main/java/io/f1/backend/domain/game/dto/response/RoomSettingResponse.java @@ -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) {} diff --git a/backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java b/backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java index 1731385b..cb662875 100644 --- a/backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java +++ b/backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java @@ -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()); } @@ -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) { diff --git a/backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java b/backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java index 67c26298..80faaf91 100644 --- a/backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java +++ b/backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java @@ -47,8 +47,6 @@ 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; @@ -56,9 +54,7 @@ class RoomServiceTests { void setUp() { MockitoAnnotations.openMocks(this); // @Mock 어노테이션이 붙은 필드들을 초기화합니다. - roomService = - new RoomService( - timerService, quizService, roomRepository, eventPublisher, messageSender); + roomService = new RoomService(quizService, roomRepository, eventPublisher, messageSender); SecurityContextHolder.clearContext(); }