Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM

Tomas

2022-09-14 f0b8fa2b1330ea00faf694817cdf0289673b8c56

Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM

 pamapi/src/doc/sql/20220906_j.sql

¤ñ¹ï·sÀÉ®×
@@ -0,0 +1,5 @@
-- è™•ç†customer data from null的資料改為pam --

UPDATE public.customer
SET data_from='PAM'
WHERE data_from is null;

 pamapi/src/doc/sql/executed/20211104_w.sql

 pamapi/src/doc/sql/executed/20211108_w.sql

 pamapi/src/doc/sql/executed/20211129_w.sql

 pamapi/src/doc/sql/executed/20211130_w.sql

 pamapi/src/doc/sql/executed/20211201_j.sql

 pamapi/src/doc/sql/executed/20211201_w.sql

 pamapi/src/doc/sql/executed/20211202_w.sql

 pamapi/src/doc/sql/executed/20211203_w.sql

 pamapi/src/doc/sql/executed/20211213_w.sql

 pamapi/src/doc/sql/executed/20211222_w.sql

 pamapi/src/doc/sql/executed/20211229_j.sql

 pamapi/src/doc/sql/executed/20211229_w.sql

 pamapi/src/doc/sql/executed/20220103_w.sql

 pamapi/src/doc/sql/executed/20220112_j.sql

 pamapi/src/doc/sql/executed/20220114_j.sql

 pamapi/src/doc/sql/executed/20220120_j.sql

 pamapi/src/doc/sql/executed/20220121_j.sql

 pamapi/src/doc/sql/executed/20220122_w.sql

 pamapi/src/doc/sql/executed/20220126_w.sql

 pamapi/src/doc/sql/executed/20220210_w.sql

 pamapi/src/doc/sql/executed/20220215_w.sql

 pamapi/src/doc/sql/executed/20220216_w.sql

 pamapi/src/doc/sql/executed/20220217_w.sql

 pamapi/src/doc/sql/executed/20220221_w.sql

 pamapi/src/doc/sql/executed/20220329_j.sql

 pamapi/src/doc/sql/executed/20220330_j.sql

 pamapi/src/doc/sql/executed/²bªÅ¾ã­Ó¨t²Î¸ê®Æ(°£ÅU°Ý).sql

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

@@ -7,6 +7,9 @@
import com.pollex.pam.business.service.UsernameAlreadyUsedException;
import com.pollex.pam.business.service.dto.CustomerDTO;
import com.pollex.pam.business.service.mapper.CustomerMapper;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
@@ -14,6 +17,7 @@

import com.pollex.pam.business.domain.Customer;
import com.pollex.pam.business.domain.OtpTmp;
import com.pollex.pam.business.enums.DataFromEnum;
import com.pollex.pam.business.enums.OtpLoginTypeEnum;
import com.pollex.pam.business.enums.OtpTmpStatusEnum;
import com.pollex.pam.business.repository.CustomerRepository;
@@ -23,6 +27,9 @@
@Service
@Transactional
public class CustomerService {
	
    private static final Logger log = LoggerFactory.getLogger(CustomerService.class);


    @Autowired
    CustomerRepository customerRepository;
@@ -44,6 +51,7 @@
    }

    public Customer registerCustomer(CustomerRegisterDTO registDTO) {
		
        boolean isCustomerExist = checkCustomerExist(registDTO);
        if(isCustomerExist) {
            throw new UsernameAlreadyUsedException();
@@ -54,7 +62,9 @@
            OtpTmp otpTmp = otpTmpService.findByAccountAndIndexKey(account, registDTO.getIndexKey());
            if(otpTmp.getStatus() == OtpTmpStatusEnum.VERRIFIED) {
                Customer customer = customerDTOMapper.toCustomer(registDTO);
                customer.setDataFrom(DataFromEnum.PAM);
                save(customer);
                Customer test = customerRepository.findById(customer.getId()).get();
                return customer;
            }else {
                throw new IllegalArgumentException("Invalid indexKey state error. IndexKey: "