Skip to content

Commit

Permalink
fix: 검색 조건에 게시판 제목, 내용, 닉네임 추가 및 or 조건으로 변경 (#210)
Browse files Browse the repository at this point in the history
  • Loading branch information
sypark9646 authored Dec 27, 2020
1 parent 3746eff commit 85ade0e
Showing 1 changed file with 16 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,27 @@ private BooleanExpression isFilteredCity(long cityId) {
}

private BooleanExpression isSearchedKeywords(List<String> keywords) {
return Expressions.allOf(keywords.stream().map(this::isSearchedKeyword).toArray(BooleanExpression[]::new));
return Expressions.anyOf(keywords.stream().map(keyword -> {
BooleanExpression isContent = isSearchedKeywordInContent(keyword);
BooleanExpression isTitle = isSearchedKeywordInTitle(keyword);
BooleanExpression isNickname = isSearchedKeywordInUserNickname(keyword);

return Expressions.anyOf(isContent, isTitle, isNickname);
}).toArray(BooleanExpression[]::new));
}

private BooleanExpression isSearchedKeyword(String keyword) {
private BooleanExpression isSearchedKeywordInContent(String keyword) {
return board.content.containsIgnoreCase(keyword);
}

private BooleanExpression isSearchedKeywordInTitle(String keyword) {
return board.title.containsIgnoreCase(keyword);
}

private BooleanExpression isSearchedKeywordInUserNickname(String keyword) {
return board.user.nickname.containsIgnoreCase(keyword);
}

private BooleanExpression isDeletedBoard() {
return board.status.ne(BoardStatus.CANCELED);
}
Expand Down

0 comments on commit 85ade0e

Please sign in to comment.