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 @@ -15,6 +15,7 @@ public class FilterReqDto {
private Integer costTo;
private Integer generationFrom;
private Integer generationTo;
private String keyword;
@JsonProperty("types")
private List<String> types;
private List<String> options;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,11 @@ public PageResponseDto<ProductResDto> getProducts(FilterReqDto filter, Pageable
predicates.add(cb.notEqual(productRoot.get("status"), ProductStatus.SOLD));
predicates.add(cb.isFalse(productRoot.get("isDeleted")));

// 제목 검색
if (filter.getKeyword() != null && !filter.getKeyword().isBlank()) {
predicates.add(cb.like(cb.lower(productRoot.get("title")), "%" + filter.getKeyword().toLowerCase() + "%"));
}

// 범위 필터
predicates.add(cb.between(productRoot.get("cost"), filter.getCostFrom(), filter.getCostTo()));
predicates.add(cb.between(productRoot.get("generation"), filter.getGenerationFrom(), filter.getGenerationTo()));
Expand Down Expand Up @@ -350,6 +355,11 @@ public PageResponseDto<ProductResDto> getProducts(FilterReqDto filter, Pageable
countPredicates.add(cb.between(countRoot.get("mileage"), filter.getMileageFrom(), filter.getMileageTo()));
countPredicates.add(cb.isFalse(countRoot.get("isDeleted")));

// 제목 검색
if (filter.getKeyword() != null && !filter.getKeyword().isBlank()) {
predicates.add(cb.like(cb.lower(productRoot.get("title")), "%" + filter.getKeyword().trim().toLowerCase() + "%"));
}

if (filter.getOptions() != null && !filter.getOptions().isEmpty()) {
Subquery<Long> countOptionSub = countQuery.subquery(Long.class);
Root<ProductOption> optionRoot = countOptionSub.from(ProductOption.class);
Expand Down