Merge pull request #144 from Gamegoo-repo/feat/132

[Feat/132] 게시판 관련 추가 구현

src/main/generated/com/gamegoo/domain/member/QMember.java

@@ -33,6 +33,8 @@ public class QMember extends EntityPathBase<Member> {
 
     public final StringPath email = createString("email");
 
+    public final NumberPath<Integer> gameCount = createNumber("gameCount", Integer.class);
+
     public final StringPath gameName = createString("gameName");
 
     public final NumberPath<Long> id = createNumber("id", Long.class);

src/main/java/com/gamegoo/controller/board/BoardController.java

@@ -131,7 +131,7 @@ public ApiResponse<List<BoardResponse.boardListResponseDTO>> boardList(@RequestP
     }
 
     @GetMapping("/list/{boardId}")
-    @Operation(summary = "게시판 글 조회 API", description = "게시판에서 글을 조회하는 API 입니다.")
+    @Operation(summary = "비회원용 게시판 글 조회 API", description = "게시판에서 글을 조회하는 API 입니다.")
     @Parameter(name = "boardId", description = "조회할 게시판 글 id 입니다.")
     public ApiResponse<BoardResponse.boardByIdResponseDTO> getBoardById(@PathVariable Long boardId) {
 
@@ -140,6 +140,18 @@ public ApiResponse<BoardResponse.boardByIdResponseDTO> getBoardById(@PathVariabl
         return ApiResponse.onSuccess(result);
     }
 
+    @GetMapping("/member/list/{boardId}")
+    @Operation(summary = "회원용 게시판 글 조회 API", description = "게시판에서 글을 조회하는 API 입니다.")
+    @Parameter(name = "boardId", description = "조회할 게시판 글 id 입니다.")
+    public ApiResponse<BoardResponse.boardByIdResponseForMemberDTO> getBoardByIdForMember(@PathVariable Long boardId) {
+
+        Long memberId = JWTUtil.getCurrentUserId();
+
+        BoardResponse.boardByIdResponseForMemberDTO result = boardService.getBoardByIdForMember(boardId, memberId);
+
+        return ApiResponse.onSuccess(result);
+    }
+
     @GetMapping("/my")
     @Operation(summary = "내가 작성한 게시판 글 목록 조회 API", description = "내가 작성한 게시판 글을 조회하는 API 입니다.")
     @Parameter(name = "pageIdx", description = "조회할 페이지 번호를 입력해주세요.")

src/main/java/com/gamegoo/domain/member/Member.java

@@ -76,6 +76,9 @@ public class Member extends BaseDateTimeEntity {
     @Column(name = "mike")
     private Boolean mike = false;
 
+    @Column(name = "game_count")
+    private Integer gameCount;
+
     @Column(name = "is_agree")
     private Boolean isAgree;
 
@@ -126,10 +129,12 @@ public void initializeMemberChampionList() {
         this.memberChampionList = new ArrayList<>();
     }
 
-    public void updateRiotDetails(Tier tier, Integer rank, Double winRate) {
+    public void updateRiotDetails(Tier tier, Integer rank, Double winRate, Integer gameCount) {
+
         this.tier = tier;
         this.rank = rank;
         this.winRate = winRate;
+        this.gameCount = gameCount;
     }
 
     public void updateRiotBasic(String gameName, String tag) {

src/main/java/com/gamegoo/dto/board/BoardResponse.java

@@ -92,6 +92,34 @@ public static class boardByIdResponseDTO {
         Integer mainPosition;
         Integer subPosition;
         Integer wantPosition;
+        Integer recentGameCount;
+        Double winRate;
+        List<Long> gameStyles;
+        String contents;
+    }
+
+    @Getter
+    @Builder
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class boardByIdResponseForMemberDTO {
+        Long boardId;
+        Long memberId;
+        Boolean isBlocked;
+        LocalDateTime createdAt;
+        Integer profileImage;
+        String gameName;
+        String tag;
+        Integer mannerLevel;
+        String tier;
+        Boolean mike;
+        List<Long> championList;
+        Integer gameMode;
+        Integer mainPosition;
+        Integer subPosition;
+        Integer wantPosition;
+        Integer recentGameCount;
         Double winRate;
         List<Long> gameStyles;
         String contents;

src/main/java/com/gamegoo/service/board/BoardService.java

@@ -4,17 +4,18 @@
 import com.gamegoo.apiPayload.exception.handler.BoardHandler;
 import com.gamegoo.apiPayload.exception.handler.MemberHandler;
 import com.gamegoo.apiPayload.exception.handler.PageHandler;
-import com.gamegoo.domain.member.Member;
 import com.gamegoo.domain.board.Board;
 import com.gamegoo.domain.board.BoardGameStyle;
 import com.gamegoo.domain.champion.MemberChampion;
 import com.gamegoo.domain.gamestyle.GameStyle;
+import com.gamegoo.domain.member.Member;
 import com.gamegoo.dto.board.BoardRequest;
 import com.gamegoo.dto.board.BoardResponse;
 import com.gamegoo.repository.board.BoardGameStyleRepository;
 import com.gamegoo.repository.board.BoardRepository;
 import com.gamegoo.repository.member.GameStyleRepository;
 import com.gamegoo.repository.member.MemberRepository;
+import com.gamegoo.util.MemberUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -239,6 +240,7 @@ public void delete(Long boardId, Long memberId) {
     // 게시판 글 목록 조회
     @Transactional(readOnly = true)
     public List<BoardResponse.boardListResponseDTO> getBoardList(Integer mode, String tier, Integer mainPosition, Boolean mike, int pageIdx) {
+
         // pageIdx 값 검증.
         if (pageIdx <= 0) {
             throw new PageHandler(ErrorStatus.PAGE_INVALID);
@@ -273,36 +275,70 @@ public List<BoardResponse.boardListResponseDTO> getBoardList(Integer mode, Strin
         }).collect(Collectors.toList());
     }
 
-    // 게시판 글 조회
+    // 비회원 게시판 글 조회
     @Transactional(readOnly = true)
     public BoardResponse.boardByIdResponseDTO getBoardById(Long boardId) {
 
         Board board = boardRepository.findById(boardId).orElseThrow(() -> new BoardHandler(ErrorStatus.BOARD_NOT_FOUND));
 
-        Member member = board.getMember();
+        Member poster = board.getMember();
 
         return BoardResponse.boardByIdResponseDTO.builder()
                 .boardId(board.getId())
-                .memberId(member.getId())
+                .memberId(poster.getId())
                 .createdAt(board.getCreatedAt())
                 .profileImage(board.getBoardProfileImage())
-                .gameName(member.getGameName())
-                .tag(member.getTag())
-                .mannerLevel(member.getMannerLevel())
-                .tier(member.getTier())
-                .championList(member.getMemberChampionList().stream().map(MemberChampion::getId).collect(Collectors.toList()))
+                .gameName(poster.getGameName())
+                .tag(poster.getTag())
+                .mannerLevel(poster.getMannerLevel())
+                .tier(poster.getTier())
+                .championList(poster.getMemberChampionList().stream().map(MemberChampion::getId).collect(Collectors.toList()))
                 .mike(board.getMike())
                 .gameMode(board.getMode())
                 .mainPosition(board.getMainPosition())
                 .subPosition(board.getSubPosition())
                 .wantPosition(board.getWantPosition())
-                .winRate(member.getWinRate())
-                .gameStyles(board.getBoardGameStyles().stream().map(boardGameStyle -> boardGameStyle.getGameStyle().getId()).collect(Collectors.toList()))
+                .recentGameCount(poster.getGameCount())
+                .winRate(poster.getWinRate())
+                .gameStyles(board.getBoardGameStyles().stream().map(BoardGameStyle::getId).collect(Collectors.toList()))
                 .contents(board.getContent())
                 .build();
 
     }
 
+    // 회원 게시판 글 조회
+    @Transactional(readOnly = true)
+    public BoardResponse.boardByIdResponseForMemberDTO getBoardByIdForMember(Long boardId, Long memberId) {
+
+        Board board = boardRepository.findById(boardId).orElseThrow(() -> new BoardHandler(ErrorStatus.BOARD_NOT_FOUND));
+
+        Member member = memberRepository.findById(memberId).orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
+
+        Member poster = board.getMember();
+
+        return BoardResponse.boardByIdResponseForMemberDTO.builder()
+                .boardId(board.getId())
+                .memberId(poster.getId())
+                .isBlocked(MemberUtils.isBlocked(member, poster))
+                .createdAt(board.getCreatedAt())
+                .profileImage(board.getBoardProfileImage())
+                .gameName(poster.getGameName())
+                .tag(poster.getTag())
+                .mannerLevel(poster.getMannerLevel())
+                .tier(poster.getTier())
+                .championList(poster.getMemberChampionList().stream().map(MemberChampion::getId).collect(Collectors.toList()))
+                .mike(board.getMike())
+                .gameMode(board.getMode())
+                .mainPosition(board.getMainPosition())
+                .subPosition(board.getSubPosition())
+                .wantPosition(board.getWantPosition())
+                .recentGameCount(poster.getGameCount())
+                .winRate(poster.getWinRate())
+                .gameStyles(board.getBoardGameStyles().stream().map(BoardGameStyle::getId).collect(Collectors.toList()))
+                .contents(board.getContent())
+                .build();
+    }
+
     // 내가 작성한 게시판 글 목록 조회
     @Transactional(readOnly = true)
     public List<BoardResponse.myBoardListResponseDTO> getMyBoardList(Long memberId, int pageIdx) {

src/main/java/com/gamegoo/util/RiotUtil.java

@@ -168,13 +168,14 @@ public void addTierRankWinRate(Member member, String gameName, String encryptedS
             if ("RANKED_SOLO_5x5".equals(entry.getQueueType())) {
                 int wins = entry.getWins();
                 int losses = entry.getLosses();
+                int gameCount = wins + losses;
                 double winrate = (double) wins / (wins + losses);
                 winrate = Math.round(winrate * 1000) / 10.0;
                 Tier tier = Tier.valueOf(entry.getTier().toUpperCase());
                 Integer rank = romanToIntMap.get(entry.getRank());
 
                 // DB에 저장
-                member.updateRiotDetails(tier, rank, winrate);
+                member.updateRiotDetails(tier, rank, winrate, gameCount);
                 break;
             }
         }