From 529412bba6cef325bfe84d11f78904318b01c195 Mon Sep 17 00:00:00 2001 From: hzee97 Date: Sun, 11 Aug 2024 03:29:32 +0900 Subject: [PATCH 1/2] =?UTF-8?q?:bug:=20[Fix]=20=EA=B2=8C=EC=9E=84=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/gamegoo/service/board/BoardService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gamegoo/service/board/BoardService.java b/src/main/java/com/gamegoo/service/board/BoardService.java index 54d432cc..357d81ab 100644 --- a/src/main/java/com/gamegoo/service/board/BoardService.java +++ b/src/main/java/com/gamegoo/service/board/BoardService.java @@ -301,7 +301,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(); @@ -335,7 +335,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(); } From 64c90c4deb1aeed7bf63667bd221a2af0e03f04d Mon Sep 17 00:00:00 2001 From: hzee97 Date: Sun, 11 Aug 2024 03:40:25 +0900 Subject: [PATCH 2/2] =?UTF-8?q?:sparkles:=20[Feat]=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=ED=8C=90=20=EA=B8=80=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20?= =?UTF-8?q?=EC=B9=9C=EA=B5=AC=20=EC=97=AC=EB=B6=80=20response=EC=97=90=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/gamegoo/dto/board/BoardResponse.java | 1 + src/main/java/com/gamegoo/service/board/BoardService.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/com/gamegoo/dto/board/BoardResponse.java b/src/main/java/com/gamegoo/dto/board/BoardResponse.java index 41e2a7b8..9ea1e0f2 100644 --- 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 index 357d81ab..310a046f 100644 --- 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; @@ -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())