[update] 加入role資料與修正快速篩選的溝通風格對應查詢

wayne

2021-11-16 15352a866982e87be1a5094e86d479ab9f62ddcc

 pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java

@@ -1,15 +1,16 @@
package com.pollex.pam.service.mapper;

import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
import com.pollex.pam.enums.ContactStatusEnum;
import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.dto.ConsultantDTO;
import com.pollex.pam.service.dto.ConsultantDetailDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;

import java.time.Instant;
import java.util.Arrays;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

@Service
@@ -17,26 +18,50 @@

    private final static Character SPLIT_MASK = ',';

    public List<ConsultantDTO> toDto(List<Consultant> source) {
        return source.stream().map(this::toDto).collect(Collectors.toList());
    private final AppointmentService appointmentService;

    public ConsultantMapper(AppointmentService appointmentService) {
        this.appointmentService = appointmentService;
    }

    // todo convert
    public ConsultantDTO toDto(Consultant source) {
        ConsultantDTO consultantDTO = new ConsultantDTO();
        consultantDTO.setAgentNo(source.getAgentNo());
        consultantDTO.setName(source.getName());
        consultantDTO.setAvgScore(source.getAvgScore());
        consultantDTO.setSeniority(source.getSeniority());

        // todo
        consultantDTO.setImg("");
        consultantDTO.setExpertise(splitStringWithChar(source.getExpertise()));
        consultantDTO.setNewConsultant(false);
        consultantDTO.setContactStatus(ContactStatusEnum.CONTACTED);
        consultantDTO.setUpdateTime(Instant.now());
        consultantDTO.setImg(source.getPhotoPath());
        consultantDTO.setRole(source.getRole());

        consultantDTO.setContactStatus(null);
        consultantDTO.setUpdateTime(null);
        consultantDTO.setLatestAppointmentId(null);

        return consultantDTO;
    }

    public ConsultantDTO toDto(CustomerFavoriteConsultant customerFavoriteConsultant) {
        Consultant consultant = customerFavoriteConsultant.getConsultant();
        ConsultantDTO dto = toDto(consultant);

        final Optional<Appointment> latestAppointmentOptional = appointmentService.findByAgentNoAndCustomerId(consultant.getAgentNo(), customerFavoriteConsultant.getCustomerId())
            .stream()
            .max(Comparator.comparing(Appointment::getAppointmentDate));

        if(latestAppointmentOptional.isPresent()) {
            Appointment latestAppointment = latestAppointmentOptional.get();
            dto.setContactStatus(latestAppointment.getCommunicateStatus());
            dto.setLatestAppointmentId(latestAppointment.getId());
            dto.setUpdateTime(latestAppointment.getAppointmentDate());
        }
        else {
            dto.setContactStatus(ContactStatusEnum.PICKED);
            dto.setLatestAppointmentId(null);
            dto.setUpdateTime(customerFavoriteConsultant.getLastModifiedDate());
        }

        return dto;
    }

    public ConsultantDetailDTO toDetailDto(Consultant source) {
@@ -53,10 +78,11 @@
        consultantDetailDTO.setSeniority(source.getSeniority());
        consultantDetailDTO.setConcept(source.getConcept());
        consultantDetailDTO.setAwards(source.getAward());
        consultantDetailDTO.setImage(source.getPhotoPath());

        consultantDetailDTO.setImage("");
        consultantDetailDTO.setSuitability(0);
        consultantDetailDTO.setEvaluation(0);
        // todo 決定匹配程度
        consultantDetailDTO.setSuitability(50);
        consultantDetailDTO.setEvaluation(50);
        consultantDetailDTO.setExpertises(splitStringWithChar(source.getExpertise()));
        consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience()));