From 0d8cc04b812cfa0f15bf8ba12b5fdcbe411f90cd Mon Sep 17 00:00:00 2001 From: HelenHuang <LinHuang@pollex.com.tw> Date: 星期四, 10 二月 2022 16:07:02 +0800 Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3 --- pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 54 insertions(+), 2 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java index 0179b54..6044a45 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java +++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java @@ -30,7 +30,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; import java.time.Instant; @@ -39,6 +38,7 @@ import java.util.Objects; import java.util.stream.Collectors; +import static com.pollex.pam.consts.SeniorityQueryConst.*; import static com.pollex.pam.enums.ContactStatusEnum.*; @Service @@ -159,10 +159,62 @@ public List<ConsultantDTO> strictQueryConsultant(StrictQueryConsultantParam param) { return consultantRepository.findAll(ConsultantQuerySpec.getStrictQuerySpec(param)) .stream() - .map(consultantMapper::toDto) + .map(consultant -> { + int suitabilityScore = getStrictQuerySuitabilityScore(param, consultant); + + ConsultantDTO dto = consultantMapper.toDto(consultant); + dto.setSuitability(suitabilityScore); + + return dto; + }) .collect(Collectors.toList()); } + private int getStrictQuerySuitabilityScore(StrictQueryConsultantParam param, Consultant consultant) { + Float queryAvgScore = param.getAvgScore(); + String querySeniority = param.getSeniority(); + List<String> queryRequirements = param.getRequirements(); + + int score = 0; + if(isConsultantGreaterThanScore(queryAvgScore, consultant.getAvgScore())) { + score += 30; + } + + if(isConsultantInSeniority(querySeniority, consultant.getSeniorityYear())) { + score += 20; + } + + if(isAllRequirementsIncludeConsultant(queryRequirements, consultant.getExpertise())) { + score += 50; + } + + return score; + } + + private boolean isAllRequirementsIncludeConsultant(List<String> queryRequirements, String consultantExpertise) { + return queryRequirements + .stream() + .allMatch(queryRequirement -> consultantExpertise.matches(".*"+queryRequirement+".*")); + } + + private boolean isConsultantInSeniority(String querySeniority, Long consultantSeniorityYear) { + switch (querySeniority == null ? "" : querySeniority) { + case YOUNG: + return consultantSeniorityYear < 5; + case SENIOR: + return consultantSeniorityYear > 5; + case UNLIMITED: + case "": + return true; + default: + return false; + } + } + + private boolean isConsultantGreaterThanScore(Float queryAvgScore, Float consultantAvgScore) { + return Objects.isNull(queryAvgScore) || queryAvgScore < consultantAvgScore; + } + public List<ConsultantDTO> fastQueryConsultant(FastQueryConsultantParam param) { return consultantRepository.findAll(ConsultantQuerySpec.getFastQuerySpec(param)) .stream() -- Gitblit v1.8.0