Skip to content
Open
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 @@ -6,11 +6,13 @@
import org.springframework.web.bind.annotation.RequestParam;

import java.time.LocalDate;
import java.util.List;

public record PostSearchRequest(@RequestParam(value = "postStatus", required = false) PostStatus postStatus,
@RequestParam(value = "departureLoc", required = false) String departureLoc,
@RequestParam(value = "departureLoc", required = false)
List<String> departureLoc,
@RequestParam(value = "arrivalLoc", required = false)
String arrivalLoc,
List<String> arrivalLoc,
@RequestParam(value = "startDate", required = false, defaultValue = "")
@DateTimeFormat(pattern = "yyyy-MM-dd")
LocalDate startDate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.pawwithu.connectdog.domain.post.entity.Post;
import com.pawwithu.connectdog.domain.post.entity.PostStatus;
import com.pawwithu.connectdog.domain.post.repository.CustomPostRepository;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Order;
import com.querydsl.core.types.OrderSpecifier;
import com.querydsl.core.types.Projections;
Expand Down Expand Up @@ -64,7 +65,7 @@ public List<PostSearchResponse> searchPosts(PostSearchRequest request, Pageable
.from(post)
.join(post.dog, dog)
.join(post.mainImage, postImage)
.where(allFilterSearch(request, pageable))
.where(allFilterSearch(request))
.orderBy(createOrderSpecifierCE(request.orderCondition()))
.offset(pageable.getOffset()) // 페이지 번호
.limit(pageable.getPageSize()) // 페이지 사이즈
Expand Down Expand Up @@ -182,14 +183,19 @@ public PostIntermediaryGetOneResponse getIntermediaryOnePost(Long postId) {
}

// 모든 필터 검색
private BooleanExpression allFilterSearch(PostSearchRequest request, Pageable pageable) {
return postStatusEq(request.postStatus())
.and(departureLocContains(request.departureLoc()))
.and(arrivalLocContains(request.arrivalLoc()))
.and(dateSearch(request.startDate(), request.endDate()))
.and(dogSizeEq(request.dogSize()))
.and(isKennelEq(request.isKennel()))
.and(intermediaryNameContains(request.intermediaryName()));
private BooleanBuilder allFilterSearch(PostSearchRequest request) {

BooleanBuilder builder = new BooleanBuilder();

builder.and(postStatusEq(request.postStatus()));
builder.and(departureLocContains(request.departureLoc()));
builder.and(arrivalLocContains(request.arrivalLoc()));
builder.and(dateSearch(request.startDate(), request.endDate()));
builder.and(dogSizeEq(request.dogSize()));
builder.and(isKennelEq(request.isKennel()));
builder.and(intermediaryNameContains(request.intermediaryName()));

return builder;
}

// 공고 상태 필터
Expand All @@ -198,13 +204,21 @@ private BooleanExpression postStatusEq(PostStatus postStatus) {
}

// 출발 지역 필터
private BooleanExpression departureLocContains(String departureLoc) {
return StringUtils.hasText(departureLoc) ? post.departureLoc.contains(departureLoc) : null;
private BooleanExpression departureLocContains(List<String> departureLocs) {
if (departureLocs == null || departureLocs.isEmpty()) { return null; }
return departureLocs.stream()
.map(post.departureLoc::contains)
.reduce(BooleanExpression::or)
.orElse(null);
}

// 도착 지역 필터
private BooleanExpression arrivalLocContains(String arrivalLoc) {
return StringUtils.hasText(arrivalLoc) ? post.arrivalLoc.contains(arrivalLoc) : null;
private BooleanExpression arrivalLocContains(List<String> arrivalLocs) {
if (arrivalLocs == null || arrivalLocs.isEmpty()) { return null; }
return arrivalLocs.stream()
.map(post.arrivalLoc::contains)
.reduce(BooleanExpression::or)
.orElse(null);
}

// 일정 필터
Expand Down
Loading