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

wayne

2022-02-21 aa0f9381d424b98e86845c6da21e2fd8640fe056

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

@@ -6,6 +6,7 @@
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
import com.pollex.pam.domain.Satisfaction;
import com.pollex.pam.enums.ConsultantStatusEnum;
import com.pollex.pam.enums.ContactStatusEnum;
import com.pollex.pam.enums.LoginResult;
import com.pollex.pam.repository.ConsultantRepository;
@@ -30,15 +31,16 @@
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;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;

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

@Service
@@ -60,9 +62,6 @@
    AppointmentService appointmentService;

    @Autowired
    LoginRecordService loginRecordService;

    @Autowired
    AppointmentCustomerViewMapper appointmentCustomerViewMapper;

    @Autowired
@@ -73,21 +72,24 @@

    @Autowired
    ApplicationProperties applicationProperty;
    

    @Autowired
   SendMsgService sendMsgService;
    

    @Autowired
    SpringTemplateEngine springTemplateEngine;
    

    @Autowired
    ApplicationProperties applicationProperties;
    

    @Autowired
    ConsultantService consultantService;
    

    @Autowired
    SatisfactionRepository satisfactionRepository;

    @Autowired
    PersonalNotificationService personalNotificationService;

    public List<CustomerFavoriteConsultantDTO> getMyConsultantList() {
        Long customerId = SecurityUtils.getCustomerDBId();
@@ -105,7 +107,7 @@
                    dto,
                    appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
                );
                

                setFavoriteConsultantUpdatedTime(relation, dto);

                return dto;
@@ -137,8 +139,7 @@
        if (!appointments.isEmpty()) {
            AppointmentCustomerView latestAvailableAppointment = appointments.get(0);
            ContactStatusEnum latestStatus = latestAvailableAppointment.getCommunicateStatus();
            if( latestStatus != ContactStatusEnum.DONE
                  || latestStatus != ContactStatusEnum.CLOSED)
            if(latestStatus != ContactStatusEnum.DONE && latestStatus != ContactStatusEnum.CLOSED)
                customerFavoriteConsultantDTO.setContactStatus(latestStatus);
            else
                customerFavoriteConsultantDTO.setContactStatus(PICKED);
@@ -150,6 +151,7 @@
    public List<ConsultantDTO> getRecommendConsultantList() {
        return consultantRepository.findAllByRecommendIsTrue()
            .stream()
            .filter(consultant -> consultant.getStatus() == ConsultantStatusEnum.AVAILABLE)
            .map(consultantMapper::toDto)
            .collect(Collectors.toList());
    }
@@ -157,8 +159,60 @@
    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) {
@@ -170,12 +224,7 @@

    public ConsultantDetailDTO getConsultantDetail(String agentNo) {
        Consultant consultant = consultantRepository.findOneByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
        ConsultantDetailDTO consultantDetailDTO = consultantMapper.toDetailDto(consultant);

        loginRecordService.findLatestLoginRecord(agentNo, LoginResult.SUCCESS)
                .ifPresent(loginRecord -> consultantDetailDTO.setLatestLoginTime(loginRecord.getLoginDate()));

        return consultantDetailDTO;
        return consultantMapper.toDetailDto(consultant);
    }

    @Transactional
@@ -248,7 +297,9 @@
            .orElseThrow(ConsultantNotFoundException::new);
      consultantDTOMapper.copyToConsultant(editDTO, consultant);
      FileUtil.base64ToFile(editDTO.getPhotoBase64(), editDTO.getPhotoFileName(), applicationProperty.getFileFolderPath());
      return consultantRepository.save(consultant);
      consultantRepository.save(consultant);
      personalNotificationService.createEditConsultantToConsultant(consultant);
      return consultant;
   }

   public InputStream getAvatarImage(String agentNo) {
@@ -266,17 +317,19 @@

   public void sendSatisfactionToClient(Appointment appointment) {
      String subject = "滿意度填寫通知";
		

      if(StringUtils.hasText(appointment.getEmail())) {
         String content = genSendSatisfactionEmailContent(appointment);
         sendMsgService.sendMsgByEmail(appointment.getEmail(), subject, content, true);
			

      }if(StringUtils.hasText(appointment.getPhone())) {
         String content = genSendSatisfactionSMSContent(appointment);
         sendMsgService.sendMsgBySMS(appointment.getPhone(), content);
      }

      personalNotificationService.createSendSatisfactionToClientToCustomer(appointment);
   }
	

   private String genSendSatisfactionSMSContent(Appointment appointment) {
      String agentNo = appointment.getAgentNo();
      Consultant consultant = consultantService.findByAgentNo(agentNo);
@@ -298,19 +351,20 @@
   public String getSendSatisfactionToClientUrl(Long appointmentId) {
        return applicationProperties.getFrontEndDomain() + "/?appointmentId=" + appointmentId;
    }
	

   public void setConsultantAvgScore(Satisfaction satisfaction) {
      float avgScore = getAgentAvgScore(satisfaction.getAgentNo());
      Consultant consultant = consultantRepository.findOneByAgentNo(satisfaction.getAgentNo())
            .get();
      consultant.setAvgScore(avgScore);
      consultantRepository.save(consultant);
      Optional<Float> avgScore = getAgentAvgScore(satisfaction.getAgentNo());

        if(avgScore.isPresent()) {
            BigDecimal bigDecimal = BigDecimal.valueOf(avgScore.get());

            Consultant consultant = consultantRepository.findOneByAgentNo(satisfaction.getAgentNo()).get();
            consultant.setAvgScore(bigDecimal.setScale(1, BigDecimal.ROUND_HALF_UP).floatValue());
            consultantRepository.save(consultant);
        }
   }

   public float getAgentAvgScore(String agentNo) {
      Float avgScore = satisfactionRepository.getAgentScoreAvg(agentNo);
      if(avgScore==null)return 0;
      BigDecimal bigDecimal = new BigDecimal(avgScore);  
      return avgScore = bigDecimal.setScale(1,BigDecimal.ROUND_HALF_UP).floatValue();
   public Optional<Float> getAgentAvgScore(String agentNo) {
      return satisfactionRepository.getAgentScoreAvg(agentNo);
   }
}