commit commit

src/main/java/com/example/afrishop_v3/controllers/UserController.java

@@ -42,7 +42,10 @@ public class UserController extends Controller {
 
             boolean detect =  StringUtils.isNotBlank(code) && code.equals(user.getVerificationCode());
             if( isEmailValid(email) && detect ){
-
+                boolean b = repository.existsByEmailAndUserIdNot(email, user.getUserId());
+                if( b ){
+                    return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Email is already taken");
+                }
                 if( user.getEmail() != null && user.getEmail().equals(user.getFirebaseUid())){
                     user.setFirebaseUid(email);
                 }
@@ -57,6 +60,10 @@ public class UserController extends Controller {
         if( StringUtils.isNotBlank(phone) ){
 
             if( StringUtils.isNotBlank(code) && code.equals(user.getVerificationCode()) ){
+                boolean b = repository.existsByPhoneAndUserIdNot(phone, user.getUserId());
+                if( b ){
+                    return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Phone number is already taken");
+                }
                 user.setPhone(phone);
                 user.setVerificationCode(null);
             }else return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Code verification error");

src/main/java/com/example/afrishop_v3/repository/UserRepository.java

@@ -10,6 +10,8 @@ import java.util.Optional;
 public interface UserRepository extends PagingAndSortingRepository<TbCfUserInfo,String> {
     Optional<TbCfUserInfo> findFirstByAccount(String s);
     boolean existsByAccount(String s);
+    boolean existsByPhoneAndUserIdNot(String phone, String userId);
+    boolean existsByEmailAndUserIdNot(String phone, String userId);
     Optional<TbCfUserInfo> findByFirebaseUid(String s);
     Optional<TbCfUserInfo> findFirstByFirebaseUidOrAccount(String firebaseUid, String account);
     boolean existsByFirebaseUid(String s);