Merge Dev

build.gradle

@@ -85,6 +85,7 @@ dependencies {
 
     // --- AWS (S3) ---
     implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3'
+    implementation 'software.amazon.awssdk:url-connection-client'
 
     // --- Flyway ---
     implementation "org.flywaydb:flyway-core:${flywayVersion}"
@@ -101,7 +102,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.mockito:mockito-core:5.6.0'
     testImplementation 'org.mockito:mockito-junit-jupiter:5.6.0'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.27.7'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
     //Google API Client

src/main/java/inha/gdgoc/domain/admin/recruit/core/service/RecruitCoreAdminService.java

@@ -108,11 +108,8 @@ private void ensureDecidable(RecruitCoreApplication application) {
     }
 
     private TeamType teamTypeOf(String team) {
-        if (team == null) {
-            return null;
-        }
         try {
-            return TeamType.valueOf(team);
+            return TeamType.from(team);
         } catch (IllegalArgumentException ex) {
             return null;
         }

src/main/java/inha/gdgoc/domain/auth/controller/AuthController.java

@@ -23,6 +23,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -114,6 +115,14 @@ public ResponseEntity<?> logout(@RequestBody(required = false) TokenRefreshReque
         return ResponseEntity.ok().body(ApiResponse.ok(LOGOUT_SUCCESS));
     }
 
+    @GetMapping("/me")
+    @PreAuthorize("isAuthenticated()")
+    public ResponseEntity<ApiResponse<?, Void>> me(
+            @AuthenticationPrincipal TokenProvider.CustomUserDetails me
+    ) {
+        return ResponseEntity.ok(ApiResponse.ok(ME_RETRIEVED_SUCCESS, authService.getCurrentUser(me)));
+    }
+
     // 5. 권한 체크 (Role or Team)
     @GetMapping("/{role}")
     public ResponseEntity<ApiResponse<Void, ?>> checkRoleOrTeam(

src/main/java/inha/gdgoc/domain/auth/controller/message/AuthMessage.java

@@ -9,6 +9,7 @@ public class AuthMessage {
     public static final String SIGNUP_SUCCESS = "회원가입에 성공하였습니다.";
     public static final String ACCESS_TOKEN_REFRESH_SUCCESS = "토큰 재발급에 성공하였습니다.";
     public static final String LOGOUT_SUCCESS = "로그아웃에 성공하였습니다.";
+    public static final String ME_RETRIEVED_SUCCESS = "현재 사용자 정보를 성공적으로 조회했습니다.";
     public static final String OAUTH_LOGIN_SIGNUP_SUCCESS = "OAuth 로그인/회원가입에 성공하였습니다.";
     public static final String STUDENT_ID_DUPLICATION_CHECK_SUCCESS = "학번 중복 확인에 성공하였습니다.";
     public static final String PHONE_NUMBER_DUPLICATION_CHECK_SUCCESS = "전화번호 중복 확인에 성공하였습니다.";

src/main/java/inha/gdgoc/domain/auth/service/AuthService.java

@@ -150,6 +150,31 @@ public boolean hasRequiredAccess(CustomUserDetails me, UserRole role, TeamType r
     return accessGuard.check(me, conditions.toArray(AccessGuard.AccessCondition[]::new));
   }
 
+  @Transactional(readOnly = true)
+  public AuthUserResponse getCurrentUser(CustomUserDetails me) {
+    if (me == null) {
+      throw new IllegalArgumentException("인증 정보가 없습니다.");
+    }
+
+    if (me.getRole() == UserRole.ADMIN && me.getUserId() == null) {
+      String username = me.getUsername();
+      String loginId = username != null && username.startsWith("admin:")
+              ? username.substring("admin:".length())
+              : username;
+      return AuthUserResponse.admin(loginId);
+    }
+
+    if (me.getUserId() == null) {
+      throw new IllegalArgumentException("존재하지 않는 사용자입니다.");
+    }
+
+    User user = userRepository
+            .findById(me.getUserId())
+            .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자입니다."));
+
+    return AuthUserResponse.from(user);
+  }
+
   public RefreshResult refresh(String refreshToken) {
     RefreshSession session = resolveRefreshSession(refreshToken);
     if (session.principalType() == PrincipalType.ADMIN) {

src/main/java/inha/gdgoc/domain/game/controller/AdminBingoBoardController.java

@@ -0,0 +1,48 @@
+package inha.gdgoc.domain.game.controller;
+
+import static inha.gdgoc.domain.game.controller.message.GameUserMessage.BINGO_BOARD_UPDATED_SUCCESS;
+
+import inha.gdgoc.domain.game.dto.request.BingoBoardUpdateRequest;
+import inha.gdgoc.domain.game.dto.response.BingoBoardResponse;
+import inha.gdgoc.domain.game.service.BingoBoardService;
+import inha.gdgoc.domain.user.enums.UserRole;
+import inha.gdgoc.global.config.jwt.TokenProvider;
+import inha.gdgoc.global.dto.response.ApiResponse;
+import inha.gdgoc.global.security.AccessGuard;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+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;
+
+@RequestMapping("/api/v1/admin/game/bingo")
+@RequiredArgsConstructor
+@RestController
+@Slf4j
+public class AdminBingoBoardController {
+
+    private final BingoBoardService bingoBoardService;
+    private final AccessGuard accessGuard;
+
+    @PutMapping("/boards/{teamNumber}")
+    public ResponseEntity<ApiResponse<BingoBoardResponse, Void>> updateBoard(
+            @AuthenticationPrincipal TokenProvider.CustomUserDetails me,
+            @PathVariable Integer teamNumber,
+            @RequestBody BingoBoardUpdateRequest request
+    ) {
+        log.info(
+                "빙고 수정 권한 검사: username={}, role={}, team={}",
+                me != null ? me.getUsername() : null,
+                me != null ? me.getRole() : null,
+                me != null ? me.getTeam() : null
+        );
+        accessGuard.require(me, AccessGuard.AccessCondition.atLeast(UserRole.CORE));
+
+        BingoBoardResponse response = bingoBoardService.updateBoard(teamNumber, request);
+        return ResponseEntity.ok(ApiResponse.ok(BINGO_BOARD_UPDATED_SUCCESS, response));
+    }
+}

src/main/java/inha/gdgoc/domain/game/controller/AdminRythm8beatScoreController.java

@@ -0,0 +1,37 @@
+package inha.gdgoc.domain.game.controller;
+
+import static inha.gdgoc.domain.game.controller.message.Rythm8beatScoreMessage.ADMIN_SCORES_RETRIEVED;
+
+import inha.gdgoc.domain.game.dto.response.Rythm8beatAdminScoreResponse;
+import inha.gdgoc.domain.game.service.Rythm8beatScoreService;
+import inha.gdgoc.domain.user.enums.UserRole;
+import inha.gdgoc.global.config.jwt.TokenProvider;
+import inha.gdgoc.global.dto.response.ApiResponse;
+import inha.gdgoc.global.security.AccessGuard;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("/api/v1/admin/game/rythm8beat")
+@RestController
+@RequiredArgsConstructor
+public class AdminRythm8beatScoreController {
+
+    private final Rythm8beatScoreService rythm8beatScoreService;
+    private final AccessGuard accessGuard;
+
+    @GetMapping("/scores")
+    public ResponseEntity<ApiResponse<List<Rythm8beatAdminScoreResponse>, Void>> getAllScores(
+            @AuthenticationPrincipal TokenProvider.CustomUserDetails me
+    ) {
+        accessGuard.require(me, AccessGuard.AccessCondition.atLeast(UserRole.CORE));
+        return ResponseEntity.ok(ApiResponse.ok(
+                ADMIN_SCORES_RETRIEVED,
+                rythm8beatScoreService.getAllScores()
+        ));
+    }
+}

src/main/java/inha/gdgoc/domain/game/controller/BingoBoardController.java

@@ -0,0 +1,37 @@
+package inha.gdgoc.domain.game.controller;
+
+import static inha.gdgoc.domain.game.controller.message.GameUserMessage.BINGO_BOARD_RETRIEVED_SUCCESS;
+import static inha.gdgoc.domain.game.controller.message.GameUserMessage.BINGO_BOARDS_RETRIEVED_SUCCESS;
+
+import inha.gdgoc.domain.game.dto.response.BingoBoardResponse;
+import inha.gdgoc.domain.game.service.BingoBoardService;
+import inha.gdgoc.global.dto.response.ApiResponse;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("/api/v1/game/bingo")
+@RequiredArgsConstructor
+@RestController
+public class BingoBoardController {
+
+    private final BingoBoardService bingoBoardService;
+
+    @GetMapping("/boards")
+    public ResponseEntity<ApiResponse<List<BingoBoardResponse>, Void>> getBoards() {
+        List<BingoBoardResponse> response = bingoBoardService.findAllBoards();
+        return ResponseEntity.ok(ApiResponse.ok(BINGO_BOARDS_RETRIEVED_SUCCESS, response));
+    }
+
+    @GetMapping("/boards/{teamNumber}")
+    public ResponseEntity<ApiResponse<BingoBoardResponse, Void>> getBoard(
+            @PathVariable Integer teamNumber
+    ) {
+        BingoBoardResponse response = bingoBoardService.findBoard(teamNumber);
+        return ResponseEntity.ok(ApiResponse.ok(BINGO_BOARD_RETRIEVED_SUCCESS, response));
+    }
+}

src/main/java/inha/gdgoc/domain/game/controller/message/GameUserMessage.java

@@ -3,6 +3,9 @@
 public class GameUserMessage {
     public static final String GAME_RANK_SAVE_SUCCESS = "성공적으로 유저 랭킹 정보를 저장했습니다.";
     public static final String GAME_RANK_RETRIEVED_SUCCESS = "성공적으로 랭킹 정보를 반환했습니다.";
+    public static final String BINGO_BOARDS_RETRIEVED_SUCCESS = "성공적으로 빙고 보드 목록을 반환했습니다.";
+    public static final String BINGO_BOARD_RETRIEVED_SUCCESS = "성공적으로 빙고 보드를 반환했습니다.";
+    public static final String BINGO_BOARD_UPDATED_SUCCESS = "성공적으로 빙고 보드를 저장했습니다.";
     public static final String MBTI_RESULT_UPSERT_SUCCESS = "성공적으로 MBTI 결과를 저장했습니다.";
     public static final String MBTI_RESULT_STATS_RETRIEVED_SUCCESS = "성공적으로 MBTI 통계를 반환했습니다.";
 }

src/main/java/inha/gdgoc/domain/game/controller/message/Rythm8beatScoreMessage.java

@@ -1,6 +1,7 @@
 package inha.gdgoc.domain.game.controller.message;
 
 public class Rythm8beatScoreMessage {
+    public static final String ADMIN_SCORES_RETRIEVED = "관리자용 8bit 점수 목록을 조회했습니다.";
     public static final String SCORE_SUBMITTED = "점수가 등록되었습니다.";
     public static final String RANKING_RETRIEVED = "랭킹을 조회했습니다.";
     public static final String SCORES_RESET = "모든 점수가 초기화되었습니다.";

src/main/java/inha/gdgoc/domain/game/dto/request/BingoBoardUpdateRequest.java

@@ -0,0 +1,11 @@
+package inha.gdgoc.domain.game.dto.request;
+
+import java.util.List;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class BingoBoardUpdateRequest {
+    private List<String> marks;
+}

src/main/java/inha/gdgoc/domain/game/dto/response/BingoBoardResponse.java

@@ -0,0 +1,24 @@
+package inha.gdgoc.domain.game.dto.response;
+
+import java.util.List;
+import lombok.Getter;
+
+@Getter
+public class BingoBoardResponse {
+    private final Integer teamNumber;
+    private final List<String> marks;
+    private final int checkedCount;
+    private final int rank;
+
+    public BingoBoardResponse(
+            Integer teamNumber,
+            List<String> marks,
+            int checkedCount,
+            int rank
+    ) {
+        this.teamNumber = teamNumber;
+        this.marks = marks;
+        this.checkedCount = checkedCount;
+        this.rank = rank;
+    }
+}

src/main/java/inha/gdgoc/domain/game/dto/response/Rythm8beatAdminScoreResponse.java

@@ -0,0 +1,28 @@
+package inha.gdgoc.domain.game.dto.response;
+
+import inha.gdgoc.domain.game.entity.Rythm8beatScore;
+import java.time.Instant;
+import lombok.Getter;
+
+@Getter
+public class Rythm8beatAdminScoreResponse {
+    private final int rank;
+    private final Long id;
+    private final String phoneNumber;
+    private final String nickname;
+    private final int score;
+    private final int stageReached;
+    private final Instant createdAt;
+    private final Instant updatedAt;
+
+    public Rythm8beatAdminScoreResponse(int rank, Rythm8beatScore score) {
+        this.rank = rank;
+        this.id = score.getId();
+        this.phoneNumber = score.getPhoneNumber();
+        this.nickname = score.getNickname();
+        this.score = score.getScore();
+        this.stageReached = score.getStageReached();
+        this.createdAt = score.getCreatedAt();
+        this.updatedAt = score.getUpdatedAt();
+    }
+}

src/main/java/inha/gdgoc/domain/game/entity/BingoBoard.java

@@ -0,0 +1,36 @@
+package inha.gdgoc.domain.game.entity;
+
+import inha.gdgoc.global.entity.BaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Getter
+@Builder
+public class BingoBoard extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "team_number", nullable = false, unique = true)
+    private Integer teamNumber;
+
+    @Column(name = "marks", nullable = false, length = 160)
+    private String marks;
+
+    public void updateMarks(String marks) {
+        this.marks = marks;
+    }
+}

src/main/java/inha/gdgoc/domain/game/entity/BingoInteraction.java

@@ -0,0 +1,35 @@
+package inha.gdgoc.domain.game.entity;
+
+import inha.gdgoc.global.entity.BaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Getter
+@Builder
+public class BingoInteraction extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "team_number", nullable = false)
+    private Integer teamNumber;
+
+    @Column(name = "cell_index", nullable = false)
+    private Integer cellIndex;
+
+    @Column(name = "mark", nullable = false, length = 16)
+    private String mark;
+}

src/main/java/inha/gdgoc/domain/game/repository/BingoBoardRepository.java

@@ -0,0 +1,11 @@
+package inha.gdgoc.domain.game.repository;
+
+import inha.gdgoc.domain.game.entity.BingoBoard;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface BingoBoardRepository extends JpaRepository<BingoBoard, Long> {
+    Optional<BingoBoard> findByTeamNumber(Integer teamNumber);
+    List<BingoBoard> findAllByOrderByTeamNumberAsc();
+}

src/main/java/inha/gdgoc/domain/game/repository/BingoInteractionRepository.java

@@ -0,0 +1,7 @@
+package inha.gdgoc.domain.game.repository;
+
+import inha.gdgoc.domain.game.entity.BingoInteraction;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface BingoInteractionRepository extends JpaRepository<BingoInteraction, Long> {
+}