Skip to content

[FIX] 일반 검색 시 특수문자 무시하도록 수정 #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rinarina0429 merged 3 commits into from
Jan 16, 2025
Merged

[FIX] 일반 검색 시 특수문자 무시하도록 수정 #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f97a28
[FIX] 일반 검색 시 특수문자 무시하도록 수정
rinarina0429 Dec 31, 2024
d8ce529
Merge branch 'dev' of https://github.com/Team-WSS/WSS-Server into fix…
rinarina0429 Jan 16, 2025
f40daac
[FIX] 특수문자로만 검색 시에도 빈 리스트 반환
rinarina0429 Jan 16, 2025
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
11 changes: 5 additions & 6 deletions src/main/java/org/websoso/WSSServer/repository/NovelCustomRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@ public class NovelCustomRepositoryImpl implements NovelCustomRepository {
private final JPAQueryFactory jpaQueryFactory;

@Override
public Page<Novel> findSearchedNovels(Pageable pageable, String query) {
String searchQuery = query.replaceAll("\\s+", "");
public Page<Novel> findSearchedNovels(Pageable pageable, String searchQuery) {

BooleanExpression titleContainsQuery = getSpaceRemovedString(novel.title).containsIgnoreCase(searchQuery);
BooleanExpression authorContainsQuery = getSpaceRemovedString(novel.author).containsIgnoreCase(searchQuery);
BooleanExpression titleContainsQuery = getCleanedString(novel.title).containsIgnoreCase(searchQuery);
BooleanExpression authorContainsQuery = getCleanedString(novel.author).containsIgnoreCase(searchQuery);

List<Novel> novelsByTitle = jpaQueryFactory
.selectFrom(novel)
Expand Down Expand Up @@ -67,9 +66,9 @@ public Page<Novel> findSearchedNovels(Pageable pageable, String query) {
return new PageImpl<>(result.subList(start, end), pageable, total);
}

private StringTemplate getSpaceRemovedString(StringPath stringPath) {
private StringTemplate getCleanedString(StringPath stringPath) {
return Expressions.stringTemplate(
"REPLACE(REPLACE({0}, ' ', ''), CHAR(9), '')",
"CAST(REGEXP_REPLACE(REPLACE(REPLACE({0}, ' ', ''), CHAR(9), ''), '[^a-zA-Z0-9가-힣]', '') AS STRING)",
stringPath
);
}
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/websoso/WSSServer/service/NovelService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,13 @@ public FilteredNovelsGetResponse getFilteredNovels(List<String> genreNames, Bool
@Transactional(readOnly = true)
public SearchedNovelsGetResponse searchNovels(String query, int page, int size) {
PageRequest pageRequest = PageRequest.of(page, size);
String searchQuery = query.replaceAll("\\s+", "").replaceAll("[^a-zA-Z0-9가-힣]", "");
Comment thread
rinarina0429 marked this conversation as resolved.

if (query.isBlank()) {
if (searchQuery.isBlank()) {
return SearchedNovelsGetResponse.of(0L, false, Collections.emptyList());
}

Page<Novel> novels = novelRepository.findSearchedNovels(pageRequest, query);
Page<Novel> novels = novelRepository.findSearchedNovels(pageRequest, searchQuery);

List<NovelGetResponsePreview> novelGetResponsePreviews = novels.stream()
.map(this::convertToDTO)
Expand Down