SONAR-19084 Compute isManaged flag correctly for GitHub users

1 files changed, 16 insertions, 7 deletions

diff --git a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubManagedInstanceService.java b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubManagedInstanceService.java
index e88da1259f9..7921892fe92 100644
--- a/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubManagedInstanceService.java
+++ b/server/sonar-auth-github/src/main/java/org/sonar/auth/github/GitHubManagedInstanceService.java
@@ -53,18 +53,27 @@ public class GitHubManagedInstanceService implements ManagedInstanceService {
 
   @Override
   public Map<String, Boolean> getUserUuidToManaged(DbSession dbSession, Set<String> userUuids) {
+    Set<String> gitHubUserUuids = findManagedUserUuids(dbSession, userUuids);
+
+    return userUuids.stream()
+      .collect(toMap(Function.identity(), gitHubUserUuids::contains));
+  }
+
+  private Set<String> findManagedUserUuids(DbSession dbSession, Set<String> userUuids) {
+    List<UserDto> userDtos = findManagedUsers(dbSession, userUuids);
+
+    return userDtos.stream()
+      .map(UserDto::getUuid)
+      .collect(toSet());
+  }
+
+  private List<UserDto> findManagedUsers(DbSession dbSession, Set<String> userUuids) {
     UserQuery managedUsersQuery = UserQuery.builder()
       .userUuids(userUuids)
       .isManagedClause(getManagedUsersSqlFilter(true))
       .build();
 
-    List<UserDto> userDtos = userDao.selectUsers(dbSession, managedUsersQuery);
-    Set<String> gitHubUserUuids = userDtos.stream()
-      .map(UserDto::getUuid)
-      .collect(toSet());
-
-    return userUuids.stream()
-      .collect(toMap(Function.identity(), gitHubUserUuids::contains));
+    return userDao.selectUsers(dbSession, managedUsersQuery);
   }
 
   @Override