Skip to content

[feat/#393] 검색 키워드 추가 #395

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
PicturePark1101 merged 2 commits into from
Jun 1, 2025
Merged

[feat/#393] 검색 키워드 추가 #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
497e3d9
feat : 검색 키워드 조건 동적 쿼리문 추가 #393
PicturePark1101 Jun 1, 2025
69cc8b6
refactor : 메소드명 변경 #393
PicturePark1101 Jun 1, 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
3 changes: 2 additions & 1 deletion src/main/java/umc/th/juinjang/api/limjang/controller/NoteControllerV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ public ApiResponse<NotePostResponse> createNote(@RequestBody @Valid NotePostRequ
@GetMapping("/notes")
public ApiResponse<UserNotesGetResponse> findUsersNotes(
@RequestParam("sort") LimjangSortOptions sortOptions,
@RequestParam(value = "keyword", required = false) String keyword,
@AuthenticationPrincipal Member member) {
return ApiResponse.onSuccess(noteQueryService.findUsersNotes(member, sortOptions));
return ApiResponse.onSuccess(noteQueryService.findUsersNotes(member, sortOptions, keyword));
}

@Operation(summary = "임장 수정 API V2")
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/umc/th/juinjang/api/limjang/service/NoteFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ public class NoteFinder {

private final LimjangRepository limjangRepository;

protected List<Limjang> findAllByMemberOrderByOptions(Member member, LimjangSortOptions sortOptions) {
return limjangRepository.findAllByMemberAndDeletedIsFalseOrderByParamV2(member, sortOptions);
protected List<Limjang> findAllByMemberOrderByOptions(Member member, LimjangSortOptions sortOptions,
String keyword) {
return limjangRepository.findAllByMemberAndDeletedIsFalseOrderByParamV2(member, sortOptions, keyword);
}

public Limjang getNoteByIdWhereDeletedIsFalse(long id) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/umc/th/juinjang/api/limjang/service/NoteQueryServiceV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ public class NoteQueryServiceV2 {
private final SharedNoteFinder sharedNoteFinder;

@Transactional(readOnly = true)
public UserNotesGetResponse findUsersNotes(Member member, LimjangSortOptions sortOptions) {
List<Limjang> notes = noteFinder.findAllByMemberOrderByOptions(member, sortOptions);
public UserNotesGetResponse findUsersNotes(Member member, LimjangSortOptions sortOptions, String keyword) {
List<Limjang> notes = noteFinder.findAllByMemberOrderByOptions(member, sortOptions, keyword);
return UserNotesGetResponse.of(notes, mapToNoteScrapStatus(notes));
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangQueryDslRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ public interface LimjangQueryDslRepository {

List<Limjang> findAllByMemberAndDeletedIsFalseOrderByParam(Member member, LimjangSortOptions sort);

List<Limjang> findAllByMemberAndDeletedIsFalseOrderByParamV2(Member member, LimjangSortOptions sort);
List<Limjang> findAllByMemberAndDeletedIsFalseOrderByParamV2(Member member, LimjangSortOptions sort,
String keyword);
}
15 changes: 14 additions & 1 deletion src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangQueryDslRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,31 @@ public List<Limjang> findAllByMemberAndDeletedIsFalseOrderByParam(Member member,
}

@Override
public List<Limjang> findAllByMemberAndDeletedIsFalseOrderByParamV2(Member member, LimjangSortOptions sort) {
public List<Limjang> findAllByMemberAndDeletedIsFalseOrderByParamV2(Member member, LimjangSortOptions sort,
String keyword) {
return queryFactory
.selectFrom(limjang)
.join(limjang.limjangPrice, limjangPrice).fetchJoin()
.join(limjang.addressEntity, address).fetchJoin()
.leftJoin(limjang.report, report).fetchJoin()
.where(limjang.memberId.eq(member))
.where(limjang.deleted.isFalse())
.where(keywordConditionForSearch(keyword))
.orderBy(getOrderByLimjangSortOptions(sort))
.fetch();
}

private BooleanExpression keywordConditionForSearch(String keyword) {
if (keyword == null || keyword.isBlank()) {
return null;
}
return keywordOf(
removeBlank(limjang.nickname).containsIgnoreCase(keyword),
removeBlank(address.roadAddress).containsIgnoreCase(keyword),
removeBlank(address.addressDetail).containsIgnoreCase(keyword)
);
}

private OrderSpecifier[] getOrderByLimjangSortOptions(LimjangSortOptions sort) {
List<OrderSpecifier> orders = new ArrayList<>();
switch (sort) {
Expand Down