Merge remote-tracking branch 'origin/Phase3' into Phase3

wayne

2022-03-01 68343c0e409d7f02f29c5a832a6a1e24e9690f06

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

@@ -6,8 +6,8 @@
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
import com.pollex.pam.domain.Satisfaction;
import com.pollex.pam.enums.ConsultantStatusEnum;
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.repository.SatisfactionRepository;
@@ -150,6 +150,7 @@
    public List<ConsultantDTO> getRecommendConsultantList() {
        return consultantRepository.findAllByRecommendIsTrue()
            .stream()
            .filter(consultant -> consultant.getStatus() == ConsultantStatusEnum.AVAILABLE)
            .map(consultantMapper::toDto)
            .collect(Collectors.toList());
    }
@@ -169,7 +170,8 @@
    }

    private int getStrictQuerySuitabilityScore(StrictQueryConsultantParam param, Consultant consultant) {
        Float queryAvgScore = param.getAvgScore();
        final float QUERY_AVG_SCORE_OFFSET = 0.5f;
        Float queryAvgScore = param.getAvgScore() - QUERY_AVG_SCORE_OFFSET;
        String querySeniority = param.getSeniority();
        List<String> queryRequirements = param.getRequirements();

@@ -227,15 +229,17 @@

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

        consultants.forEach(consultant -> {
        param.getConsultantList().forEach(addConsultantData -> {
            Consultant consultant = consultantRepository.findOneByAgentNo(addConsultantData.getAgentNo()).orElseThrow(ConsultantNotFoundException::new);
            boolean isConsultantInList = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();

            if(!isConsultantInList) {
                CustomerFavoriteConsultant customerFavoriteConsultant = new CustomerFavoriteConsultant();
                Optional<Instant> createdTime = Optional.ofNullable(addConsultantData.getCreatedTime());

                customerFavoriteConsultant.setCreatedDate(createdTime.orElse(Instant.now()));
                customerFavoriteConsultant.setConsultant(consultant);
                customerFavoriteConsultant.setCustomerId(userId);

@@ -245,7 +249,6 @@
                log.info("The consultant is in customer favorite list! customId = {}, consultant AgentNo = {}", userId, consultant.getAgentNo());
            }
        });

    }

   public List<AppointmentCustomerViewDTO> getMyAppointment() {