#938 | Upsert metabase user on user creation

Author: 1t5j0y

avni-server-api/src/main/java/org/avni/server/web/UserController.java

@@ -121,7 +121,11 @@ public ResponseEntity createUser(@RequestBody UserContract userContract) {
             }
             accountAdminService.createAccountAdmins(savedUser, userContract.getAccountIds());
             userService.addToDefaultUserGroup(savedUser);
-            userService.associateUserToGroups(savedUser, userContract.getGroupIds());
+            List<UserGroup> userGroups = userService.associateUserToGroups(savedUser, userContract.getGroupIds());
+            if (organisationConfigService.isMetabaseSetupEnabled(UserContextHolder.getOrganisation()) &&
+                    userGroups.stream().anyMatch(userGroup -> userGroup.getGroupName().contains(Group.METABASE_USERS)) ) {
+                metabaseService.upsertUsersOnMetabase(userGroups);
+            }
             logger.info(String.format("Saved new user '%s', UUID '%s'", userContract.getUsername(), savedUser.getUuid()));
             return new ResponseEntity<>(savedUser, HttpStatus.CREATED);
         } catch (ValidationException | UsernameExistsException ex) {
@@ -164,7 +168,8 @@ public ResponseEntity updateUser(@RequestBody UserContract userContract, @PathVa
             userService.save(user);
             accountAdminService.createAccountAdmins(user, userContract.getAccountIds());
             List<UserGroup> associatedUserGroups = userService.associateUserToGroups(user, userContract.getGroupIds());
-            if (organisationConfigService.isMetabaseSetupEnabled(UserContextHolder.getOrganisation())) {
+            if (organisationConfigService.isMetabaseSetupEnabled(UserContextHolder.getOrganisation()) &&
+                    associatedUserGroups.stream().anyMatch(userGroup -> userGroup.getGroupName().contains(Group.METABASE_USERS))) {
                 metabaseService.upsertUsersOnMetabase(associatedUserGroups);
             }
             logger.info(String.format("Saved user '%s', UUID '%s'", userContract.getUsername(), user.getUuid()));