diff --git a/src/main/java/com/gamegoo/gamegoo_v2/content/board/controller/BoardController.java b/src/main/java/com/gamegoo/gamegoo_v2/content/board/controller/BoardController.java index 1aebbcd0..ce344057 100644 --- a/src/main/java/com/gamegoo/gamegoo_v2/content/board/controller/BoardController.java +++ b/src/main/java/com/gamegoo/gamegoo_v2/content/board/controller/BoardController.java @@ -2,6 +2,8 @@ import com.gamegoo.gamegoo_v2.account.auth.annotation.AuthMember; import com.gamegoo.gamegoo_v2.account.member.domain.Member; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import com.gamegoo.gamegoo_v2.account.member.domain.Tier; import com.gamegoo.gamegoo_v2.content.board.dto.request.BoardInsertRequest; import com.gamegoo.gamegoo_v2.content.board.dto.request.BoardUpdateRequest; @@ -46,7 +48,7 @@ public class BoardController { */ @PostMapping @Operation(summary = "게시판 글 작성 API", - description = "게시판에서 글을 작성하는 API 입니다. 게임 모드 1~4, 포지션 0~5를 입력하세요. 게임스타일은 최대 3개까지 입력가능합니다.") + description = "게시판에서 글을 작성하는 API 입니다. 게임 모드 1~4, 포지션을 입력하세요. 게임스타일은 최대 3개까지 입력가능합니다.") public ApiResponse boardInsert( @AuthMember Member member, @Valid @RequestBody BoardInsertRequest request) { @@ -63,16 +65,17 @@ public ApiResponse boardInsert( @Parameter(name = "pageIdx", description = "조회할 페이지 번호를 입력해주세요. 페이지 당 20개의 게시물을 볼 수 있습니다."), @Parameter(name = "mode", description = "(선택) 게임 모드를 입력해주세요. < 빠른대전: 1, 솔로랭크: 2, 자유랭크: 3, 칼바람 나락: 4 >"), @Parameter(name = "tier", description = "(선택) 티어를 선택해주세요."), - @Parameter(name = "mainPosition", description = "(선택) 포지션을 입력해주세요. < 전체: 0, 탑: 1, 정글: 2, 미드: 3, 바텀: 4, " + - "서포터: 5 >"), + @Parameter(name = "mainPosition", description = "(선택) 포지션을 입력해주세요. < 전체: ANY, 탑: TOP, 정글: JUNGLE, 미드: " + + "MID, 원딜: ADC, " + + "서포터: SUP >"), @Parameter(name = "mike", description = "(선택) 마이크 여부를 선택해주세요.") }) public ApiResponse boardList( @ValidPage @RequestParam(name = "page") Integer page, @RequestParam(required = false) Integer mode, @RequestParam(required = false) Tier tier, - @RequestParam(required = false) Integer mainPosition, - @RequestParam(required = false) Boolean mike) { + @RequestParam(required = false) Position mainPosition, + @RequestParam(required = false) Mike mike) { return ApiResponse.ok(boardFacadeService.getBoardList(mode, tier, mainPosition, mike, page)); diff --git a/src/main/java/com/gamegoo/gamegoo_v2/content/board/domain/Board.java b/src/main/java/com/gamegoo/gamegoo_v2/content/board/domain/Board.java index 377dacef..e768ec2a 100644 --- a/src/main/java/com/gamegoo/gamegoo_v2/content/board/domain/Board.java +++ b/src/main/java/com/gamegoo/gamegoo_v2/content/board/domain/Board.java @@ -1,10 +1,14 @@ package com.gamegoo.gamegoo_v2.content.board.domain; import com.gamegoo.gamegoo_v2.account.member.domain.Member; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import com.gamegoo.gamegoo_v2.core.common.BaseDateTimeEntity; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; @@ -33,17 +37,21 @@ public class Board extends BaseDateTimeEntity { @Column(nullable = false) private int mode; + @Enumerated(EnumType.STRING) @Column(nullable = false) - private int mainPosition; + private Position mainPosition; + @Enumerated(EnumType.STRING) @Column(nullable = false) - private int subPosition; + private Position subPosition; + @Enumerated(EnumType.STRING) @Column(nullable = false) - private int wantPosition; + private Position wantPosition; + @Enumerated(EnumType.STRING) @Column(nullable = false) - private boolean mike = false; + private Mike mike; @Column(length = 5000) private String content; @@ -62,8 +70,9 @@ public class Board extends BaseDateTimeEntity { private List boardGameStyles = new ArrayList<>(); - public static Board create(Member member, int mode, int mainPosition, int subPosition, int wantPosition, - boolean mike, String content, int boardProfileImage) { + public static Board create(Member member, int mode, Position mainPosition, Position subPosition, + Position wantPosition, + Mike mike, String content, int boardProfileImage) { return Board.builder() .member(member) .mode(mode) @@ -77,7 +86,8 @@ public static Board create(Member member, int mode, int mainPosition, int subPos } @Builder - private Board(int mode, int mainPosition, int subPosition, int wantPosition, boolean mike, String content, + private Board(int mode, Position mainPosition, Position subPosition, Position wantPosition, Mike mike, + String content, int boardProfileImage, boolean deleted, Member member) { this.mode = mode; this.mainPosition = mainPosition; @@ -100,7 +110,7 @@ public void removeBoardGameStyle(BoardGameStyle boardGameStyle) { boardGameStyle.removeBoard(); } - public void updateBoard(int gameMode, Integer mainPosition, Integer subPosition, Integer wantPosition, Boolean mike, + public void updateBoard(int gameMode, Position mainPosition, Position subPosition, Position wantPosition, Mike mike, String content, int boardProfileImage) { if (gameMode != 0) { this.mode = gameMode; @@ -131,4 +141,5 @@ public void setDeleted(boolean deleted) { this.deleted = deleted; } + } diff --git a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/request/BoardInsertRequest.java b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/request/BoardInsertRequest.java index 91b59bc7..e37f9fed 100644 --- a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/request/BoardInsertRequest.java +++ b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/request/BoardInsertRequest.java @@ -1,5 +1,7 @@ package com.gamegoo.gamegoo_v2.content.board.dto.request; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; @@ -23,22 +25,16 @@ public class BoardInsertRequest { Integer gameMode; @NotNull(message = "주 포지션은 필수 값입니다.") - @Min(value = 0, message = "주 포지션은 0 이상이어야 합니다.") - @Max(value = 5, message = "주 포지션은 5 이하여야 합니다.") - Integer mainPosition; + Position mainPosition; @NotNull(message = "부 포지션은 필수 값입니다.") - @Min(value = 0, message = "부 포지션은 0 이상이어야 합니다.") - @Max(value = 5, message = "부 포지션은 5 이하여야 합니다.") - Integer subPosition; + Position subPosition; @NotNull(message = "희망 포지션은 필수 값입니다.") - @Min(value = 0, message = "희망 포지션은 0 이상이어야 합니다.") - @Max(value = 5, message = "희망 포지션은 5 이하여야 합니다.") - Integer wantPosition; + Position wantPosition; - @Schema(description = "마이크 사용 여부", defaultValue = "false") - Boolean mike = false; + @Schema(description = "마이크 사용 여부", defaultValue = "UNAVAILABLE") + Mike mike = Mike.UNAVAILABLE; @NotNull(message = "게임 스타일 리스트는 필수 값입니다.") @Size(min = 1, max = 3, message = "게임 스타일 리스트는 1개 이상 3개 이하여야 합니다.") @@ -47,4 +43,5 @@ public class BoardInsertRequest { @Schema(description = "게시글 내용 (선택)") String contents; + } diff --git a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/request/BoardUpdateRequest.java b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/request/BoardUpdateRequest.java index 79b1cd16..412dc55e 100644 --- a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/request/BoardUpdateRequest.java +++ b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/request/BoardUpdateRequest.java @@ -1,5 +1,7 @@ package com.gamegoo.gamegoo_v2.content.board.dto.request; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; @@ -23,22 +25,16 @@ public class BoardUpdateRequest { Integer gameMode; @NotNull(message = "주 포지션은 필수 값입니다.") - @Min(value = 0, message = "주 포지션은 0 이상이어야 합니다.") - @Max(value = 5, message = "주 포지션은 5 이하여야 합니다.") - Integer mainPosition; + Position mainPosition; @NotNull(message = "부 포지션은 필수 값입니다.") - @Min(value = 0, message = "부 포지션은 0 이상이어야 합니다.") - @Max(value = 5, message = "부 포지션은 5 이하여야 합니다.") - Integer subPosition; + Position subPosition; @NotNull(message = "희망 포지션은 필수 값입니다.") - @Min(value = 0, message = "희망 포지션은 0 이상이어야 합니다.") - @Max(value = 5, message = "희망 포지션은 5 이하여야 합니다.") - Integer wantPosition; + Position wantPosition; @Schema(description = "마이크 사용 여부 (선택)") - Boolean mike; + Mike mike; @NotNull(message = "게임 스타일 리스트는 필수 값입니다.") @Size(min = 1, max = 3, message = "게임 스타일 리스트는 1개 이상 3개 이하여야 합니다.") diff --git a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardByIdResponse.java b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardByIdResponse.java index 586e303c..efecf32c 100644 --- a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardByIdResponse.java +++ b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardByIdResponse.java @@ -1,6 +1,8 @@ package com.gamegoo.gamegoo_v2.content.board.dto.response; import com.gamegoo.gamegoo_v2.account.member.domain.Member; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import com.gamegoo.gamegoo_v2.account.member.domain.Tier; import com.gamegoo.gamegoo_v2.content.board.domain.Board; import lombok.Builder; @@ -24,12 +26,12 @@ public class BoardByIdResponse { Integer mannerLevel; Tier tier; int rank; - boolean mike; + Mike mike; List championResponseList; int gameMode; - int mainPosition; - int subPosition; - int wantPosition; + Position mainPosition; + Position subPosition; + Position wantPosition; Integer recentGameCount; Double winRate; List gameStyles; @@ -57,7 +59,7 @@ public static BoardByIdResponse of(Board board) { .mannerLevel(poster.getMannerLevel()) .tier(poster.getTier()) .rank(poster.getGameRank()) - .mike(board.isMike()) + .mike(board.getMike()) .championResponseList(championResponseList) .gameMode(board.getMode()) .mainPosition(board.getMainPosition()) diff --git a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardByIdResponseForMember.java b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardByIdResponseForMember.java index d2d0d47b..98e976b2 100644 --- a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardByIdResponseForMember.java +++ b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardByIdResponseForMember.java @@ -1,6 +1,8 @@ package com.gamegoo.gamegoo_v2.content.board.dto.response; import com.gamegoo.gamegoo_v2.account.member.domain.Member; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import com.gamegoo.gamegoo_v2.account.member.domain.Tier; import com.gamegoo.gamegoo_v2.content.board.domain.Board; import com.gamegoo.gamegoo_v2.social.manner.domain.MannerKeyword; @@ -29,12 +31,12 @@ public class BoardByIdResponseForMember { List mannerKeywords; Tier tier; int rank; - boolean mike; + Mike mike; List championResponseDTOList; int gameMode; - int mainPosition; - int subPosition; - int wantPosition; + Position mainPosition; + Position subPosition; + Position wantPosition; Integer recentGameCount; Double winRate; List gameStyles; @@ -73,7 +75,7 @@ public static BoardByIdResponseForMember of( .mannerLevel(poster.getMannerLevel()) .tier(poster.getTier()) .rank(poster.getGameRank()) - .mike(board.isMike()) + .mike(board.getMike()) .championResponseDTOList(championResponseList) .gameMode(board.getMode()) .mainPosition(board.getMainPosition()) diff --git a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardInsertResponse.java b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardInsertResponse.java index 9133287e..5d01374c 100644 --- a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardInsertResponse.java +++ b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardInsertResponse.java @@ -1,6 +1,9 @@ package com.gamegoo.gamegoo_v2.content.board.dto.response; import com.gamegoo.gamegoo_v2.account.member.domain.Member; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; +import com.gamegoo.gamegoo_v2.account.member.domain.Tier; import com.gamegoo.gamegoo_v2.content.board.domain.Board; import lombok.Builder; import lombok.Getter; @@ -16,13 +19,13 @@ public class BoardInsertResponse { private Integer profileImage; private String gameName; private String tag; - private String tier; + private Tier tier; private int rank; private int gameMode; - private int mainPosition; - private int subPosition; - private int wantPosition; - private boolean mike; + private Position mainPosition; + private Position subPosition; + private Position wantPosition; + private Mike mike; private List gameStyles; private String contents; @@ -33,13 +36,13 @@ public static BoardInsertResponse of(Board board, Member member) { .profileImage(board.getBoardProfileImage()) .gameName(member.getGameName()) .tag(member.getTag()) - .tier(member.getTier().name()) + .tier(member.getTier()) .rank(member.getGameRank()) .gameMode(board.getMode()) .mainPosition(board.getMainPosition()) .subPosition(board.getSubPosition()) .wantPosition(board.getWantPosition()) - .mike(board.isMike()) + .mike(board.getMike()) .gameStyles(board.getBoardGameStyles().stream() .map(bg -> bg.getGameStyle().getId()) .toList()) diff --git a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardListResponse.java b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardListResponse.java index 4eee8541..c9339414 100644 --- a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardListResponse.java +++ b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardListResponse.java @@ -1,6 +1,8 @@ package com.gamegoo.gamegoo_v2.content.board.dto.response; import com.gamegoo.gamegoo_v2.account.member.domain.Member; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import com.gamegoo.gamegoo_v2.account.member.domain.Tier; import com.gamegoo.gamegoo_v2.content.board.domain.Board; import com.gamegoo.gamegoo_v2.game.dto.response.ChampionResponse; @@ -24,13 +26,13 @@ public class BoardListResponse { Tier tier; int rank; int gameMode; - int mainPosition; - int subPosition; - int wantPosition; + Position mainPosition; + Position subPosition; + Position wantPosition; List championResponseList; Double winRate; LocalDateTime createdAt; - boolean mike; + Mike mike; public static BoardListResponse of(Board board) { Member member = board.getMember(); @@ -56,7 +58,7 @@ public static BoardListResponse of(Board board) { .championResponseList(championResponseList) .winRate(member.getWinRate()) .createdAt(board.getCreatedAt()) - .mike(board.isMike()) + .mike(board.getMike()) .build(); } diff --git a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardUpdateResponse.java b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardUpdateResponse.java index 610cf64d..efb70b08 100644 --- a/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardUpdateResponse.java +++ b/src/main/java/com/gamegoo/gamegoo_v2/content/board/dto/response/BoardUpdateResponse.java @@ -1,6 +1,8 @@ package com.gamegoo.gamegoo_v2.content.board.dto.response; import com.gamegoo.gamegoo_v2.account.member.domain.Member; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import com.gamegoo.gamegoo_v2.account.member.domain.Tier; import com.gamegoo.gamegoo_v2.content.board.domain.Board; import lombok.Builder; @@ -21,10 +23,10 @@ public class BoardUpdateResponse { Tier tier; Integer rank; Integer gameMode; - Integer mainPosition; - Integer subPosition; - Integer wantPosition; - Boolean mike; + Position mainPosition; + Position subPosition; + Position wantPosition; + Mike mike; List gameStyles; String contents; @@ -46,7 +48,7 @@ public static BoardUpdateResponse of(Board board) { .mainPosition(board.getMainPosition()) .subPosition(board.getSubPosition()) .wantPosition(board.getWantPosition()) - .mike(board.isMike()) + .mike(board.getMike()) .gameStyles(gameStyleIds) .contents(board.getContent()) .build(); diff --git a/src/main/java/com/gamegoo/gamegoo_v2/content/board/repository/BoardRepository.java b/src/main/java/com/gamegoo/gamegoo_v2/content/board/repository/BoardRepository.java index a07e4b39..ee91ebd4 100644 --- a/src/main/java/com/gamegoo/gamegoo_v2/content/board/repository/BoardRepository.java +++ b/src/main/java/com/gamegoo/gamegoo_v2/content/board/repository/BoardRepository.java @@ -1,5 +1,7 @@ package com.gamegoo.gamegoo_v2.content.board.repository; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import com.gamegoo.gamegoo_v2.account.member.domain.Tier; import com.gamegoo.gamegoo_v2.content.board.domain.Board; import org.springframework.data.domain.Page; @@ -16,12 +18,12 @@ public interface BoardRepository extends JpaRepository { "(b.deleted = false) AND " + "(:mode IS NULL OR b.mode = :mode) AND " + "(:tier IS NULL OR m.tier = :tier) AND " + - "(:mainPosition IS NULL OR b.mainPosition = :mainPosition ) AND " + + "(:mainPosition IS NULL OR :mainPosition = 'ANY' OR b.mainPosition = :mainPosition ) AND " + "(:mike IS NULL OR b.mike = :mike)") Page findByFilters(@Param("mode") Integer mode, @Param("tier") Tier tier, - @Param("mainPosition") Integer mainPosition, - @Param("mike") Boolean mike, + @Param("mainPosition") Position mainPosition, + @Param("mike") Mike mike, Pageable pageable); diff --git a/src/main/java/com/gamegoo/gamegoo_v2/content/board/service/BoardFacadeService.java b/src/main/java/com/gamegoo/gamegoo_v2/content/board/service/BoardFacadeService.java index 254bf1b6..e48722c7 100644 --- a/src/main/java/com/gamegoo/gamegoo_v2/content/board/service/BoardFacadeService.java +++ b/src/main/java/com/gamegoo/gamegoo_v2/content/board/service/BoardFacadeService.java @@ -1,6 +1,8 @@ package com.gamegoo.gamegoo_v2.content.board.service; import com.gamegoo.gamegoo_v2.account.member.domain.Member; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import com.gamegoo.gamegoo_v2.account.member.domain.Tier; import com.gamegoo.gamegoo_v2.account.member.service.MemberService; import com.gamegoo.gamegoo_v2.content.board.domain.Board; @@ -50,12 +52,11 @@ public BoardInsertResponse createBoard(BoardInsertRequest request, Member member * 게시판 글 목록 조회 (파사드) */ - public BoardResponse getBoardList(Integer mode, Tier tier, Integer mainPosition, Boolean mike, + public BoardResponse getBoardList(Integer mode, Tier tier, Position mainPosition, Mike mike, @ValidPage int pageIdx) { - // <포지션 정보> 전체: 0, 탑: 1, 정글: 2, 미드: 3, 바텀: 4, 서포터: 5 - if (mainPosition != null && mainPosition == 0) { - mainPosition = null; + if (mainPosition == null) { + mainPosition = Position.ANY; } Page boardPage = boardService.getBoardsWithPagination(mode, tier, mainPosition, mike, pageIdx); diff --git a/src/main/java/com/gamegoo/gamegoo_v2/content/board/service/BoardService.java b/src/main/java/com/gamegoo/gamegoo_v2/content/board/service/BoardService.java index a87d24a0..8426f9da 100644 --- a/src/main/java/com/gamegoo/gamegoo_v2/content/board/service/BoardService.java +++ b/src/main/java/com/gamegoo/gamegoo_v2/content/board/service/BoardService.java @@ -1,6 +1,8 @@ package com.gamegoo.gamegoo_v2.content.board.service; import com.gamegoo.gamegoo_v2.account.member.domain.Member; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import com.gamegoo.gamegoo_v2.account.member.domain.Tier; import com.gamegoo.gamegoo_v2.content.board.domain.Board; import com.gamegoo.gamegoo_v2.content.board.dto.request.BoardInsertRequest; @@ -50,7 +52,7 @@ public Board createAndSaveBoard(BoardInsertRequest request, Member member) { /** * 게시글 목록 조회 */ - public Page findBoards(Integer mode, Tier tier, Integer mainPosition, Boolean mike, Pageable pageable) { + public Page findBoards(Integer mode, Tier tier, Position mainPosition, Mike mike, Pageable pageable) { return boardRepository.findByFilters(mode, tier, mainPosition, mike, pageable); } @@ -58,7 +60,7 @@ public Page findBoards(Integer mode, Tier tier, Integer mainPosition, Boo * 게시글 목록 조회 (페이징 처리) */ - public Page getBoardsWithPagination(Integer mode, Tier tier, Integer mainPosition, Boolean mike, + public Page getBoardsWithPagination(Integer mode, Tier tier, Position mainPosition, Mike mike, int pageIdx) { Pageable pageable = PageRequest.of(pageIdx - 1, PAGE_SIZE, Sort.by(Sort.Direction.DESC, "createdAt")); return findBoards(mode, tier, mainPosition, mike, pageable); diff --git a/src/test/java/com/gamegoo/gamegoo_v2/integration/chat/ChatFacadeServiceTest.java b/src/test/java/com/gamegoo/gamegoo_v2/integration/chat/ChatFacadeServiceTest.java index 04a3cf6b..7c7ee22f 100644 --- a/src/test/java/com/gamegoo/gamegoo_v2/integration/chat/ChatFacadeServiceTest.java +++ b/src/test/java/com/gamegoo/gamegoo_v2/integration/chat/ChatFacadeServiceTest.java @@ -2,6 +2,8 @@ import com.gamegoo.gamegoo_v2.account.member.domain.LoginType; import com.gamegoo.gamegoo_v2.account.member.domain.Member; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import com.gamegoo.gamegoo_v2.account.member.domain.Tier; import com.gamegoo.gamegoo_v2.account.member.repository.MemberRepository; import com.gamegoo.gamegoo_v2.account.member.service.MemberService; @@ -1122,10 +1124,10 @@ private Board createBoard(Member member) { return boardRepository.save(Board.builder() .member(member) .mode(1) - .mainPosition(1) - .subPosition(2) - .wantPosition(3) - .mike(true) + .mainPosition(Position.ADC) + .subPosition(Position.JUNGLE) + .wantPosition(Position.ADC) + .mike(Mike.AVAILABLE) .content("content") .boardProfileImage(1) .build()); diff --git a/src/test/java/com/gamegoo/gamegoo_v2/integration/report/ReportFacadeServiceTest.java b/src/test/java/com/gamegoo/gamegoo_v2/integration/report/ReportFacadeServiceTest.java index c6781d3c..c99d5164 100644 --- a/src/test/java/com/gamegoo/gamegoo_v2/integration/report/ReportFacadeServiceTest.java +++ b/src/test/java/com/gamegoo/gamegoo_v2/integration/report/ReportFacadeServiceTest.java @@ -2,6 +2,8 @@ import com.gamegoo.gamegoo_v2.account.member.domain.LoginType; import com.gamegoo.gamegoo_v2.account.member.domain.Member; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import com.gamegoo.gamegoo_v2.account.member.domain.Tier; import com.gamegoo.gamegoo_v2.account.member.repository.MemberRepository; import com.gamegoo.gamegoo_v2.content.board.domain.Board; @@ -295,10 +297,10 @@ private Board createBoard(Member member) { return boardRepository.save(Board.builder() .member(member) .mode(1) - .mainPosition(1) - .subPosition(2) - .wantPosition(3) - .mike(true) + .mainPosition(Position.ADC) + .subPosition(Position.JUNGLE) + .wantPosition(Position.ADC) + .mike(Mike.AVAILABLE) .content("content") .boardProfileImage(1) .build()); diff --git a/src/test/java/com/gamegoo/gamegoo_v2/service/chat/ChatCommandServiceTest.java b/src/test/java/com/gamegoo/gamegoo_v2/service/chat/ChatCommandServiceTest.java index f4e0612c..a471ed10 100644 --- a/src/test/java/com/gamegoo/gamegoo_v2/service/chat/ChatCommandServiceTest.java +++ b/src/test/java/com/gamegoo/gamegoo_v2/service/chat/ChatCommandServiceTest.java @@ -2,6 +2,8 @@ import com.gamegoo.gamegoo_v2.account.member.domain.LoginType; import com.gamegoo.gamegoo_v2.account.member.domain.Member; +import com.gamegoo.gamegoo_v2.account.member.domain.Mike; +import com.gamegoo.gamegoo_v2.account.member.domain.Position; import com.gamegoo.gamegoo_v2.account.member.domain.Tier; import com.gamegoo.gamegoo_v2.account.member.repository.MemberRepository; import com.gamegoo.gamegoo_v2.chat.domain.Chat; @@ -511,10 +513,10 @@ private Board createBoard(Member member) { return boardRepository.save(Board.builder() .member(member) .mode(1) - .mainPosition(1) - .subPosition(2) - .wantPosition(3) - .mike(true) + .mainPosition(Position.ADC) + .subPosition(Position.JUNGLE) + .wantPosition(Position.ADC) + .mike(Mike.AVAILABLE) .content("content") .boardProfileImage(1) .build());