[update] 若顧問狀態非啟用時，則搜尋及推薦會找不到該顧問

wayne

2022-02-21 aa0f9381d424b98e86845c6da21e2fd8640fe056

 pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java

@@ -1,6 +1,7 @@
package com.pollex.pam.service;

import com.pollex.pam.domain.Consultant;
import com.pollex.pam.enums.ConsultantStatusEnum;
import com.pollex.pam.service.dto.FastQueryConsultantParam;
import com.pollex.pam.service.dto.StrictQueryConsultantParam;
import org.apache.commons.lang3.StringUtils;
@@ -9,7 +10,7 @@
import javax.persistence.criteria.*;
import java.util.*;

import static com.pollex.pam.enums.SeniorityQueryEnum.*;
import static com.pollex.pam.consts.SeniorityQueryConst.*;

public class ConsultantQuerySpec {
    private ConsultantQuerySpec() {
@@ -24,6 +25,8 @@
            public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
                Set<Predicate> set = new HashSet<>();

                set.add(criteriaBuilder.equal(root.get("status"), ConsultantStatusEnum.AVAILABLE));

                param.getCommunicationStyles().forEach((communicationStyle) -> {
                    set.add(criteriaBuilder.like(root.get("communicationStyle"), "%" + communicationStyle + "%"));
                });
@@ -34,6 +37,15 @@

                if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
                    set.add(criteriaBuilder.greaterThanOrEqualTo(root.get("avgScore"), param.getAvgScore().intValue()));
                }

                if(StringUtils.isNotEmpty(param.getSeniority()) && !StringUtils.equals(UNLIMITED, param.getSeniority())) {
                    if(YOUNG.equals(param.getSeniority())) {
                        set.add(criteriaBuilder.lessThanOrEqualTo(root.get("seniorityYear"), 5));
                    }
                    else if(SENIOR.equals(param.getSeniority())) {
                        set.add(criteriaBuilder.greaterThan(root.get("seniorityYear"), 5));
                    }
                }

                Predicate[] predicates = new Predicate[set.size()];
@@ -52,42 +64,15 @@
            public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
                Set<Predicate> set = new HashSet<>();

                set.add(criteriaBuilder.equal(root.get("status"), ConsultantStatusEnum.AVAILABLE));

                if(Objects.nonNull(param.getGender())) {
                    set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
                }

                if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
                    set.add(criteriaBuilder.greaterThanOrEqualTo(root.get("avgScore"), param.getAvgScore().intValue()));
                }

                if(Objects.nonNull(param.getSeniority()) && param.getSeniority() != UNLIMITED) {
                    if(param.getSeniority() == YOUNG) {
                        set.add(criteriaBuilder.lessThanOrEqualTo(root.get("seniorityYear"), 5));
                    }
                    else if(param.getSeniority() == SENIOR) {
                        set.add(criteriaBuilder.greaterThan(root.get("seniorityYear"), 5));
                    }
                }

                if(StringUtils.isNotEmpty(param.getArea())) {
                    Predicate predicate1 = criteriaBuilder.like(root.get("serveArea"), "%" + param.getArea() + "%");
                    Predicate predicate2 = criteriaBuilder.like(root.get("serveArea"), "%全台%");

                    Predicate finalPredicate = criteriaBuilder.or(predicate1, predicate2);
                    set.add(finalPredicate);
                    set.add(criteriaBuilder.like(root.get("serveArea"), "%" + param.getArea() + "%"));
                }

                List<String> allRequirements = Objects.nonNull(param.getRequirements()) ? param.getRequirements() : new ArrayList<>();
                if(StringUtils.isNotEmpty(param.getOtherPopularTags())) {
                    allRequirements.add(param.getOtherRequirement());
                }
                allRequirements.forEach(requirement -> set.add(criteriaBuilder.like(root.get("expertise"), "%" + requirement + "%")));

                List<String> allPopularTags = Objects.nonNull(param.getPopularTags()) ? param.getPopularTags() : new ArrayList<>();
                if(StringUtils.isNotEmpty(param.getOtherPopularTags())) {
                    allPopularTags.add(param.getOtherPopularTags());
                }
                allPopularTags.forEach(popularTag -> set.add(criteriaBuilder.like(root.get("concept"), "%" + popularTag + "%")));

                Predicate[] predicates = new Predicate[set.size()];
                predicates = set.toArray(predicates);