Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM

HelenHuang

2021-11-15 b7de9faedf2a3e21c77c4ab3fc645ef01ac549cf

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

@@ -2,10 +2,10 @@

import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomFavoriteConsultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
import com.pollex.pam.repository.AppointmentCustomerViewRepository;
import com.pollex.pam.repository.ConsultantRepository;
import com.pollex.pam.repository.CustomFavoriteConsultantRepository;
import com.pollex.pam.repository.CustomerFavoriteConsultantRepository;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.dto.*;
import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper;
@@ -25,7 +25,7 @@
    private static final Logger log = LoggerFactory.getLogger(ConsultantService.class);

    final ConsultantRepository consultantRepository;
    final CustomFavoriteConsultantRepository customFavoriteConsultantRepository;
    final CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository;
    final ConsultantMapper consultantMapper;
    final AppointmentService appointmentService;
    final AppointmentCustomerViewRepository appointmentCustomerViewRepository;
@@ -33,15 +33,14 @@

    public ConsultantService(
        ConsultantRepository consultantRepository,
        CustomFavoriteConsultantRepository customFavoriteConsultantRepository,
        CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository,
        ConsultantMapper consultantMapper,
        UserService userService,
        AppointmentService appointmentService,
        AppointmentCustomerViewRepository appointmentCustomerViewRepository,
        AppointmentCustomerViewMapper appointmentCustomerViewMapper
    ) {
        this.consultantRepository = consultantRepository;
        this.customFavoriteConsultantRepository = customFavoriteConsultantRepository;
        this.customerFavoriteConsultantRepository = customerFavoriteConsultantRepository;
        this.consultantMapper = consultantMapper;
        this.appointmentService = appointmentService;
        this.appointmentCustomerViewRepository = appointmentCustomerViewRepository;
@@ -50,7 +49,7 @@

    public List<ConsultantDTO> getMyConsultantList() {
        Long userId = SecurityUtils.getCustomerId();
        return customFavoriteConsultantRepository.findAllByCustomerId(userId)
        return customerFavoriteConsultantRepository.findAllByCustomerId(userId)
            .stream()
            .map(consultantMapper::toDto)
            .collect(Collectors.toList());
@@ -89,14 +88,14 @@
        Long userId = SecurityUtils.getCustomerId();

        consultants.forEach(consultant -> {
            boolean isConsultantInList = customFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();
            boolean isConsultantInList = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();

            if(!isConsultantInList) {
                CustomFavoriteConsultant customFavoriteConsultant = new CustomFavoriteConsultant();
                customFavoriteConsultant.setConsultant(consultant);
                customFavoriteConsultant.setCustomerId(userId);
                CustomerFavoriteConsultant customerFavoriteConsultant = new CustomerFavoriteConsultant();
                customerFavoriteConsultant.setConsultant(consultant);
                customerFavoriteConsultant.setCustomerId(userId);

                customFavoriteConsultantRepository.save(customFavoriteConsultant);
                customerFavoriteConsultantRepository.save(customerFavoriteConsultant);
            }
            else {
                log.info("The consultant is in customer favorite list! customId = {}, consultant AgentNo = {}", userId, consultant.getAgentNo());
@@ -114,10 +113,10 @@
    public void removeConsultantFromCustomList(String agentNo) {
        Long customId = SecurityUtils.getCustomerId();
        Consultant consultant = consultantRepository.findFirstByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
        CustomFavoriteConsultant target = customFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(customId, consultant).orElse(null);
        CustomerFavoriteConsultant target = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(customId, consultant).orElse(null);

        if(target != null) {
            customFavoriteConsultantRepository.delete(target);
            customerFavoriteConsultantRepository.delete(target);
        }
        else {
            log.info("this consultant is not in customer list! agentNo = {}, customId = {}", agentNo, customId);