Merge pull request #157 from Modagbul/feat/alarm_minsu

fix: 게시글 조회할 때 닉네임, 프로필 이미지 바뀐 것 반영하게 수정

Author: minsu20

src/main/java/com/moing/backend/domain/board/application/dto/response/BoardBlocks.java

@@ -28,8 +28,11 @@ public class BoardBlocks {
 
     private Boolean writerIsDeleted;
 
+    private boolean isNotice;
+
+
     @QueryProjection
-    public BoardBlocks(Long boardId, String writerNickName, Boolean writerIsLeader, String writerProfileImage, String title, String content, Integer commentNum, Boolean writerIsDeleted) {
+    public BoardBlocks(Long boardId, String writerNickName, Boolean writerIsLeader, String writerProfileImage, String title, String content, Integer commentNum, Boolean writerIsDeleted, boolean isNotice) {
         this.boardId = boardId;
         this.writerNickName = writerNickName;
         this.writerIsLeader = writerIsLeader;
@@ -39,13 +42,18 @@ public BoardBlocks(Long boardId, String writerNickName, Boolean writerIsLeader,
         this.commentNum = commentNum;
         this.isRead = false;
         this.writerIsDeleted=writerIsDeleted;
+        this.isNotice=isNotice;
         deleteMember();
     }
 
     public void readBoard() {
         this.isRead = true;
     }
 
+    public boolean isNotice() {
+        return isNotice;
+    }
+
     public void deleteMember() {
         if(Boolean.TRUE.equals(writerIsDeleted)) {
             this.writerNickName = "(알 수 없음)";

src/main/java/com/moing/backend/domain/board/application/mapper/BoardMapper.java

@@ -17,10 +17,8 @@
 @RequiredArgsConstructor
 public class BoardMapper {
 
-    public Board toBoard(Member member, TeamMember teamMember, Team team, CreateBoardRequest createBoardRequest, boolean isLeader) {
+    public Board toBoard(TeamMember teamMember, Team team, CreateBoardRequest createBoardRequest, boolean isLeader) {
         Board board = Board.builder()
-                .writerNickName(member.getNickName())
-                .writerProfileImage(member.getProfileImage())
                 .title(createBoardRequest.getTitle())
                 .content(createBoardRequest.getContent())
                 .isNotice(createBoardRequest.getIsNotice())
@@ -35,8 +33,8 @@ public Board toBoard(Member member, TeamMember teamMember, Team team, CreateBoar
     }
 
     public GetBoardDetailResponse toBoardDetail(Board board, boolean isWriter, boolean writerIsDeleted) {
-        String nickName = writerIsDeleted ? "(알 수 없음)" : board.getWriterNickName();
-        String writerProfileImage = writerIsDeleted ? null : board.getWriterProfileImage();
+        String nickName = writerIsDeleted ? "(알 수 없음)" : board.getTeamMember().getMember().getNickName();
+        String writerProfileImage = writerIsDeleted ? null : board.getTeamMember().getMember().getProfileImage();
         return GetBoardDetailResponse.builder()
                 .boardId(board.getBoardId())
                 .title(board.getTitle())

src/main/java/com/moing/backend/domain/board/application/service/CreateBoardUseCase.java

@@ -39,7 +39,7 @@ public CreateBoardResponse createBoard(String socialId, Long teamId, CreateBoard
         //1, 게시글 생성, 저장
         BaseServiceResponse data=baseService.getCommonData(socialId, teamId);
         boolean isLeader = checkLeaderUseCase.isTeamLeader(data.getMember(), data.getTeam()); //작성자 리더 여부
-        Board board=boardSaveService.saveBoard(boardMapper.toBoard(data.getMember(), data.getTeamMember(), data.getTeam(), createBoardRequest, isLeader));
+        Board board=boardSaveService.saveBoard(boardMapper.toBoard(data.getTeamMember(), data.getTeam(), createBoardRequest, isLeader));
 
         //2. 읽음 처리 - 생성한 사람은 무조건 읽음
         createBoardReadUseCase.createBoardRead(data.getTeam(), data.getMember(), board);

src/main/java/com/moing/backend/domain/board/domain/entity/Board.java

@@ -6,7 +6,6 @@
 import com.moing.backend.domain.team.domain.entity.Team;
 import com.moing.backend.domain.teamMember.domain.entity.TeamMember;
 import com.moing.backend.global.entity.BaseTimeEntity;
-import com.moing.backend.global.utils.AesConverter;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -28,14 +27,8 @@ public class Board extends BaseTimeEntity {
     @Column(name = "board_id")
     private Long boardId;
 
-    //반정규화 -> 작성자에 대한 정보
-    @Convert(converter = AesConverter.class)
-    @Column(nullable = false)
-    private String writerNickName; /*작성자 닉네임*/
-
     private boolean isLeader; /*작성자 소모임장유무*/
 
-    private String writerProfileImage; /*작성자 프로필 사진*/
 
     @Column(nullable = false, length = 15)
     private String title;
@@ -52,6 +45,7 @@ public class Board extends BaseTimeEntity {
     @JoinColumn(name = "team_member_id")
     private TeamMember teamMember;
 
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "team_id")
     private Team team;

src/main/java/com/moing/backend/domain/board/domain/repository/BoardCustomRepositoryImpl.java

@@ -2,72 +2,69 @@
 
 import com.moing.backend.domain.board.application.dto.response.BoardBlocks;
 import com.moing.backend.domain.board.application.dto.response.GetAllBoardResponse;
-import com.moing.backend.domain.board.domain.entity.Board;
-import com.moing.backend.domain.teamMember.domain.entity.QTeamMember;
+import com.moing.backend.domain.board.application.dto.response.QBoardBlocks;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
 import javax.persistence.EntityManager;
 import java.util.List;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.moing.backend.domain.board.domain.entity.QBoard.board;
 import static com.moing.backend.domain.boardRead.domain.entity.QBoardRead.boardRead;
+import static com.moing.backend.domain.member.domain.entity.QMember.member;
+import static com.moing.backend.domain.teamMember.domain.entity.QTeamMember.teamMember;
 
 public class BoardCustomRepositoryImpl implements BoardCustomRepository {
 
     private final JPAQueryFactory queryFactory;
     public BoardCustomRepositoryImpl(EntityManager em) {
         this.queryFactory = new JPAQueryFactory(em);
     }
-
     @Override
     public GetAllBoardResponse findBoardAll(Long teamId, Long memberId) {
+
         // 전체 게시글 보기
-        List<Board> allBoards = queryFactory.selectFrom(board)
-                .distinct()
-                .leftJoin(board.teamMember, QTeamMember.teamMember).fetchJoin() // TeamMember를 함께 로드
+        List<BoardBlocks> allBoardBlocks = queryFactory
+                .select(new QBoardBlocks(
+                        board.boardId,
+                        board.teamMember.member.nickName,
+                        board.isLeader,
+                        board.teamMember.member.profileImage,
+                        board.title,
+                        board.content,
+                        board.commentNum,
+                        board.teamMember.isDeleted,
+                        board.isNotice
+                ))
+                .from(board)
+                .leftJoin(board.teamMember, teamMember)
+                .leftJoin(board.teamMember.member, member)
                 .where(board.team.teamId.eq(teamId))
                 .orderBy(board.createdDate.desc())
                 .fetch();
 
-        // 읽은 게시글 보기
-        List<Board> readBoards = queryFactory.selectFrom(board)
-                .distinct()
-                .leftJoin(board.teamMember, QTeamMember.teamMember).fetchJoin() // TeamMember를 함께 로드
-                .join(boardRead).on(boardRead.board.eq(board))
-                .where(board.team.teamId.eq(teamId))
+        // 읽은 게시글 목록 조회
+        List<Long> readBoardIds = queryFactory
+                .select(boardRead.board.boardId)
+                .from(boardRead)
                 .where(boardRead.member.memberId.eq(memberId))
-                .groupBy(board.boardId)
-                .orderBy(board.createdDate.desc())
+                .where(boardRead.board.team.teamId.eq(teamId))
                 .fetch();
 
-        // 공지와 일반 게시글로 나누기
-        List<Board> notices = allBoards.stream().filter(Board::isNotice).collect(Collectors.toList());
-        List<Board> regularPosts = allBoards.stream().filter(b -> !b.isNotice()).collect(Collectors.toList());
-
-        // Board -> BoardBlocks 변환
-        Function<Board, BoardBlocks> toBoardBlocks = b -> {
-            boolean isRead = readBoards.contains(b);
-            BoardBlocks boardBlocks = new BoardBlocks(
-                    b.getBoardId(),
-                    b.getWriterNickName(),
-                    b.isLeader(),
-                    b.getWriterProfileImage(),
-                    b.getTitle(),
-                    b.getContent(),
-                    b.getCommentNum(),
-                    b.getTeamMember().isDeleted()
-            );
-            if (isRead) {
-                boardBlocks.readBoard();
+        // 읽은 게시글 표시
+        allBoardBlocks.forEach(boardBlock -> {
+            if (readBoardIds.contains(boardBlock.getBoardId())) {
+                boardBlock.readBoard();
             }
+        });
 
-            return boardBlocks;
-        };
-
-        List<BoardBlocks> noticeBlocks = notices.stream().map(toBoardBlocks).collect(Collectors.toList());
-        List<BoardBlocks> regularBlocks = regularPosts.stream().map(toBoardBlocks).collect(Collectors.toList());
+        // 공지와 일반 게시글로 나누기
+        List<BoardBlocks> noticeBlocks = allBoardBlocks.stream()
+                .filter(BoardBlocks::isNotice)
+                .collect(Collectors.toList());
+        List<BoardBlocks> regularBlocks = allBoardBlocks.stream()
+                .filter(b -> !b.isNotice())
+                .collect(Collectors.toList());
 
         return new GetAllBoardResponse(noticeBlocks.size(), noticeBlocks, regularBlocks.size(), regularBlocks);
     }

src/main/java/com/moing/backend/domain/boardComment/application/mapper/BoardCommentMapper.java

@@ -3,19 +3,16 @@
 import com.moing.backend.domain.board.domain.entity.Board;
 import com.moing.backend.domain.boardComment.application.dto.request.CreateBoardCommentRequest;
 import com.moing.backend.domain.boardComment.domain.entity.BoardComment;
-import com.moing.backend.domain.member.domain.entity.Member;
 import com.moing.backend.domain.teamMember.domain.entity.TeamMember;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor
 public class BoardCommentMapper {
-    public BoardComment toBoardComment(Member member, TeamMember teamMember, Board board, CreateBoardCommentRequest createBoardCommentRequest, boolean isLeader){
+    public BoardComment toBoardComment(TeamMember teamMember, Board board, CreateBoardCommentRequest createBoardCommentRequest, boolean isLeader) {
         BoardComment boardComment= BoardComment.builder()
                 .content(createBoardCommentRequest.getContent())
-                .writerNickName(member.getNickName())
-                .writerProfileImage(member.getProfileImage())
                 .isLeader(isLeader)
                 .build();
         boardComment.updateBoard(board);

src/main/java/com/moing/backend/domain/boardComment/application/service/CreateBoardCommentUseCase.java

@@ -30,7 +30,7 @@ public CreateBoardCommentResponse createBoardComment(String socialId, Long teamI
         // 1. 게시글 댓글 생성
         BaseBoardServiceResponse data = baseBoardService.getCommonData(socialId, teamId, boardId);
         boolean isLeader = checkLeaderUseCase.isTeamLeader(data.getMember(), data.getTeam());
-        BoardComment boardComment = boardCommentSaveService.saveBoardComment(boardCommentMapper.toBoardComment(data.getMember(), data.getTeamMember(), data.getBoard(), createBoardCommentRequest, isLeader));
+        BoardComment boardComment = boardCommentSaveService.saveBoardComment(boardCommentMapper.toBoardComment(data.getTeamMember(), data.getBoard(), createBoardCommentRequest, isLeader));
         // 2. 게시글 댓글 개수 증가
         data.getBoard().incrComNum();
         return new CreateBoardCommentResponse(boardComment.getBoardCommentId());

src/main/java/com/moing/backend/domain/boardComment/domain/entity/BoardComment.java

@@ -3,7 +3,6 @@
 import com.moing.backend.domain.board.domain.entity.Board;
 import com.moing.backend.domain.teamMember.domain.entity.TeamMember;
 import com.moing.backend.global.entity.BaseTimeEntity;
-import com.moing.backend.global.utils.AesConverter;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -34,15 +33,8 @@ public class BoardComment extends BaseTimeEntity {
     @JoinColumn(name = "board_id")
     private Board board;
 
-    //반정규화 -> 작성자에 대한 정보
-    @Convert(converter = AesConverter.class)
-    @Column(nullable = false)
-    private String writerNickName; /*작성자 닉네임*/
-
     private boolean isLeader; /*작성자 소모임장유무*/
 
-    private String writerProfileImage; /*작성자 프로필 사진*/
-
     /**
      * 연관관계 매핑
      */

src/main/java/com/moing/backend/domain/boardComment/domain/repository/BoardCommentCustomRepositoryImpl.java

@@ -6,14 +6,14 @@
 import com.moing.backend.domain.teamMember.domain.entity.QTeamMember;
 import com.moing.backend.domain.teamMember.domain.entity.TeamMember;
 import com.querydsl.core.types.ExpressionUtils;
-import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
 import javax.persistence.EntityManager;
 import java.util.List;
 
 import static com.moing.backend.domain.boardComment.domain.entity.QBoardComment.boardComment;
+import static com.moing.backend.domain.member.domain.entity.QMember.member;
 
 public class BoardCommentCustomRepositoryImpl implements BoardCommentCustomRepository{
 
@@ -30,9 +30,9 @@ public GetBoardCommentResponse findBoardCommentAll(Long boardId, TeamMember team
                 .select(new QCommentBlocks(
                         boardComment.boardCommentId,
                         boardComment.content,
-                        boardComment.writerNickName,
+                        boardComment.teamMember.member.nickName,
                         boardComment.isLeader,
-                        boardComment.writerProfileImage,
+                        boardComment.teamMember.member.profileImage,
                         ExpressionUtils.as(JPAExpressions
                                 .selectOne()
                                 .from(QTeamMember.teamMember)
@@ -42,6 +42,8 @@ public GetBoardCommentResponse findBoardCommentAll(Long boardId, TeamMember team
                         boardComment.teamMember.isDeleted,
                         boardComment.createdDate))
                 .from(boardComment)
+                .leftJoin(boardComment.teamMember, QTeamMember.teamMember)
+                .leftJoin(boardComment.teamMember.member, member)
                 .where(boardComment.board.boardId.eq(boardId))
                 .orderBy(boardComment.createdDate.asc())
                 .fetch();

src/main/java/com/moing/backend/domain/mypage/domain/entity/Feedback.java

@@ -1,14 +1,15 @@
 package com.moing.backend.domain.mypage.domain.entity;
 
 import com.moing.backend.global.entity.BaseTimeEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
+import lombok.*;
 
 import javax.persistence.*;
 
 
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
 @Entity
 public class Feedback extends BaseTimeEntity {
 

src/test/java/com/moing/backend/domain/board/presentation/BoardControllerTest.java

@@ -199,6 +199,7 @@ public void get_board_all() throws Exception {
                 .content("공지 내용")
                 .commentNum(2)
                 .isRead(false)
+                .isNotice(true)
                 .build();
 
         BoardBlocks notNoticeBlock = BoardBlocks.builder()
@@ -211,6 +212,7 @@ public void get_board_all() throws Exception {
                 .content("게시글 내용")
                 .commentNum(2)
                 .isRead(false)
+                .isNotice(false)
                 .build();
 
         noticeBlocks.add(noticeBlock);
@@ -253,6 +255,7 @@ public void get_board_all() throws Exception {
                                         fieldWithPath("data.noticeBlocks[0].content").description("공지 내용"),
                                         fieldWithPath("data.noticeBlocks[0].commentNum").description("공지 댓글 개수"),
                                         fieldWithPath("data.noticeBlocks[0].isRead").description("공지 읽음 처리 여부"),
+                                        fieldWithPath("data.noticeBlocks[0].notice").description("true"),
                                         fieldWithPath("data.notNoticeNum").description("일반 게시글 개수"),
                                         fieldWithPath("data.notNoticeBlocks[0].boardId").description("일반 게시글 아이디"),
                                         fieldWithPath("data.notNoticeBlocks[0].writerNickName").description("작성자 닉네임"),
@@ -262,8 +265,9 @@ public void get_board_all() throws Exception {
                                         fieldWithPath("data.notNoticeBlocks[0].title").description("일반 게시글 제목"),
                                         fieldWithPath("data.notNoticeBlocks[0].content").description("일반 게시글 내용"),
                                         fieldWithPath("data.notNoticeBlocks[0].commentNum").description("일반 게시글 댓글 개수"),
-                                        fieldWithPath("data.notNoticeBlocks[0].isRead").description("일반 게시글 읽음 처리 여부")
-                                )
+                                        fieldWithPath("data.notNoticeBlocks[0].isRead").description("일반 게시글 읽음 처리 여부"),
+                                        fieldWithPath("data.notNoticeBlocks[0].notice").description("false")
+                                        )
 
                         )
                 );