Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "์ „ํ™”๋ฒˆํ˜ธ ์ค‘๋ณต ํ™•์ธ์— ์„ฑ๊ณตํ•˜์˜€์Šต๋‹ˆ๋‹ค.";
Expand Down
25 changes: 25 additions & 0 deletions src/main/java/inha/gdgoc/domain/auth/service/AuthService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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));
}
}
Original file line number Diff line number Diff line change
@@ -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));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 ํ†ต๊ณ„๋ฅผ ๋ฐ˜ํ™˜ํ–ˆ์Šต๋‹ˆ๋‹ค.";
}
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
@@ -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;
}
}
36 changes: 36 additions & 0 deletions src/main/java/inha/gdgoc/domain/game/entity/BingoBoard.java
Original file line number Diff line number Diff line change
@@ -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;
}
}
35 changes: 35 additions & 0 deletions src/main/java/inha/gdgoc/domain/game/entity/BingoInteraction.java
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
@@ -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();
}
Original file line number Diff line number Diff line change
@@ -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> {
}
Loading
Loading