Merge branch '個資同意'

wayne

2021-12-03 6576d44fb39c4875fa56eaa105956153bec3efd8

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

@@ -3,7 +3,9 @@
import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
import com.pollex.pam.repository.AppointmentCustomerViewRepository;
import com.pollex.pam.domain.Satisfaction;
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.security.SecurityUtils;
@@ -13,10 +15,13 @@
import com.pollex.pam.web.rest.errors.ConsultantNotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

@Service
@@ -24,35 +29,79 @@

    private static final Logger log = LoggerFactory.getLogger(ConsultantService.class);

    final ConsultantRepository consultantRepository;
    final CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository;
    final ConsultantMapper consultantMapper;
    final AppointmentService appointmentService;
    final AppointmentCustomerViewRepository appointmentCustomerViewRepository;
    final AppointmentCustomerViewMapper appointmentCustomerViewMapper;
    @Autowired
    ConsultantRepository consultantRepository;

    public ConsultantService(
        ConsultantRepository consultantRepository,
        CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository,
        ConsultantMapper consultantMapper,
        AppointmentService appointmentService,
        AppointmentCustomerViewRepository appointmentCustomerViewRepository,
        AppointmentCustomerViewMapper appointmentCustomerViewMapper
    ) {
        this.consultantRepository = consultantRepository;
        this.customerFavoriteConsultantRepository = customerFavoriteConsultantRepository;
        this.consultantMapper = consultantMapper;
        this.appointmentService = appointmentService;
        this.appointmentCustomerViewRepository = appointmentCustomerViewRepository;
        this.appointmentCustomerViewMapper = appointmentCustomerViewMapper;
    @Autowired
    CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository;

    @Autowired
    ConsultantMapper consultantMapper;

    @Autowired
    AppointmentService appointmentService;

    @Autowired
    LoginRecordService loginRecordService;

    @Autowired
    AppointmentCustomerViewMapper appointmentCustomerViewMapper;

    @Autowired
    SatisfactionService satisfactionService;

    public List<CustomerFavoriteConsultantDTO> getMyConsultantList() {
        Long customerId = SecurityUtils.getCustomerDBId();

        return customerFavoriteConsultantRepository.findAllByCustomerId(customerId)
            .stream()
            .map(customerFavoriteConsultantRelation -> {
                Consultant consultant = customerFavoriteConsultantRelation.getConsultant();
                CustomerFavoriteConsultantDTO dto = consultantMapper.toCustomerFavoriteConsultantDto(consultant);

                dto.setContactStatus(ContactStatusEnum.PICKED);
                dto.setLatestAppointmentId(null);
                dto.setLatestAppointmentDate(null);
                dto.setLatestAppointmentScore(null);
                dto.setCreateTime(customerFavoriteConsultantRelation.getLastModifiedDate());

                setAppointmentInfo(
                    dto,
                    appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
                );

                return dto;

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

    public List<ConsultantDTO> getMyConsultantList() {
        Long userId = SecurityUtils.getCustomerId();
        return customerFavoriteConsultantRepository.findAllByCustomerId(userId)
            .stream()
            .map(consultantMapper::toDto)
    private void setAppointmentInfo(CustomerFavoriteConsultantDTO dto, List<AppointmentCustomerView> appointmentList) {
        List<AppointmentCustomerView> appointments = appointmentList.stream()
            .sorted(Comparator.comparing(AppointmentCustomerView::getAppointmentDate).reversed())
            .collect(Collectors.toList());

        dto.setAppointments(appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointments));

        if (!appointments.isEmpty()) {
            AppointmentCustomerView latestAppointment = appointments.get(0);
            dto.setContactStatus(latestAppointment.getCommunicateStatus());
            dto.setLatestAppointmentId(latestAppointment.getId());
            dto.setLatestAppointmentDate(latestAppointment.getAppointmentDate());
            dto.setUpdateTime(latestAppointment.getLastModifiedDate());

            setLatestAppointmentScore(dto, latestAppointment);
        }
    }

    private void setLatestAppointmentScore(CustomerFavoriteConsultantDTO dto, AppointmentCustomerView latestAppointment) {
        Optional<Satisfaction> satisfactionOptional = satisfactionService.getByAppointmentId(latestAppointment.getId());
        if(satisfactionOptional.isPresent()) {
            Satisfaction satisfaction = satisfactionOptional.get();
            dto.setLatestAppointmentScore(satisfaction.getScore());
        }
        else {
            dto.setLatestAppointmentScore(null);
        }
    }

    public List<ConsultantDTO> getRecommendConsultantList() {
@@ -77,15 +126,20 @@
    }

    public ConsultantDetailDTO getConsultantDetail(String agentNo) {
        Consultant consultant = consultantRepository.findFirstByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
        return consultantMapper.toDetailDto(consultant);
        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;
    }

    @Transactional
    public void addConsultantToCustomList(AddConsultantParam param) {
        List<String> agentNoList = param.getAgentNoList();
        List<Consultant> consultants = consultantRepository.findAllByAgentNoIn(agentNoList);
        Long userId = SecurityUtils.getCustomerId();
        Long userId = SecurityUtils.getCustomerDBId();

        consultants.forEach(consultant -> {
            boolean isConsultantInList = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();
@@ -106,13 +160,12 @@

   public List<AppointmentCustomerViewDTO> getMyAppointment() {
      String agentNo = SecurityUtils.getAgentNo();
      List<AppointmentCustomerView> appointmentList = appointmentCustomerViewRepository.findByAgentNo(agentNo);
      return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointmentList);
      return appointmentService.getConsultantAppointments(agentNo);
   }

    public void removeConsultantFromCustomList(String agentNo) {
        Long customId = SecurityUtils.getCustomerId();
        Consultant consultant = consultantRepository.findFirstByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
        Long customId = SecurityUtils.getCustomerDBId();
        Consultant consultant = consultantRepository.findOneByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
        CustomerFavoriteConsultant target = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(customId, consultant).orElse(null);

        if(target != null) {
@@ -122,4 +175,9 @@
            log.info("this consultant is not in customer list! agentNo = {}, customId = {}", agentNo, customId);
        }
    }

    public void recordAllAppointmentsView() {
        String agentNo = SecurityUtils.getAgentNo();
        appointmentService.recordAllAppointmentsView(agentNo);
    }
}