Merge branch 'dev' into feat/23

Author: silver-eunjoo

.github/workflows/bump-version.yml

@@ -0,0 +1,12 @@
+name: release
+on:
+  pull_request:
+    types:
+      - labeled
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: haya14busa/action-bumpr@v1

.github/workflows/release.yml

@@ -3,13 +3,52 @@ on:
   push:
     branches:
       - main
-  pull_request:
-    types:
-      - labeled
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   release:
     runs-on: ubuntu-latest
+    outputs:
+      next_version: ${{ steps.bump.outputs.next_version }}
     steps:
       - uses: actions/checkout@v4
       - uses: haya14busa/action-bumpr@v1
+        id: bump
+
+  package:
+    runs-on: ubuntu-latest
+    needs: release
+
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+
+    steps:
+      - uses: actions/checkout@v4
+      
+      - uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+
+      - uses: docker/metadata-action@v5
+        id: meta
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest
+            type=raw,value=${{ needs.release.outputs.next_version }}
+
+      - uses: docker/build-push-action@v6
+        with:
+          context: ./backend
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/test.yml

@@ -9,6 +9,8 @@ jobs:
       contents: read
     env:
       PROJECT_DIR: backend
+      KAKAO_CLIENT: ${{ secrets.KAKAO_CLIENT }}
+      KAKAO_SECRET: ${{ secrets.KAKAO_SECRET }}
     steps:
       - uses: actions/checkout@v4
 

backend/.gitignore

@@ -42,5 +42,11 @@ out/
 ### .idea ###
 .idea
 
+### websocket test ###
+src/main/resources/static/ws-test.html
+src/main/resources/static/ws-test.js
+
+
+
 ### images/thumbnail ###
 images/thumbnail/**

backend/Dockerfile

@@ -0,0 +1,9 @@
+FROM gradle:jdk21 AS builder
+WORKDIR /app
+COPY . .
+RUN ./gradlew clean build -x test
+
+FROM openjdk:21-slim
+WORKDIR /app
+COPY --from=builder /app/build/libs/*.jar app.jar
+ENTRYPOINT ["java", "-jar", "app.jar"]

backend/build.gradle

@@ -29,6 +29,8 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 	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'
 
 	/* DATABASE */
 	runtimeOnly 'com.mysql:mysql-connector-j'
@@ -39,6 +41,7 @@ dependencies {
 	testImplementation 'org.projectlombok:lombok'
 	testAnnotationProcessor 'org.projectlombok:lombok'
 	testRuntimeOnly 'com.h2database:h2'
+	testImplementation 'org.springframework.security:spring-security-test'
 
 	/* ETC */
 	annotationProcessor 'org.projectlombok:lombok'

backend/src/main/java/io/f1/backend/domain/game/api/RoomController.java

@@ -2,6 +2,7 @@
 
 import io.f1.backend.domain.game.app.RoomService;
 import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
+import io.f1.backend.domain.game.dto.request.RoomValidationRequest;
 import io.f1.backend.domain.game.dto.response.RoomCreateResponse;
 import io.f1.backend.domain.game.dto.response.RoomListResponse;
 
@@ -38,6 +39,12 @@ public RoomCreateResponse saveRoom(@RequestBody @Valid RoomCreateRequest request
         return roomService.saveRoom(request, loginUser);
     }
 
+    @PostMapping("/validation")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void validateRoom(@RequestBody @Valid RoomValidationRequest request) {
+        roomService.validateRoom(request);
+    }
+
     @GetMapping
     public RoomListResponse getAllRooms() {
         return roomService.getAllRooms();

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

@@ -2,20 +2,29 @@
 
 import static io.f1.backend.domain.game.mapper.RoomMapper.*;
 
+import io.f1.backend.domain.game.dto.RoomInitialData;
 import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
+import io.f1.backend.domain.game.dto.request.RoomValidationRequest;
+import io.f1.backend.domain.game.dto.response.GameSettingResponse;
+import io.f1.backend.domain.game.dto.response.PlayerListResponse;
+import io.f1.backend.domain.game.dto.response.QuizResponse;
 import io.f1.backend.domain.game.dto.response.RoomCreateResponse;
 import io.f1.backend.domain.game.dto.response.RoomListResponse;
 import io.f1.backend.domain.game.dto.response.RoomResponse;
+import io.f1.backend.domain.game.dto.response.RoomSettingResponse;
+import io.f1.backend.domain.game.event.RoomCreatedEvent;
 import io.f1.backend.domain.game.model.GameSetting;
 import io.f1.backend.domain.game.model.Player;
 import io.f1.backend.domain.game.model.Room;
 import io.f1.backend.domain.game.model.RoomSetting;
+import io.f1.backend.domain.game.model.RoomState;
 import io.f1.backend.domain.game.store.RoomRepository;
+import io.f1.backend.domain.quiz.app.QuizService;
 import io.f1.backend.domain.quiz.entity.Quiz;
-import io.f1.backend.domain.user.entity.User;
 
 import lombok.RequiredArgsConstructor;
 
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -26,8 +35,10 @@
 @RequiredArgsConstructor
 public class RoomService {
 
+    private final QuizService quizService;
     private final RoomRepository roomRepository;
     private final AtomicLong roomIdGenerator = new AtomicLong(0);
+    private final ApplicationEventPublisher eventPublisher;
 
     public RoomCreateResponse saveRoom(RoomCreateRequest request, Map<String, Object> loginUser) {
 
@@ -39,27 +50,78 @@ public RoomCreateResponse saveRoom(RoomCreateRequest request, Map<String, Object
 
         Long newId = roomIdGenerator.incrementAndGet();
 
-        roomRepository.saveRoom(new Room(newId, roomSetting, gameSetting, host));
+        Room room = new Room(newId, roomSetting, gameSetting, host);
+
+        roomRepository.saveRoom(room);
+
+        Long quizId = room.getGameSetting().getQuizId();
+        Quiz quiz = quizService.getQuizById(quizId);
+
+        eventPublisher.publishEvent(new RoomCreatedEvent(room, quiz));
 
         return new RoomCreateResponse(newId);
     }
 
-    // todo quizService에서 퀴즈 조회 메서드로 변경
+    public void validateRoom(RoomValidationRequest request) {
+
+        Room room =
+                roomRepository
+                        .findRoom(request.roomId())
+                        .orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
+
+        if (room.getState().equals(RoomState.PLAYING)) {
+            throw new IllegalArgumentException("403 게임이 진행중입니다.");
+        }
+
+        int maxUserCnt = room.getRoomSetting().maxUserCount();
+        int currentCnt = room.getPlayerSessionMap().size();
+        if (maxUserCnt == currentCnt) {
+            throw new IllegalArgumentException("403 정원이 모두 찼습니다.");
+        }
+
+        if (room.getRoomSetting().locked()
+                && !room.getRoomSetting().password().equals(request.password())) {
+            throw new IllegalArgumentException("401 비밀번호가 일치하지 않습니다.");
+        }
+    }
+
+    public RoomInitialData enterRoom(Long roomId, String sessionId) {
+
+        Room room =
+                roomRepository
+                        .findRoom(roomId)
+                        .orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
+
+        // todo security
+        Player player = new Player(1L, "빵야빵야");
+
+        Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
+
+        playerSessionMap.put(sessionId, player);
+
+        String destination = "/sub/room/" + roomId;
+
+        RoomSettingResponse roomSettingResponse = toRoomSettingResponse(room);
+        // todo quiz 생성 api 완성 후 수정
+        QuizResponse quiz =
+                new QuizResponse(room.getGameSetting().getQuizId(), "title", "설명", "url", 10);
+        GameSettingResponse gameSettingResponse =
+                toGameSettingResponse(room.getGameSetting(), quiz);
+
+        PlayerListResponse playerListResponse = toPlayerListResponse(room);
+
+        return new RoomInitialData(
+                destination, roomSettingResponse, gameSettingResponse, playerListResponse);
+    }
+
     public RoomListResponse getAllRooms() {
         List<Room> rooms = roomRepository.findAll();
         List<RoomResponse> roomResponses =
                 rooms.stream()
                         .map(
                                 room -> {
-                                    User user = new User(); // 임시 유저 객체
-                                    user.setNickname("임시 유저 닉네임");
-
-                                    Quiz quiz = new Quiz(); // 임시 퀴즈 객체
-                                    quiz.setTitle("임시 퀴즈 제목");
-                                    quiz.setDescription("임시 퀴즈 설명");
-                                    quiz.setThumbnailUrl("임시 이미지");
-                                    quiz.setQuestions(List.of());
-                                    quiz.setCreator(user);
+                                    Long quizId = room.getGameSetting().getQuizId();
+                                    Quiz quiz = quizService.getQuizById(quizId);
 
                                     return toRoomResponse(room, quiz);
                                 })

backend/src/main/java/io/f1/backend/domain/game/dto/MessageType.java

@@ -0,0 +1,7 @@
+package io.f1.backend.domain.game.dto;
+
+public enum MessageType {
+    ROOM_SETTING,
+    GAME_SETTING,
+    PLAYER_LIST,
+}

backend/src/main/java/io/f1/backend/domain/game/dto/RoomInitialData.java

@@ -0,0 +1,11 @@
+package io.f1.backend.domain.game.dto;
+
+import io.f1.backend.domain.game.dto.response.GameSettingResponse;
+import io.f1.backend.domain.game.dto.response.PlayerListResponse;
+import io.f1.backend.domain.game.dto.response.RoomSettingResponse;
+
+public record RoomInitialData(
+        String destination,
+        RoomSettingResponse roomSettingResponse,
+        GameSettingResponse gameSettingResponse,
+        PlayerListResponse playerListResponse) {}