[UPDATE] 新增重複帳號註冊的檢核,直接拋出500的錯誤訊息 [UPDATE] 調整dev設定檔(auto-commit=false),解決mv...

Jack

2021-11-25 653566dd3199a36fcff30ea9b9f31087e59ce3ed

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

@@ -1,5 +1,7 @@
package com.pollex.pam.service;

import java.util.Optional;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
@@ -32,16 +34,33 @@
   }
   
   public String registerCustomer(CustomerRegisterDTO registDTO) {
      String account = registDTO.getContactType() == OtpLoginTypeEnum.EMAIL?registDTO.getEmail():registDTO.getPhone();
      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;
       }else {
          throw new UsernameNotFoundException("Otp record not found");
       }
      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;
          }else {
             throw new UsernameNotFoundException("Otp record not found");
          }
      }
      
   }

   private String getCustomerAccount(CustomerRegisterDTO registDTO) {
      return registDTO.getContactType() == OtpLoginTypeEnum.EMAIL?registDTO.getEmail():registDTO.getPhone();
   }

   private boolean checkCustomerExist(CustomerRegisterDTO registDTO) {
      String account = getCustomerAccount(registDTO);
      Optional<Customer> customer = customerRepository.findOneByEmailEqualsOrPhoneEquals(account, account);
      return customer.isPresent();
   }
}