Merge pull request #1270 from lowcoder-org/fix/db_concurrency

mongodb concurrency issue fixed
lowcoder-org · Oct 30, 2024 · d895281 · d895281
2 parents bdd356b + 498727e
commit d895281
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/...i-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java b/...i-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java
@@ -43,6 +43,8 @@ public interface UserService {
 
     Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser);
 
+    Mono<User> saveUser(User user);
+
     Mono<Void> deleteProfilePhoto(User visitor);
 
     Mono<Boolean> updatePassword(String userId, String oldPassword, String newPassword);

diff --git a/...rvice/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java b/...rvice/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
@@ -225,6 +225,11 @@ public Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser
                 .flatMap(repository::save);
     }
 
+    @Override
+    public Mono<User> saveUser(User user) {
+        return repository.save(user);
+    }
+
     @Override
     public Mono<Void> deleteProfilePhoto(User visitor) {
         String userAvatar = visitor.getAvatar();

diff --git a/...r/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java b/...r/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java
@@ -164,7 +164,7 @@ public Mono<User> updateOrCreateUser(AuthUser authUser, boolean linkExistingUser
                     if (findByAuthUserFirst.userExist()) {
                         User user = findByAuthUserFirst.user();
                         updateConnection(authUser, user);
-                        return userService.update(user.getId(), user);
+                        return userService.saveUser(user);
                     }
 
                     //If the user connection is not found with login id, but the user is