diff --git a/src/main/java/com/back/catchmate/domain/board/converter/BoardConverter.java b/src/main/java/com/back/catchmate/domain/board/converter/BoardConverter.java index e4d8d5d..4c39730 100644 --- a/src/main/java/com/back/catchmate/domain/board/converter/BoardConverter.java +++ b/src/main/java/com/back/catchmate/domain/board/converter/BoardConverter.java @@ -8,6 +8,9 @@ import com.back.catchmate.domain.game.converter.GameConverter; import com.back.catchmate.domain.game.dto.GameResponse.GameInfo; import com.back.catchmate.domain.game.entity.Game; +import com.back.catchmate.domain.user.converter.UserConverter; +import com.back.catchmate.domain.user.dto.UserResponse; +import com.back.catchmate.domain.user.dto.UserResponse.UserInfo; import com.back.catchmate.domain.user.entity.User; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; @@ -21,6 +24,7 @@ @RequiredArgsConstructor public class BoardConverter { private final GameConverter gameConverter; + private final UserConverter userConverter; public Board toEntity(User user, Game game, Club cheerClub, CreateOrUpdateBoardRequest boardRequest) { return Board.builder() @@ -51,6 +55,7 @@ public PagedBoardInfo toPagedBoardInfoFromBoardList(Page boardList) { public BoardInfo toBoardInfo(Board board, Game game) { GameInfo gameInfo = gameConverter.toGameInfo(game); + UserInfo userInfo = userConverter.toUserInfo(board.getUser()); return BoardInfo.builder() .boardId(board.getId()) @@ -61,6 +66,7 @@ public BoardInfo toBoardInfo(Board board, Game game) { .preferredGender(board.getPreferredGender()) .preferredAgeRange(board.getPreferredAgeRange()) .gameInfo(gameInfo) + .userInfo(userInfo) .build(); } diff --git a/src/main/java/com/back/catchmate/domain/board/dto/BoardResponse.java b/src/main/java/com/back/catchmate/domain/board/dto/BoardResponse.java index b9b2da0..415454e 100644 --- a/src/main/java/com/back/catchmate/domain/board/dto/BoardResponse.java +++ b/src/main/java/com/back/catchmate/domain/board/dto/BoardResponse.java @@ -1,6 +1,8 @@ package com.back.catchmate.domain.board.dto; import com.back.catchmate.domain.game.dto.GameResponse.GameInfo; +import com.back.catchmate.domain.user.dto.UserResponse; +import com.back.catchmate.domain.user.dto.UserResponse.UserInfo; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -24,6 +26,7 @@ public static class BoardInfo { private String preferredGender; private String preferredAgeRange; private GameInfo gameInfo; + private UserInfo userInfo; } @Getter diff --git a/src/main/java/com/back/catchmate/domain/board/entity/Board.java b/src/main/java/com/back/catchmate/domain/board/entity/Board.java index e22924c..dc9a5ad 100644 --- a/src/main/java/com/back/catchmate/domain/board/entity/Board.java +++ b/src/main/java/com/back/catchmate/domain/board/entity/Board.java @@ -51,7 +51,7 @@ public class Board extends BaseTimeEntity { @JoinColumn(name = "game_id", nullable = false) private Game game; - @OneToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "club_id", nullable = false) private Club club;