From 952c5e248e52cc977a53eecfc7fa12be57cddd5c Mon Sep 17 00:00:00 2001 From: shinmj Date: Thu, 11 Nov 2021 14:02:45 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=20=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EB=AA=A9=EB=A1=9D=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EC=98=88=EC=99=B8=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/posts/PostsService.java | 33 ++++++++++++------- .../portal/src/components/Main/MainLG.tsx | 2 +- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/backend/board-service/src/main/java/org/egovframe/cloud/boardservice/service/posts/PostsService.java b/backend/board-service/src/main/java/org/egovframe/cloud/boardservice/service/posts/PostsService.java index 341dcb2..1d59551 100644 --- a/backend/board-service/src/main/java/org/egovframe/cloud/boardservice/service/posts/PostsService.java +++ b/backend/board-service/src/main/java/org/egovframe/cloud/boardservice/service/posts/PostsService.java @@ -1,9 +1,23 @@ package org.egovframe.cloud.boardservice.service.posts; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.egovframe.cloud.boardservice.api.board.dto.BoardResponseDto; -import org.egovframe.cloud.boardservice.api.posts.dto.*; -import org.egovframe.cloud.boardservice.domain.posts.*; +import org.egovframe.cloud.boardservice.api.posts.dto.PostsDeleteRequestDto; +import org.egovframe.cloud.boardservice.api.posts.dto.PostsListResponseDto; +import org.egovframe.cloud.boardservice.api.posts.dto.PostsResponseDto; +import org.egovframe.cloud.boardservice.api.posts.dto.PostsSaveRequestDto; +import org.egovframe.cloud.boardservice.api.posts.dto.PostsSimpleResponseDto; +import org.egovframe.cloud.boardservice.api.posts.dto.PostsSimpleSaveRequestDto; +import org.egovframe.cloud.boardservice.api.posts.dto.PostsUpdateRequestDto; +import org.egovframe.cloud.boardservice.domain.posts.Posts; +import org.egovframe.cloud.boardservice.domain.posts.PostsId; +import org.egovframe.cloud.boardservice.domain.posts.PostsRead; +import org.egovframe.cloud.boardservice.domain.posts.PostsReadRepository; +import org.egovframe.cloud.boardservice.domain.posts.PostsRepository; import org.egovframe.cloud.boardservice.service.board.BoardService; import org.egovframe.cloud.common.dto.AttachmentEntityMessage; import org.egovframe.cloud.common.dto.RequestDto; @@ -18,11 +32,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - /** * org.egovframe.cloud.postsservice.service.posts.PostsService *

@@ -97,10 +106,12 @@ public class PostsService extends AbstractService { Map data = new HashMap<>(); // 요청한 게시판 순서로 리턴하기 위해서 map 리턴 for (BoardResponseDto board : boards) { - List posts = postsGroup.get(board.getBoardNo()) - .stream().map(post -> post.setIsNew(board)) - .collect(Collectors.toList()); - board.setNewestPosts(posts); + List posts = postsGroup.get(board.getBoardNo()); + if (posts != null) { + board.setNewestPosts(posts.stream().map(post -> post.setIsNew(board)) + .collect(Collectors.toList())); + } + data.put(board.getBoardNo(), board); } diff --git a/frontend/portal/src/components/Main/MainLG.tsx b/frontend/portal/src/components/Main/MainLG.tsx index f7b83f8..9efedbb 100644 --- a/frontend/portal/src/components/Main/MainLG.tsx +++ b/frontend/portal/src/components/Main/MainLG.tsx @@ -141,7 +141,7 @@ const MainLG = (props: MainLGProps) => { return ( board && (

- {board.posts.map(post => ( + {board.posts?.map(post => (