[update] [todo 136030] 調整滿意度篩選的機制，改由指定分數扣0.5分作為查詢

wayne

2022-03-01 4df02e3b839a30ff2c68243820b48734f585baa1

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

@@ -5,10 +5,12 @@
import com.pollex.pam.domain.AppointmentCustomerView;
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;
import com.pollex.pam.repository.CustomerFavoriteConsultantRepository;
import com.pollex.pam.repository.SatisfactionRepository;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.dto.*;
import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper;
@@ -28,14 +30,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
@@ -57,9 +61,6 @@
    AppointmentService appointmentService;

    @Autowired
    LoginRecordService loginRecordService;

    @Autowired
    AppointmentCustomerViewMapper appointmentCustomerViewMapper;

    @Autowired
@@ -70,18 +71,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();
@@ -91,55 +98,59 @@
            .map(relation -> {
                Consultant consultant = relation.getConsultant();
                CustomerFavoriteConsultantDTO dto = consultantMapper.toCustomerFavoriteConsultantDto(consultant);

                dto.setContactStatus(ContactStatusEnum.PICKED);
                dto.setCreateTime(relation.getCreatedDate());
                dto.setUpdateTime(relation.getCreatedDate());
                dto.setCustomerViewTime(relation.getViewTime());

                setAvailableAppointmentInfo(
                setInfoByAvailableAppointment(
                    dto,
                    appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
                );

                appointmentService.findLatestAppointmentByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
                    .ifPresent(latestAppointment -> {
                        dto.setUpdateTime(latestAppointment.getLastModifiedDate());
                    });

                if(dto.getUpdateTime().isBefore(relation.getCreatedDate())) {
                    dto.setUpdateTime(relation.getCreatedDate());
                }
                setFavoriteConsultantUpdatedTime(relation, dto);

                return dto;

            }).collect(Collectors.toList());
    }

    private void setAvailableAppointmentInfo(CustomerFavoriteConsultantDTO customerFavoriteConsultantDTO, List<AppointmentCustomerView> appointmentList) {
   public void setFavoriteConsultantUpdatedTime(CustomerFavoriteConsultant relation,
         CustomerFavoriteConsultantDTO dto) {
      Consultant consultant = relation.getConsultant();
      appointmentService.findLatestAppointmentByAgentNoAndCustomerId(consultant.getAgentNo(), relation.getCustomerId())
          .ifPresent(latestAppointment -> {
              dto.setUpdateTime(latestAppointment.getLastModifiedDate());
          });

      if(dto.getUpdateTime().isBefore(relation.getCreatedDate())) {
          dto.setUpdateTime(relation.getCreatedDate());
      }
   }

    private void setInfoByAvailableAppointment(CustomerFavoriteConsultantDTO customerFavoriteConsultantDTO, List<AppointmentCustomerView> appointmentList) {
        List<AppointmentCustomerView> appointments = appointmentList.stream()
            .sorted(Comparator.comparing(AppointmentCustomerView::getAppointmentDate).reversed())
            .collect(Collectors.toList());

        List<AppointmentCustomerViewDTO> appointmentCustomerViewDTOS = appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointments);
        appointmentCustomerViewDTOS.forEach(appointmentCustomerViewDTO -> {
            appointmentService.setSatisfactionScore(appointmentCustomerViewDTO, appointmentCustomerViewDTO.getId());
        });
        customerFavoriteConsultantDTO.setAppointments(appointmentCustomerViewDTOS);

        if (!appointments.isEmpty()) {
            AppointmentCustomerView latestAvailableAppointment = appointments.get(0);

            if(latestAvailableAppointment.getCommunicateStatus() == RESERVED)
                customerFavoriteConsultantDTO.setContactStatus(RESERVED);
            ContactStatusEnum latestStatus = latestAvailableAppointment.getCommunicateStatus();
            if(latestStatus != ContactStatusEnum.DONE && latestStatus != ContactStatusEnum.CLOSED)
                customerFavoriteConsultantDTO.setContactStatus(latestStatus);
            else
                customerFavoriteConsultantDTO.setContactStatus(PICKED);
        }else {
           customerFavoriteConsultantDTO.setContactStatus(PICKED);
        }
    }

    public List<ConsultantDTO> getRecommendConsultantList() {
        return consultantRepository.findAllByRecommendIsTrue()
            .stream()
            .filter(consultant -> consultant.getStatus() == ConsultantStatusEnum.AVAILABLE)
            .map(consultantMapper::toDto)
            .collect(Collectors.toList());
    }
@@ -147,8 +158,61 @@
    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) {
        final float QUERY_AVG_SCORE_OFFSET = 0.5f;
        Float queryAvgScore = param.getAvgScore() - QUERY_AVG_SCORE_OFFSET;
        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) {
@@ -160,25 +224,22 @@

    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
    public void addConsultantToCustomList(AddConsultantParam param) {
        List<String> agentNoList = param.getAgentNoList();
        List<Consultant> consultants = consultantRepository.findAllByAgentNoIn(agentNoList);
        Long userId = SecurityUtils.getCustomerDBId();

        consultants.forEach(consultant -> {
        param.getConsultantList().forEach(addConsultantData -> {
            Consultant consultant = consultantRepository.findOneByAgentNo(addConsultantData.getAgentNo()).orElseThrow(ConsultantNotFoundException::new);
            boolean isConsultantInList = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();

            if(!isConsultantInList) {
                CustomerFavoriteConsultant customerFavoriteConsultant = new CustomerFavoriteConsultant();
                Optional<Instant> createdTime = Optional.ofNullable(addConsultantData.getCreatedTime());

                customerFavoriteConsultant.setCreatedDate(createdTime.orElse(Instant.now()));
                customerFavoriteConsultant.setConsultant(consultant);
                customerFavoriteConsultant.setCustomerId(userId);

@@ -188,7 +249,6 @@
                log.info("The consultant is in customer favorite list! customId = {}, consultant AgentNo = {}", userId, consultant.getAgentNo());
            }
        });

    }

   public List<AppointmentCustomerViewDTO> getMyAppointment() {
@@ -238,7 +298,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) {
@@ -256,17 +318,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);
@@ -288,4 +352,20 @@
   public String getSendSatisfactionToClientUrl(Long appointmentId) {
        return applicationProperties.getFrontEndDomain() + "/?appointmentId=" + appointmentId;
    }

   public void setConsultantAvgScore(Satisfaction satisfaction) {
      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 Optional<Float> getAgentAvgScore(String agentNo) {
      return satisfactionRepository.getAgentScoreAvg(agentNo);
   }
}