Merge remote-tracking branch 'origin/dev' into feat/21

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

Author: sehee123

.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/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/src/main/java/io/f1/backend/domain/game/app/RoomService.java

@@ -1,10 +1,6 @@
 package io.f1.backend.domain.game.app;
 
-import static io.f1.backend.domain.game.mapper.RoomMapper.toGameSettingResponse;
-import static io.f1.backend.domain.game.mapper.RoomMapper.toPlayerListResponse;
-import static io.f1.backend.domain.game.mapper.RoomMapper.toRoomResponse;
-import static io.f1.backend.domain.game.mapper.RoomMapper.toRoomSetting;
-import static io.f1.backend.domain.game.mapper.RoomMapper.toRoomSettingResponse;
+import static io.f1.backend.domain.game.mapper.RoomMapper.*;
 
 import io.f1.backend.domain.game.dto.RoomExitData;
 import io.f1.backend.domain.game.dto.RoomInitialData;
@@ -18,15 +14,23 @@
 import io.f1.backend.domain.game.dto.response.RoomResponse;
 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.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 java.time.LocalDateTime;
+
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Service;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -38,8 +42,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) {
 
@@ -51,7 +57,14 @@ 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);
     }
@@ -74,17 +87,17 @@ public void validateRoom(RoomValidationRequest request) {
         }
 
         if (room.getRoomSetting().locked()
-            && !room.getRoomSetting().password().equals(request.password())) {
+                && !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 존재하지 않는 방입니다."));
+                roomRepository
+                        .findRoom(roomId)
+                        .orElseThrow(() -> new IllegalArgumentException("404 존재하지 않는 방입니다."));
 
         // todo security
         Player player = new Player(1L, "빵야빵야");
@@ -142,26 +155,18 @@ public RoomExitData exitRoom(Long roomId, String sessionId) {
         return new RoomExitData(destination,playerListResponse, systemNoticeResponse, false);
     }
 
-    // todo quizService에서 퀴즈 조회 메서드로 변경
     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);
-
-                        return toRoomResponse(room, quiz);
-                    })
-                .toList();
+                rooms.stream()
+                        .map(
+                                room -> {
+                                    Long quizId = room.getGameSetting().getQuizId();
+                                    Quiz quiz = quizService.getQuizById(quizId);
+
+                                    return toRoomResponse(room, quiz);
+                                })
+                        .toList();
         return new RoomListResponse(roomResponses);
     }
 

backend/src/main/java/io/f1/backend/domain/game/event/RoomCreatedEvent.java

@@ -0,0 +1,6 @@
+package io.f1.backend.domain.game.event;
+
+import io.f1.backend.domain.game.model.Room;
+import io.f1.backend.domain.quiz.entity.Quiz;
+
+public record RoomCreatedEvent(Room room, Quiz quiz) {}

backend/src/main/java/io/f1/backend/domain/game/event/RoomDeletedEvent.java

@@ -0,0 +1,3 @@
+package io.f1.backend.domain.game.event;
+
+public record RoomDeletedEvent(Long roomId) {}

backend/src/main/java/io/f1/backend/domain/game/event/RoomUpdatedEvent.java

@@ -0,0 +1,6 @@
+package io.f1.backend.domain.game.event;
+
+import io.f1.backend.domain.game.model.Room;
+import io.f1.backend.domain.quiz.entity.Quiz;
+
+public record RoomUpdatedEvent(Room room, Quiz quiz) {}

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

@@ -1,5 +1,6 @@
 package io.f1.backend.domain.game.sse.app;
 
+import io.f1.backend.domain.game.sse.dto.LobbySseEvent;
 import io.f1.backend.domain.game.sse.store.SseEmitterRepository;
 
 import lombok.RequiredArgsConstructor;
@@ -28,4 +29,15 @@ public SseEmitter subscribe() {
         }
         return emitter;
     }
+
+    // 로비로 SSE 메시지를 쏘기위한 메서드
+    public <T> void notifyLobbyUpdate(LobbySseEvent<T> event) {
+        for (SseEmitter emitter : emitterRepository.getAll()) {
+            try {
+                emitter.send(SseEmitter.event().name(event.type()).data(event));
+            } catch (IOException e) {
+                emitterRepository.remove(emitter);
+            }
+        }
+    }
 }

backend/src/main/java/io/f1/backend/domain/game/sse/dto/LobbySseEvent.java

@@ -0,0 +1,3 @@
+package io.f1.backend.domain.game.sse.dto;
+
+public record LobbySseEvent<T>(String type, T payload) {}