From 98ac8d14098015971b774362c98e3b78c073e701 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期二, 09 十一月 2021 16:37:43 +0800 Subject: [PATCH] [update] #todo 129741 嚴選配對API --- pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 76 ++++++++++++++++++++++++++++++++------ 1 files changed, 64 insertions(+), 12 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java index 07cd771..68dcb21 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java +++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java @@ -1,49 +1,101 @@ package com.pollex.pam.service; import com.pollex.pam.domain.Consultant; +import com.pollex.pam.domain.CustomFavoriteConsultant; +import com.pollex.pam.domain.User; +import com.pollex.pam.enums.ContactStatusEnum; import com.pollex.pam.repository.ConsultantRepository; +import com.pollex.pam.repository.CustomFavoriteConsultantRepository; import com.pollex.pam.service.dto.*; import com.pollex.pam.service.mapper.ConsultantMapper; import com.pollex.pam.web.rest.errors.ConsultantNotFoundException; +import com.pollex.pam.web.rest.errors.NotLoginException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; @Service public class ConsultantService { - private final ConsultantRepository consultantRepository; - private final ConsultantMapper consultantMapper; + private static final Logger log = LoggerFactory.getLogger(ConsultantService.class); - public ConsultantService(ConsultantRepository consultantRepository, ConsultantMapper consultantMapper) { + private final ConsultantRepository consultantRepository; + private final CustomFavoriteConsultantRepository customFavoriteConsultantRepository; + private final ConsultantMapper consultantMapper; + private final UserService userService; + + public ConsultantService( + ConsultantRepository consultantRepository, + CustomFavoriteConsultantRepository customFavoriteConsultantRepository, + ConsultantMapper consultantMapper, + UserService userService + ) { this.consultantRepository = consultantRepository; + this.customFavoriteConsultantRepository = customFavoriteConsultantRepository; this.consultantMapper = consultantMapper; + this.userService = userService; } public List<ConsultantDTO> getMyConsultantList() { - return Collections.emptyList(); + User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new); + return customFavoriteConsultantRepository.findAllByCustomId(user.getId()) + .stream() + .map(consultantMapper::toDto) + .collect(Collectors.toList()); } public List<ConsultantDTO> getRecommendConsultantList() { - List<Consultant> recommendConsultantList = consultantRepository.findAllByRecommendIsTrue(); - return consultantMapper.toDto(recommendConsultantList); - } - - public void addConsultantToOwnList(AddConsultantParam param) { - List<String> agentNoList = param.getAgentNoList(); + return consultantRepository.findAllByRecommendIsTrue() + .stream() + .map(consultantMapper::toDto) + .collect(Collectors.toList()); } public List<ConsultantDTO> strictQueryConsultant(StrictQueryConsultantParam param) { - return Collections.emptyList(); + return consultantRepository.findAll(ConsultantQuerySpec.getStrictQuerySpec(param)) + .stream() + .map(consultantMapper::toDto) + .collect(Collectors.toList()); } public List<ConsultantDTO> fastQueryConsultant(FastQueryConsultantParam param) { - return Collections.emptyList(); + return consultantRepository.findAll(ConsultantQuerySpec.getFastQuerySpec(param)) + .stream() + .map(consultantMapper::toDto) + .collect(Collectors.toList()); } public ConsultantDetailDTO getConsultantDetail(String agentNo) { Consultant consultant = consultantRepository.findFirstByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new); return consultantMapper.toDetailDto(consultant); } + + @Transactional + public void addConsultantToCustomList(AddConsultantParam param) { + List<String> agentNoList = param.getAgentNoList(); + List<Consultant> consultants = consultantRepository.findAllByAgentNoIn(agentNoList); + User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new); + + consultants.forEach(consultant -> { + boolean isConsultantInList = customFavoriteConsultantRepository.findOneByCustomIdAndConsultant(user.getId(), consultant).isPresent(); + + if(!isConsultantInList) { + CustomFavoriteConsultant customFavoriteConsultant = new CustomFavoriteConsultant(); + customFavoriteConsultant.setConsultant(consultant); + customFavoriteConsultant.setCustomId(user.getId()); + customFavoriteConsultant.setContactStatus(ContactStatusEnum.PICKED); + + customFavoriteConsultantRepository.save(customFavoriteConsultant); + } + else { + log.info("The consultant is in custom favorite list! customId = {}, consultant AgentNo = {}", user.getId(), consultant.getAgentNo()); + } + }); + + } } -- Gitblit v1.8.0