From a3716f72066d25d745f4d5103ff23a553c3e102b Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:41:19 +0800
Subject: [PATCH] Merge branch 'sit' into uat
---
pamapi/src/main/java/com/pollex/pam/service/CustomerService.java | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/CustomerService.java b/pamapi/src/main/java/com/pollex/pam/service/CustomerService.java
index 2fd1590..79a086d 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/CustomerService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/CustomerService.java
@@ -2,9 +2,13 @@
import java.util.Optional;
+import com.pollex.pam.security.SecurityUtils;
+import com.pollex.pam.service.dto.CustomerDTO;
+import com.pollex.pam.service.mapper.CustomerMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import com.pollex.pam.domain.Customer;
import com.pollex.pam.domain.OtpTmp;
@@ -15,45 +19,69 @@
import com.pollex.pam.service.mapper.CustomerDTOMapper;
@Service
+@Transactional
public class CustomerService {
-
+
@Autowired
CustomerRepository customerRepository;
-
+
@Autowired
CustomerDTOMapper customerDTOMapper;
-
+
@Autowired
CustomerAuthService customerAuthService;
-
+
@Autowired
OtpTmpService otpTmpService;
-
+
+ @Autowired
+ CustomerMapper customerMapper;
+
public Customer save(Customer customer) {
return customerRepository.save(customer);
}
-
- public String registerCustomer(CustomerRegisterDTO registDTO) {
+
+ public Customer registerCustomer(CustomerRegisterDTO registDTO) {
boolean isCustomerExist = checkCustomerExist(registDTO);
if(isCustomerExist) {
throw new UsernameAlreadyUsedException();
-
+
}else {
String account = getCustomerAccount(registDTO);
-
+
OtpTmp otpTmp = otpTmpService.findByAccountAndIndexKey(account, registDTO.getIndexKey());
if(otpTmp.getStatus() == OtpTmpStatusEnum.VERRIFIED) {
Customer customer = customerDTOMapper.toCustomer(registDTO);
save(customer);
- String jwt = customerAuthService.authorize(account, registDTO.getIndexKey(), registDTO.getOtpCode());
- return jwt;
+ return customer;
}else {
- throw new UsernameNotFoundException("Otp record not found");
+ throw new IllegalArgumentException("Invalid indexKey state error. IndexKey: "
+ + registDTO.getIndexKey()
+ + " => status: " + otpTmp.getStatus());
}
}
-
+
}
+ public void updateLoggedCustomer(CustomerDTO customerDTO) {
+ Long customerId = SecurityUtils.getCustomerDBId();
+ Customer customer = customerRepository.findById(customerId)
+ .orElseThrow(() -> new UsernameNotFoundException("customerId which is from token is not found in customer db table, customer id = " + customerId));
+
+ customer.setEmail(customerDTO.getEmail());
+ customer.setPhone(customerDTO.getPhone());
+ customer.setName(customerDTO.getName());
+ customerRepository.save(customer);
+ }
+
+ public CustomerDTO getLoggedCustomerDTO() {
+ Long customerId = SecurityUtils.getCustomerDBId();
+ Customer customer = customerRepository.findById(customerId)
+ .orElseThrow(() -> new UsernameNotFoundException("customerId which is from token is not found in customer db table, customer id = " + customerId));
+
+ return customerMapper.toDto(customer);
+ }
+
private String getCustomerAccount(CustomerRegisterDTO registDTO) {
return registDTO.getContactType() == OtpLoginTypeEnum.EMAIL?registDTO.getEmail():registDTO.getPhone();
}
--
Gitblit v1.8.0