Merge pull request #152 from Gamegoo-repo/feat/151

[Feat/151] 게시판 관련 추가 구현 및 수정
Gamegoo-repo · Aug 10, 2024 · 126e5db · 126e5db
2 parents 8c98a74 + 64c90c4
commit 126e5db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/com/gamegoo/dto/board/BoardResponse.java b/src/main/java/com/gamegoo/dto/board/BoardResponse.java
@@ -107,6 +107,7 @@ public static class boardByIdResponseForMemberDTO {
         Long boardId;
         Long memberId;
         Boolean isBlocked;
+        Boolean isFriend;
         LocalDateTime createdAt;
         Integer profileImage;
         String gameName;

diff --git a/src/main/java/com/gamegoo/service/board/BoardService.java b/src/main/java/com/gamegoo/service/board/BoardService.java
@@ -16,8 +16,10 @@
 import com.gamegoo.repository.board.BoardRepository;
 import com.gamegoo.repository.member.GameStyleRepository;
 import com.gamegoo.repository.member.MemberRepository;
+import com.gamegoo.service.member.FriendService;
 import com.gamegoo.util.MemberUtils;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -33,6 +35,8 @@
 @Service
 @RequiredArgsConstructor
 public class BoardService {
+    @Autowired
+    private FriendService friendService;
     private final MemberRepository memberRepository;
     private final BoardRepository boardRepository;
     private final GameStyleRepository gameStyleRepository;
@@ -301,7 +305,7 @@ public BoardResponse.boardByIdResponseDTO getBoardById(Long boardId) {
                 .wantPosition(board.getWantPosition())
                 .recentGameCount(poster.getGameCount())
                 .winRate(poster.getWinRate())
-                .gameStyles(board.getBoardGameStyles().stream().map(BoardGameStyle::getId).collect(Collectors.toList()))
+                .gameStyles(board.getBoardGameStyles().stream().map(boardGameStyle -> boardGameStyle.getGameStyle().getId()).collect(Collectors.toList()))
                 .contents(board.getContent())
                 .build();
 
@@ -321,6 +325,7 @@ public BoardResponse.boardByIdResponseForMemberDTO getBoardByIdForMember(Long bo
                 .boardId(board.getId())
                 .memberId(poster.getId())
                 .isBlocked(MemberUtils.isBlocked(member, poster))
+                .isFriend(friendService.isFriend(member,poster))
                 .createdAt(board.getCreatedAt())
                 .profileImage(board.getBoardProfileImage())
                 .gameName(poster.getGameName())
@@ -335,7 +340,7 @@ public BoardResponse.boardByIdResponseForMemberDTO getBoardByIdForMember(Long bo
                 .wantPosition(board.getWantPosition())
                 .recentGameCount(poster.getGameCount())
                 .winRate(poster.getWinRate())
-                .gameStyles(board.getBoardGameStyles().stream().map(BoardGameStyle::getId).collect(Collectors.toList()))
+                .gameStyles(board.getBoardGameStyles().stream().map(boardGameStyle -> boardGameStyle.getGameStyle().getId()).collect(Collectors.toList()))
                 .contents(board.getContent())
                 .build();
     }