[UPDATE] 調整編輯顧問API,改為使用agentNo查出欲修改的資料

Jack

2021-12-22 6c645d811f0c81eca814d56fa651e9088ce6fc13

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

@@ -1,5 +1,6 @@
package com.pollex.pam.service;

import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
@@ -11,7 +12,9 @@
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.dto.*;
import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper;
import com.pollex.pam.service.mapper.ConsultantDTOMapper;
import com.pollex.pam.service.mapper.ConsultantMapper;
import com.pollex.pam.service.util.FileUtil;
import com.pollex.pam.web.rest.errors.ConsultantNotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,11 +22,18 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.time.Instant;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

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

@Service
public class ConsultantService {
@@ -50,6 +60,12 @@

    @Autowired
    SatisfactionService satisfactionService;
    
    @Autowired
    ConsultantDTOMapper consultantDTOMapper;
    
    @Autowired
    ApplicationProperties applicationProperty;

    public List<CustomerFavoriteConsultantDTO> getMyConsultantList() {
        Long customerId = SecurityUtils.getCustomerDBId();
@@ -62,10 +78,10 @@

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

                setAvaliableAppointmentInfo(
                setAvailableAppointmentInfo(
                    dto,
                    appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
                );
@@ -75,12 +91,16 @@
                        dto.setUpdateTime(latestAppointment.getLastModifiedDate());
                    });

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

                return dto;

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

    private void setAvaliableAppointmentInfo(CustomerFavoriteConsultantDTO customerFavoriteConsultantDTO, List<AppointmentCustomerView> appointmentList) {
    private void setAvailableAppointmentInfo(CustomerFavoriteConsultantDTO customerFavoriteConsultantDTO, List<AppointmentCustomerView> appointmentList) {
        List<AppointmentCustomerView> appointments = appointmentList.stream()
            .sorted(Comparator.comparing(AppointmentCustomerView::getAppointmentDate).reversed())
            .collect(Collectors.toList());
@@ -92,8 +112,12 @@
        customerFavoriteConsultantDTO.setAppointments(appointmentCustomerViewDTOS);

        if (!appointments.isEmpty()) {
            AppointmentCustomerView latestAppointment = appointments.get(0);
            customerFavoriteConsultantDTO.setContactStatus(latestAppointment.getCommunicateStatus());
            AppointmentCustomerView latestAvailableAppointment = appointments.get(0);

            if(latestAvailableAppointment.getCommunicateStatus() == RESERVED)
                customerFavoriteConsultantDTO.setContactStatus(RESERVED);
            else
                customerFavoriteConsultantDTO.setContactStatus(PICKED);
        }
    }

@@ -188,4 +212,25 @@

        customerFavoriteConsultantRepository.saveAll(notViewRelation);
    }

   public Consultant editConsultant(ConsultantEditDTO editDTO) {
      Consultant consultant = consultantRepository.findOneByAgentNo(editDTO.getAgentNo())
            .orElseThrow(ConsultantNotFoundException::new);
      consultantDTOMapper.copyToConsultant(editDTO, consultant);
      FileUtil.base64ToFile(editDTO.getPhotoBase64(), editDTO.getPhotoFileName(), applicationProperty.getFileFolderPath());
      return consultantRepository.save(consultant);
   }

   public InputStream getAvatarImage(String agentNo) {
      Consultant consultant = consultantRepository.findOneByAgentNo(agentNo)
            .orElseThrow(ConsultantNotFoundException::new);
      File file = new File(consultant.getPhotoPath());
      try {
         InputStream in = new FileInputStream(file);
         return in;
      } catch (FileNotFoundException e) {
         log.error("agent photo not found , agentNo:"+agentNo,e);
         return null;
      }
   }
}