diff --git a/src/main/java/com/dreamypatisiel/devdevdev/domain/entity/TechArticleRecommend.java b/src/main/java/com/dreamypatisiel/devdevdev/domain/entity/TechArticleRecommend.java index 31152a46..d9302eb2 100644 --- a/src/main/java/com/dreamypatisiel/devdevdev/domain/entity/TechArticleRecommend.java +++ b/src/main/java/com/dreamypatisiel/devdevdev/domain/entity/TechArticleRecommend.java @@ -70,4 +70,12 @@ public void registerRecommend() { public boolean isRecommended() { return this.status; } + + public boolean isAnonymousMemberNotNull() { + return this.anonymousMember != null; + } + public boolean isMemberNotNull() { + return this.member != null; + } + } diff --git a/src/main/java/com/dreamypatisiel/devdevdev/web/dto/util/TechArticleResponseUtils.java b/src/main/java/com/dreamypatisiel/devdevdev/web/dto/util/TechArticleResponseUtils.java index fdca4716..cd54ef51 100644 --- a/src/main/java/com/dreamypatisiel/devdevdev/web/dto/util/TechArticleResponseUtils.java +++ b/src/main/java/com/dreamypatisiel/devdevdev/web/dto/util/TechArticleResponseUtils.java @@ -18,7 +18,9 @@ public static boolean isBookmarkedByMember(TechArticle techArticle, Member membe public static boolean isRecommendedByMember(TechArticle techArticle, Member member) { Optional recommends = techArticle.getRecommends().stream() - .filter(recommend -> recommend.getMember().isEqualsId(member.getId())) + .filter(recommend -> + recommend.isMemberNotNull() + && recommend.getMember().isEqualsId(member.getId())) .findAny(); return recommends.map(TechArticleRecommend::isRecommended).orElse(false); @@ -30,7 +32,9 @@ public static boolean isRecommendedByAnonymousMember(TechArticle techArticle, An } Optional recommends = techArticle.getRecommends().stream() - .filter(recommend -> recommend.getAnonymousMember().isEqualAnonymousMemberId(anonymousMember.getId())) + .filter(recommend -> + recommend.isAnonymousMemberNotNull() + && recommend.getAnonymousMember().isEqualAnonymousMemberId(anonymousMember.getId())) .findAny(); return recommends.map(TechArticleRecommend::isRecommended).orElse(false);