Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM

Jack

2021-11-29 13ae6947a48f4c061b1a6479df889fa2aaf07099

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

@@ -13,6 +13,7 @@
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;

@@ -24,31 +25,26 @@

    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
    AppointmentCustomerViewRepository appointmentCustomerViewRepository;

    @Autowired
    AppointmentCustomerViewMapper appointmentCustomerViewMapper;

    public List<ConsultantDTO> getMyConsultantList() {
        Long userId = SecurityUtils.getCustomerId();
        Long userId = SecurityUtils.getCustomerDBId();
        return customerFavoriteConsultantRepository.findAllByCustomerId(userId)
            .stream()
            .map(consultantMapper::toDto)
@@ -77,7 +73,7 @@
    }

    public ConsultantDetailDTO getConsultantDetail(String agentNo) {
        Consultant consultant = consultantRepository.findFirstByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
        Consultant consultant = consultantRepository.findOneByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
        return consultantMapper.toDetailDto(consultant);
    }

@@ -85,7 +81,7 @@
    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();
@@ -111,8 +107,8 @@
   }

    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) {