Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ public static boolean isBookmarkedByMember(TechArticle techArticle, Member membe

public static boolean isRecommendedByMember(TechArticle techArticle, Member member) {
Optional<TechArticleRecommend> 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);
Expand All @@ -30,7 +32,9 @@ public static boolean isRecommendedByAnonymousMember(TechArticle techArticle, An
}

Optional<TechArticleRecommend> 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);
Expand Down
Loading