Merge remote-tracking branch 'origin/master'

wayne

2021-11-29 83fdf8582cd37b0603dba3f4d0a869453722e292

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

@@ -2,12 +2,13 @@

import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomFavoriteConsultant;
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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.*;
@@ -18,11 +19,8 @@

    private final static Character SPLIT_MASK = ',';

    private final AppointmentService appointmentService;

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

    public ConsultantDTO toDto(Consultant source) {
        ConsultantDTO consultantDTO = new ConsultantDTO();
@@ -32,6 +30,7 @@
        consultantDTO.setSeniority(source.getSeniority());
        consultantDTO.setExpertise(splitStringWithChar(source.getExpertise()));
        consultantDTO.setImg(source.getPhotoPath());
        consultantDTO.setRole(source.getRole());

        consultantDTO.setContactStatus(null);
        consultantDTO.setUpdateTime(null);
@@ -40,11 +39,11 @@
        return consultantDTO;
    }

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

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

@@ -57,7 +56,7 @@
        else {
            dto.setContactStatus(ContactStatusEnum.PICKED);
            dto.setLatestAppointmentId(null);
            dto.setUpdateTime(customFavoriteConsultant.getLastModifiedDate());
            dto.setUpdateTime(customerFavoriteConsultant.getLastModifiedDate());
        }

        return dto;