From a474351e790a0bfeaa747b01eb92282ca05e5a36 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 15 十一月 2021 16:43:30 +0800
Subject: [PATCH] [ref] 調整錯字
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 10 ++--
/dev/null | 15 -------
pamapi/src/main/java/com/pollex/pam/repository/CustomerFavoriteConsultantRepository.java | 15 +++++++
pamapi/src/main/java/com/pollex/pam/domain/CustomerFavoriteConsultant.java | 6 +-
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 27 ++++++-------
5 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/domain/CustomFavoriteConsultant.java b/pamapi/src/main/java/com/pollex/pam/domain/CustomerFavoriteConsultant.java
similarity index 85%
rename from pamapi/src/main/java/com/pollex/pam/domain/CustomFavoriteConsultant.java
rename to pamapi/src/main/java/com/pollex/pam/domain/CustomerFavoriteConsultant.java
index 055617d..4145922 100644
--- a/pamapi/src/main/java/com/pollex/pam/domain/CustomFavoriteConsultant.java
+++ b/pamapi/src/main/java/com/pollex/pam/domain/CustomerFavoriteConsultant.java
@@ -4,8 +4,8 @@
import java.io.Serializable;
@Entity
-@Table(name = "custom_favorite_consultant")
-public class CustomFavoriteConsultant extends AbstractAuditingEntity implements Serializable {
+@Table(name = "customer_favorite_consultant")
+public class CustomerFavoriteConsultant extends AbstractAuditingEntity implements Serializable {
private static final long serialVersionUID = 1L;
@@ -47,7 +47,7 @@
@Override
public String toString() {
- return "CustomFavoriteConsultant{" +
+ return "CustomerFavoriteConsultant{" +
"id=" + id +
", consultant=" + consultant +
", customerId=" + customerId +
diff --git a/pamapi/src/main/java/com/pollex/pam/repository/CustomFavoriteConsultantRepository.java b/pamapi/src/main/java/com/pollex/pam/repository/CustomFavoriteConsultantRepository.java
deleted file mode 100644
index 8dc101c..0000000
--- a/pamapi/src/main/java/com/pollex/pam/repository/CustomFavoriteConsultantRepository.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.pollex.pam.repository;
-
-import com.pollex.pam.domain.Consultant;
-import com.pollex.pam.domain.CustomFavoriteConsultant;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Optional;
-
-@Repository
-public interface CustomFavoriteConsultantRepository extends JpaRepository<CustomFavoriteConsultant, Long> {
- List<CustomFavoriteConsultant> findAllByCustomerId(Long id);
- Optional<CustomFavoriteConsultant> findOneByCustomerIdAndConsultant(Long customerId, Consultant consultant);
-}
diff --git a/pamapi/src/main/java/com/pollex/pam/repository/CustomerFavoriteConsultantRepository.java b/pamapi/src/main/java/com/pollex/pam/repository/CustomerFavoriteConsultantRepository.java
new file mode 100644
index 0000000..e61c4df
--- /dev/null
+++ b/pamapi/src/main/java/com/pollex/pam/repository/CustomerFavoriteConsultantRepository.java
@@ -0,0 +1,15 @@
+package com.pollex.pam.repository;
+
+import com.pollex.pam.domain.Consultant;
+import com.pollex.pam.domain.CustomerFavoriteConsultant;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface CustomerFavoriteConsultantRepository extends JpaRepository<CustomerFavoriteConsultant, Long> {
+ List<CustomerFavoriteConsultant> findAllByCustomerId(Long id);
+ Optional<CustomerFavoriteConsultant> findOneByCustomerIdAndConsultant(Long customerId, Consultant consultant);
+}
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 ef88b61..e36e0cf 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/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);
diff --git a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
index deb3705..8870fec 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
@@ -2,7 +2,7 @@
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.Consultant;
-import com.pollex.pam.domain.CustomFavoriteConsultant;
+import com.pollex.pam.domain.CustomerFavoriteConsultant;
import com.pollex.pam.enums.ContactStatusEnum;
import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.dto.ConsultantDTO;
@@ -40,11 +40,11 @@
return consultantDTO;
}
- public ConsultantDTO toDto(CustomFavoriteConsultant customFavoriteConsultant) {
- Consultant consultant = customFavoriteConsultant.getConsultant();
+ public ConsultantDTO toDto(CustomerFavoriteConsultant customerFavoriteConsultant) {
+ Consultant consultant = customerFavoriteConsultant.getConsultant();
ConsultantDTO dto = toDto(consultant);
- final Optional<Appointment> latestAppointmentOptional = appointmentService.findByAgentNoAndCustomerId(consultant.getAgentNo(), customFavoriteConsultant.getCustomerId())
+ final Optional<Appointment> latestAppointmentOptional = appointmentService.findByAgentNoAndCustomerId(consultant.getAgentNo(), customerFavoriteConsultant.getCustomerId())
.stream()
.max(Comparator.comparing(Appointment::getAppointmentDate));
@@ -57,7 +57,7 @@
else {
dto.setContactStatus(ContactStatusEnum.PICKED);
dto.setLatestAppointmentId(null);
- dto.setUpdateTime(customFavoriteConsultant.getLastModifiedDate());
+ dto.setUpdateTime(customerFavoriteConsultant.getLastModifiedDate());
}
return dto;
--
Gitblit v1.8.0