Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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 @@ -213,16 +213,9 @@ public void changeGameSetting(
if (!request.change(room, quizService)) {
return;
}
request.afterChange(room, messageSender);
request.afterChange(room, messageSender, eventPublisher, quizService);

broadcastGameSetting(room);

RoomUpdatedEvent roomUpdatedEvent =
new RoomUpdatedEvent(
room,
quizService.getQuizWithQuestionsById(room.getGameSetting().getQuizId()));

eventPublisher.publishEvent(roomUpdatedEvent);
}

private void validateRoomStart(Room room, UserPrincipal principal) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import io.f1.backend.domain.game.dto.response.RoomSettingResponse;
import io.f1.backend.domain.game.dto.response.SystemNoticeResponse;
import io.f1.backend.domain.game.event.RoomCreatedEvent;
import io.f1.backend.domain.game.event.RoomDeletedEvent;
import io.f1.backend.domain.game.model.ConnectionState;
import io.f1.backend.domain.game.model.GameSetting;
import io.f1.backend.domain.game.model.Player;
Expand Down Expand Up @@ -349,6 +350,8 @@ private void cleanRoom(Room room, String sessionId, Player player) {
/* 방 삭제 */
if (room.isLastPlayer(sessionId)) {
removeRoom(room);
Long roomId = room.getId();
eventPublisher.publishEvent(new RoomDeletedEvent(roomId));
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,15 @@
import io.f1.backend.domain.game.websocket.MessageSender;
import io.f1.backend.domain.quiz.app.QuizService;

import org.springframework.context.ApplicationEventPublisher;

public interface GameSettingChanger {

boolean change(Room room, QuizService quizService);

void afterChange(Room room, MessageSender messageSender);
default void afterChange(
Room room,
MessageSender messageSender,
ApplicationEventPublisher eventPublisher,
QuizService quizService) {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@

import io.f1.backend.domain.game.dto.MessageType;
import io.f1.backend.domain.game.dto.response.PlayerListResponse;
import io.f1.backend.domain.game.event.RoomUpdatedEvent;
import io.f1.backend.domain.game.model.Room;
import io.f1.backend.domain.game.websocket.MessageSender;
import io.f1.backend.domain.quiz.app.QuizService;

import lombok.extern.slf4j.Slf4j;

import org.springframework.context.ApplicationEventPublisher;

@Slf4j
public record QuizChangeRequest(long quizId) implements GameSettingChanger {

Expand All @@ -21,17 +24,28 @@ public boolean change(Room room, QuizService quizService) {
}
Long questionsCount = quizService.getQuestionsCount(quizId);
room.changeQuiz(quizId, questionsCount.intValue());
room.resetAllPlayerReadyStates();
return true;
}

@Override
public void afterChange(Room room, MessageSender messageSender) {
room.resetAllPlayerReadyStates();
public void afterChange(
Room room,
MessageSender messageSender,
ApplicationEventPublisher eventPublisher,
QuizService quizService) {

String destination = getDestination(room.getId());
PlayerListResponse response = toPlayerListResponse(room);

log.info(response.toString());
messageSender.sendBroadcast(destination, MessageType.PLAYER_LIST, response);

RoomUpdatedEvent roomUpdatedEvent =
new RoomUpdatedEvent(
room,
quizService.getQuizWithQuestionsById(room.getGameSetting().getQuizId()));

eventPublisher.publishEvent(roomUpdatedEvent);
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.f1.backend.domain.game.dto.request;

import io.f1.backend.domain.game.model.Room;
import io.f1.backend.domain.game.websocket.MessageSender;
import io.f1.backend.domain.quiz.app.QuizService;

public record RoundChangeRequest(int round) implements GameSettingChanger {
Expand All @@ -17,9 +16,4 @@ public boolean change(Room room, QuizService quizService) {
room.changeRound(round, questionsCount.intValue());
return true;
}

@Override
public void afterChange(Room room, MessageSender messageSender) {
// 고유한 후처리 동작 없음
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.f1.backend.domain.game.dto.request;

import io.f1.backend.domain.game.model.Room;
import io.f1.backend.domain.game.websocket.MessageSender;
import io.f1.backend.domain.quiz.app.QuizService;

public record TimeLimitChangeRequest(int timeLimit) implements GameSettingChanger {
Expand All @@ -14,9 +13,4 @@ public boolean change(Room room, QuizService quizService) {
room.changeTimeLimit(TimeLimit.from(timeLimit));
return true;
}

@Override
public void afterChange(Room room, MessageSender messageSender) {
// 고유한 후처리 동작 없음
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static RoomSettingResponse toRoomSettingResponse(Room room) {
return new RoomSettingResponse(
room.getRoomSetting().roomName(),
room.getRoomSetting().maxUserCount(),
room.getPlayerSessionMap().size(),
room.getCurrentUserCnt(),
room.getRoomSetting().locked());
}

Expand All @@ -71,7 +71,7 @@ public static RoomResponse toRoomResponse(Room room, Quiz quiz) {
room.getId(),
room.getRoomSetting().roomName(),
room.getRoomSetting().maxUserCount(),
room.getPlayerSessionMap().size(),
room.getCurrentUserCnt(),
room.getRoomSetting().locked(),
room.getState().name(),
quiz.getTitle(),
Expand Down Expand Up @@ -111,9 +111,9 @@ public static QuestionStartResponse toQuestionStartResponse(Room room, int delay
room.getCurrentQuestion().getId(),
room.getCurrentRound(),
Instant.now().plusSeconds(delay),
room.getGameSetting().getTimeLimit(),
room.getTimeLimit(),
Instant.now(),
room.getGameSetting().getRound());
room.getRound());
}

public static GameResultResponse toGameResultResponse(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static LobbySseEvent<RoomCreatedPayload> fromRoomCreated(RoomCreatedEvent
room.getId(),
room.getRoomSetting().roomName(),
room.getRoomSetting().maxUserCount(),
room.getPlayerSessionMap().size(),
room.getCurrentUserCnt(),
room.getRoomSetting().locked(),
room.getState().name(),
quiz.getTitle(),
Expand All @@ -38,7 +38,7 @@ public static LobbySseEvent<RoomUpdatedPayload> fromRoomUpdated(RoomUpdatedEvent
RoomUpdatedPayload payload =
new RoomUpdatedPayload(
room.getId(),
room.getPlayerSessionMap().size(),
room.getCurrentUserCnt(),
room.getState().name(),
quiz.getTitle(),
quiz.getDescription(),
Expand Down