Merge branch 'dev' into feat/150

Author: silver-eunjoo

.github/workflows/test.yml

@@ -11,6 +11,8 @@ jobs:
       PROJECT_DIR: backend
       KAKAO_CLIENT: ${{ secrets.KAKAO_CLIENT }}
       KAKAO_SECRET: ${{ secrets.KAKAO_SECRET }}
+      REDIS_HOST: ${{ secrets.REDIS_HOST }}
+      REDIS_PORT: ${{ secrets.REDIS_PORT }}
     steps:
       - uses: actions/checkout@v4
 

backend/build.gradle

@@ -29,6 +29,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+	implementation 'org.redisson:redisson-spring-boot-starter:3.50.0'
 	implementation 'org.springframework.boot:spring-boot-starter-websocket'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'

backend/src/main/java/io/f1/backend/domain/game/app/GameService.java

@@ -35,6 +35,7 @@
 import io.f1.backend.global.exception.CustomException;
 import io.f1.backend.global.exception.errorcode.GameErrorCode;
 import io.f1.backend.global.exception.errorcode.RoomErrorCode;
+import io.f1.backend.global.lock.DistributedLock;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -64,6 +65,7 @@ public class GameService {
     private final RoomRepository roomRepository;
     private final ApplicationEventPublisher eventPublisher;
 
+    @DistributedLock(prefix = "room", key = "#roomId", waitTime = 0)
     public void gameStart(Long roomId, UserPrincipal principal) {
 
         String destination = getDestination(roomId);
@@ -101,6 +103,7 @@ public void gameStart(Long roomId, UserPrincipal principal) {
     public void onCorrectAnswer(GameCorrectAnswerEvent event) {
 
         Room room = event.room();
+        log.debug(room.getId() + "번 방 채팅으로 정답! 현재 라운드 : " + room.getCurrentRound());
         String sessionId = event.sessionId();
         ChatMessage chatMessage = event.chatMessage();
         String answer = event.answer();
@@ -140,6 +143,8 @@ public void onCorrectAnswer(GameCorrectAnswerEvent event) {
     @EventListener
     public void onTimeout(GameTimeoutEvent event) {
         Room room = event.room();
+        log.debug(room.getId() + "번 방 타임아웃! 현재 라운드 : " + room.getCurrentRound());
+
         String destination = getDestination(room.getId());
 
         messageSender.sendBroadcast(
@@ -231,6 +236,7 @@ private void updateRank(Room room, GameResultListResponse gameResultListResponse
         }
     }
 
+    @DistributedLock(prefix = "room", key = "#roomId")
     public void handlePlayerReady(Long roomId, String sessionId) {
 
         Room room = findRoom(roomId);
@@ -241,9 +247,8 @@ public void handlePlayerReady(Long roomId, String sessionId) {
 
         String destination = getDestination(roomId);
 
-        PlayerListResponse playerListResponse = toPlayerListResponse(room);
-        log.info(playerListResponse.toString());
-        messageSender.sendBroadcast(destination, MessageType.PLAYER_LIST, playerListResponse);
+        messageSender.sendBroadcast(
+                destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
     }
 
     public void changeGameSetting(
@@ -276,7 +281,7 @@ private void validateRoomStart(Room room, UserPrincipal principal) {
     // 라운드 수만큼 랜덤 Question 추출
     private List<Question> prepareQuestions(Room room, Quiz quiz) {
         Long quizId = quiz.getId();
-        Integer round = room.getGameSetting().getRound();
+        Integer round = room.getRound();
         return quizService.getRandomQuestionsWithoutAnswer(quizId, round);
     }
 

backend/src/main/java/io/f1/backend/domain/game/app/TimerService.java

@@ -4,20 +4,23 @@
 import io.f1.backend.domain.game.model.Room;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class TimerService {
 
     private final ApplicationEventPublisher eventPublisher;
 
     public void startTimer(Room room, int delaySec) {
+        log.debug(room.getId() + "번 방 타이머 시작 ! 현재 라운드 : " + room.getCurrentRound());
         cancelTimer(room);
 
         ScheduledFuture<?> timer =
@@ -43,6 +46,7 @@ public boolean validateCurrentRound(Room room) {
 
     public boolean cancelTimer(Room room) {
         // 정답 맞혔어요 ~ 타이머 캔슬 부탁
+        log.debug(room.getId() + "번 방 타이머 취소 ! 현재 라운드 : " + room.getCurrentRound());
         ScheduledFuture<?> timer = room.getTimer();
         if (timer != null && !timer.isDone()) {
             return timer.cancel(false);

backend/src/main/java/io/f1/backend/domain/game/sse/app/SseService.java

@@ -17,7 +17,7 @@ public class SseService {
     private final SseEmitterRepository emitterRepository;
 
     public SseEmitter subscribe() {
-        SseEmitter emitter = new SseEmitter(30_000L);
+        SseEmitter emitter = new SseEmitter(1_800_000L);
         emitterRepository.save(emitter);
 
         try {

backend/src/main/java/io/f1/backend/domain/question/api/QuestionController.java

@@ -1,15 +1,12 @@
 package io.f1.backend.domain.question.api;
 
 import io.f1.backend.domain.question.app.QuestionService;
-import io.f1.backend.domain.question.dto.QuestionUpdateRequest;
 
 import lombok.RequiredArgsConstructor;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,21 +17,6 @@ public class QuestionController {
 
     private final QuestionService questionService;
 
-    @PutMapping("/{questionId}")
-    public ResponseEntity<Void> updateQuestion(
-            @PathVariable Long questionId, @RequestBody QuestionUpdateRequest request) {
-
-        if (request.content() != null) {
-            questionService.updateQuestionContent(questionId, request.content());
-        }
-
-        if (request.content() != null) {
-            questionService.updateQuestionAnswer(questionId, request.answer());
-        }
-
-        return ResponseEntity.noContent().build();
-    }
-
     @DeleteMapping("/{questionId}")
     public ResponseEntity<Void> deleteQuestion(@PathVariable Long questionId) {
         questionService.deleteQuestion(questionId);

backend/src/main/java/io/f1/backend/domain/question/app/QuestionService.java

@@ -2,26 +2,23 @@
 
 import static io.f1.backend.domain.question.mapper.QuestionMapper.questionRequestToQuestion;
 import static io.f1.backend.domain.question.mapper.TextQuestionMapper.questionRequestToTextQuestion;
+import static io.f1.backend.domain.quiz.app.QuizService.verifyUserAuthority;
 
 import io.f1.backend.domain.question.dao.QuestionRepository;
 import io.f1.backend.domain.question.dao.TextQuestionRepository;
 import io.f1.backend.domain.question.dto.QuestionRequest;
+import io.f1.backend.domain.question.dto.QuestionUpdateRequest;
 import io.f1.backend.domain.question.entity.Question;
 import io.f1.backend.domain.question.entity.TextQuestion;
 import io.f1.backend.domain.quiz.entity.Quiz;
 import io.f1.backend.global.exception.CustomException;
-import io.f1.backend.global.exception.errorcode.AuthErrorCode;
 import io.f1.backend.global.exception.errorcode.QuestionErrorCode;
-import io.f1.backend.global.security.enums.Role;
-import io.f1.backend.global.util.SecurityUtils;
 
 import lombok.RequiredArgsConstructor;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Objects;
-
 @Service
 @RequiredArgsConstructor
 public class QuestionService {
@@ -41,46 +38,22 @@ public void saveQuestion(Quiz quiz, QuestionRequest request) {
         question.addTextQuestion(textQuestion);
     }
 
-    @Transactional
-    public void updateQuestionContent(Long questionId, String content) {
-
-        validateContent(content);
+    public void updateQuestions(Quiz quiz, QuestionUpdateRequest request) {
 
-        Question question =
-                questionRepository
-                        .findById(questionId)
-                        .orElseThrow(
-                                () -> new CustomException(QuestionErrorCode.QUESTION_NOT_FOUND));
-
-        verifyUserAuthority(question.getQuiz());
-
-        TextQuestion textQuestion = question.getTextQuestion();
-        textQuestion.changeContent(content);
-    }
-
-    private static void verifyUserAuthority(Quiz quiz) {
-        if (SecurityUtils.getCurrentUserRole() == Role.ADMIN) {
+        if (request.getId() == null) {
+            saveQuestion(quiz, QuestionRequest.of(request));
             return;
         }
-        if (!Objects.equals(SecurityUtils.getCurrentUserId(), quiz.getCreator().getId())) {
-            throw new CustomException(AuthErrorCode.FORBIDDEN);
-        }
-    }
-
-    @Transactional
-    public void updateQuestionAnswer(Long questionId, String answer) {
-
-        validateAnswer(answer);
 
         Question question =
                 questionRepository
-                        .findById(questionId)
+                        .findById(request.getId())
                         .orElseThrow(
                                 () -> new CustomException(QuestionErrorCode.QUESTION_NOT_FOUND));
 
-        verifyUserAuthority(question.getQuiz());
-
-        question.changeAnswer(answer);
+        TextQuestion textQuestion = question.getTextQuestion();
+        textQuestion.changeContent(request.getContent());
+        question.changeAnswer(request.getAnswer());
     }
 
     @Transactional
@@ -96,16 +69,4 @@ public void deleteQuestion(Long questionId) {
 
         questionRepository.delete(question);
     }
-
-    private void validateAnswer(String answer) {
-        if (answer.trim().length() < 5 || answer.trim().length() > 30) {
-            throw new CustomException(QuestionErrorCode.INVALID_ANSWER_LENGTH);
-        }
-    }
-
-    private void validateContent(String content) {
-        if (content.trim().length() < 5 || content.trim().length() > 30) {
-            throw new CustomException(QuestionErrorCode.INVALID_CONTENT_LENGTH);
-        }
-    }
 }

backend/src/main/java/io/f1/backend/domain/question/dto/QuestionRequest.java

@@ -19,4 +19,12 @@ public class QuestionRequest {
     @TrimmedSize(min = 1, max = 30)
     @NotBlank(message = "정답을 입력해주세요.")
     private String answer;
+
+    public static QuestionRequest of(QuestionUpdateRequest request) {
+        QuestionRequest questionRequest = new QuestionRequest();
+        questionRequest.content = request.getContent();
+        questionRequest.answer = request.getAnswer();
+
+        return questionRequest;
+    }
 }

backend/src/main/java/io/f1/backend/domain/question/dto/QuestionUpdateRequest.java

@@ -1,3 +1,24 @@
 package io.f1.backend.domain.question.dto;
 
-public record QuestionUpdateRequest(String content, String answer) {}
+import io.f1.backend.global.validation.TrimmedSize;
+
+import jakarta.validation.constraints.NotBlank;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class QuestionUpdateRequest {
+
+    private Long id;
+
+    @TrimmedSize(min = 5, max = 30)
+    @NotBlank(message = "문제를 입력해주세요.")
+    private String content;
+
+    @TrimmedSize(min = 1, max = 30)
+    @NotBlank(message = "정답을 입력해주세요.")
+    private String answer;
+}

backend/src/main/java/io/f1/backend/domain/quiz/api/QuizController.java

@@ -57,15 +57,9 @@ public ResponseEntity<Void> deleteQuiz(@PathVariable Long quizId) {
     public ResponseEntity<Void> updateQuiz(
             @PathVariable Long quizId,
             @RequestPart(required = false) MultipartFile thumbnailFile,
-            @RequestPart QuizUpdateRequest request) {
+            @Valid @RequestPart QuizUpdateRequest request) {
 
-        if (request.title() != null) {
-            quizService.updateQuizTitle(quizId, request.title());
-        }
-
-        if (request.description() != null) {
-            quizService.updateQuizDesc(quizId, request.description());
-        }
+        quizService.updateQuizAndQuestions(quizId, request);
 
         if (thumbnailFile != null && !thumbnailFile.isEmpty()) {
             quizService.updateThumbnail(quizId, thumbnailFile);