Skip to content

Commit f675c5f

Browse files
committed
feat: board 조회 responseDto 변경
1 parent f33439e commit f675c5f

File tree

9 files changed

+28
-27
lines changed

9 files changed

+28
-27
lines changed

src/main/java/com/unit/daybook/domain/board/controller/BoardController.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ public FindOneBoardResponse getBoard(
3030
* 사용자가 작성한 일지 목록 조회
3131
*/
3232
@GetMapping("/boards")
33-
public List<FindBoardResponse> getMyBoards(@LoginUsers CustomUserDetails userDetails) {
34-
FindBoardListResponse tmp = boardService.getMyBoards(userDetails.getMemberId());
35-
return tmp.boards();
33+
public List<FindOneBoardResponse> getMyBoards(@LoginUsers CustomUserDetails userDetails) {
34+
return boardService.getMyBoards(userDetails.getMemberId());
3635
}
3736

3837
/**

src/main/java/com/unit/daybook/domain/board/dto/response/BoardResponseDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static BoardResponseDto from(Board board) {
2424
board.getBoardId(),
2525
board.getContent(),
2626
board.getRespectBoardId(),
27-
board.getMemeber().getId(),
27+
board.getMember().getId(),
2828
board.getCategory(),
2929
board.getHearts(),
3030
hashContents,

src/main/java/com/unit/daybook/domain/board/dto/response/FindBoardResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static FindBoardResponse from(Board board) {
2222
board.getBoardId(),
2323
board.getContent(),
2424
board.getRespectBoardId(),
25-
board.getMemeber().getId(),
25+
board.getMember().getId(),
2626
board.getCategory(),
2727
board.getHearts(),
2828
board.getPaperType(),

src/main/java/com/unit/daybook/domain/board/dto/response/FindOneBoardResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static FindOneBoardResponse of(Board board, List<ReactionTypeAndCount> re
3030
board.getBoardId(),
3131
board.getContent(),
3232
board.getRespectBoardId(),
33-
board.getMemeber().getId(),
33+
board.getMember().getId(),
3434
board.getCategory(),
3535
heartsFromReactions,
3636
hashContents,

src/main/java/com/unit/daybook/domain/board/entity/Board.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class Board extends BaseTimeEntity {
3535

3636
@ManyToOne
3737
@JoinColumn(name = "member_id")
38-
private Member memeber;
38+
private Member member;
3939

4040
@Column
4141
private String paperType;
@@ -57,7 +57,7 @@ public Board(Long boardId, String content, Long respectBoardId, Member member, S
5757
this.boardId = boardId;
5858
this.content = content;
5959
this.respectBoardId = respectBoardId;
60-
this.memeber = member;
60+
this.member = member;
6161
this.category = category;
6262
this.hearts = hearts;
6363
this.paperType = paperType;

src/main/java/com/unit/daybook/domain/board/repository/BoardRepositoryCustom.java

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.List;
44

5+
import com.unit.daybook.domain.board.dto.response.FindOneBoardResponse;
56
import com.unit.daybook.domain.board.entity.Board;
67

78
public interface BoardRepositoryCustom {

src/main/java/com/unit/daybook/domain/board/repository/BoardRepositoryImpl.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ public class BoardRepositoryImpl implements BoardRepositoryCustom {
2020
public List<Board> findBoardsByMemberId(Long memberId) {
2121

2222
return queryFactory
23-
.select(board)
24-
.from(board)
25-
.join(board.memeber, member).fetchJoin()
23+
.selectFrom(board)
24+
.leftJoin(board.member, member)
25+
.fetchJoin()
2626
.where(
2727
member.id.eq(memberId)
2828
)
@@ -34,7 +34,7 @@ public List<Board> findNotReadBoardsByMemberId(Long memberId, List<Board> alread
3434
return queryFactory
3535
.select(board)
3636
.from(board)
37-
.join(board.memeber, member).fetchJoin()
37+
.join(board.member, member).fetchJoin()
3838
.where(
3939
// member.id.eq(memberId)
4040
//.and(
@@ -88,7 +88,7 @@ public List<Board> findCurrentBoards(Long memberId) {
8888
tmps.add(memberId);
8989
return queryFactory
9090
.selectFrom(board)
91-
.where(board.memeber.id.notIn(tmps))
91+
.where(board.member.id.notIn(tmps))
9292
.fetch();
9393
}
9494
}

src/main/java/com/unit/daybook/domain/board/service/BoardService.java

+15-8
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,24 @@ public FindOneBoardResponse getBoard(Long boardId) {
6464
Board board = boardRepository.findById(boardId)
6565
.orElseThrow(() -> new CustomException(ErrorCode.BOARD_NOT_FOUND));
6666
List<ReactionTypeAndCount> reactions = reactionRepository.findAllByBoardGroupByReactionType(board);
67-
List<FindOneCommentResponse> comments = commentRepository.findCommentByBoard(boardId)
68-
.stream()
69-
.map(FindOneCommentResponse::from)
70-
.toList();
71-
return FindOneBoardResponse.of(board, reactions, comments);
67+
// List<FindOneCommentResponse> comments = commentRepository.findCommentByBoard(boardId)
68+
// .stream()
69+
// .map(FindOneCommentResponse::from)
70+
// .toList();
71+
return FindOneBoardResponse.of(board, reactions, List.of());
7272
}
7373

7474
@Transactional(readOnly = true)
75-
public FindBoardListResponse getMyBoards(Long memberId) {
76-
List<Board> boards= boardRepository.findBoardsByMemberId(memberId);
77-
return FindBoardListResponse.from(boards);
75+
public List<FindOneBoardResponse> getMyBoards(Long memberId) {
76+
List<Board> boards = boardRepository.findBoardsByMemberId(memberId);
77+
List<FindOneBoardResponse> boardResponses = new ArrayList<>();
78+
79+
for (Board board : boards) {
80+
List<ReactionTypeAndCount> reactions = reactionRepository.findAllByBoardGroupByReactionType(board);
81+
boardResponses.add(FindOneBoardResponse.of(board, reactions, List.of()));
82+
}
83+
84+
return boardResponses;
7885
}
7986

8087
public List<BoardResponseDto> getRandomBoards(Long memberId) {

src/main/java/com/unit/daybook/global/util/JwtUtil.java

-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
package com.unit.daybook.global.util;
22

3-
import java.nio.charset.StandardCharsets;
43
import java.security.Key;
5-
import java.util.Base64;
64
import java.util.Map;
75

8-
import javax.crypto.SecretKey;
9-
106
import org.springframework.beans.factory.annotation.Value;
117
import org.springframework.stereotype.Component;
128

139
import io.jsonwebtoken.Claims;
14-
import io.jsonwebtoken.Jws;
1510
import io.jsonwebtoken.JwsHeader;
1611
import io.jsonwebtoken.Jwts;
1712
import io.jsonwebtoken.SignatureAlgorithm;
18-
import io.jsonwebtoken.security.Keys;
1913

2014
@Component
2115
public class JwtUtil {

0 commit comments

Comments
 (0)