#740 - fix for new user

Author: petmongrels

avni-server-api/src/main/java/org/avni/server/dao/UserRepository.java

@@ -140,4 +140,7 @@ default User getDefaultSuperAdmin() {
 
     @Query(value = "select * from users where lower(users.settings->>'idPrefix') = lower(:prefix) and id <> :exceptUserId", nativeQuery = true)
     List<User> getUsersWithSameIdPrefix(String prefix, long exceptUserId);
+
+    @Query(value = "select * from users where lower(users.settings->>'idPrefix') = lower(:prefix)", nativeQuery = true)
+    List<User> getUsersWithSameIdPrefix(String prefix);
 }

avni-server-api/src/main/java/org/avni/server/service/UserService.java

@@ -52,8 +52,8 @@ public User save(User user) {
         String idPrefix = UserSettings.getIdPrefix(user.getSettings());
         if (StringUtils.hasLength(idPrefix)) {
             synchronized (String.format("%d-USER-ID-PREFIX-%s", user.getOrganisationId(), idPrefix).intern()) {
-                List<User> usersWithSameIdPrefix = userRepository.getUsersWithSameIdPrefix(idPrefix, user.getId());
-                if (usersWithSameIdPrefix.size() == 0) {
+                List<User> usersWithSameIdPrefix = user.isNew() ? userRepository.getUsersWithSameIdPrefix(idPrefix) : userRepository.getUsersWithSameIdPrefix(idPrefix, user.getId());
+                if (usersWithSameIdPrefix.isEmpty()) {
                     return createUpdateUser(user);
                 } else {
                     throw new ValidationException(String.format("There is another user %s with same prefix: %s", usersWithSameIdPrefix.get(0).getUsername(), idPrefix));