SONAR-18689 add filtering by managed in /api/users/search

3 files changed, 37 insertions, 0 deletions

diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/management/DelegatingManagedInstanceService.java b/server/sonar-server-common/src/main/java/org/sonar/server/management/DelegatingManagedInstanceService.java
index 9bb07da8b31..8c58caf15f5 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/management/DelegatingManagedInstanceService.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/management/DelegatingManagedInstanceService.java
@@ -60,6 +60,13 @@ public class DelegatingManagedInstanceService implements ManagedInstanceService
       .orElse(returnNonManagedForAllGroups(groupUuids));
   }
 
+  @Override
+  public String getManagedUsersSqlFilter(boolean filterByManaged) {
+    return findManagedInstanceService()
+      .map(managedInstanceService -> managedInstanceService.getManagedUsersSqlFilter(filterByManaged))
+      .orElseThrow(() -> new IllegalStateException("This instance is not managed."));
+  }
+
   private Optional<ManagedInstanceService> findManagedInstanceService() {
     Set<ManagedInstanceService> managedInstanceServices = delegates.stream()
       .filter(ManagedInstanceService::isInstanceExternallyManaged)
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/management/ManagedInstanceService.java b/server/sonar-server-common/src/main/java/org/sonar/server/management/ManagedInstanceService.java
index 581fe04e34f..942d3b5f9e4 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/management/ManagedInstanceService.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/management/ManagedInstanceService.java
@@ -32,4 +32,6 @@ public interface ManagedInstanceService {
   Map<String, Boolean> getUserUuidToManaged(DbSession dbSession, Set<String> userUuids);
 
   Map<String, Boolean> getGroupUuidToManaged(DbSession dbSession, Set<String> groupUuids);
+
+  String getManagedUsersSqlFilter(boolean filterByManaged);
 }
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/management/DelegatingManagedInstanceServiceTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/management/DelegatingManagedInstanceServiceTest.java
index 542074300b5..e201461ec52 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/management/DelegatingManagedInstanceServiceTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/management/DelegatingManagedInstanceServiceTest.java
@@ -125,6 +125,24 @@ public class DelegatingManagedInstanceServiceTest {
       .withMessage("The instance can't be managed by more than one identity provider and 2 were found.");
   }
 
+  @Test
+  public void getManagedUsersSqlFilter_whenNoDelegates_throws() {
+    Set<ManagedInstanceService> managedInstanceServices = emptySet();
+    DelegatingManagedInstanceService delegatingManagedInstanceService = new DelegatingManagedInstanceService(managedInstanceServices);
+    assertThatIllegalStateException()
+      .isThrownBy(() -> delegatingManagedInstanceService.getManagedUsersSqlFilter(true))
+      .withMessage("This instance is not managed.");
+  }
+
+  @Test
+  public void getManagedUsersSqlFilter_delegatesToRightService_andPropagateAnswer() {
+    AlwaysManagedInstanceService alwaysManagedInstanceService = new AlwaysManagedInstanceService();
+    DelegatingManagedInstanceService managedInstanceService = new DelegatingManagedInstanceService(Set.of(new NeverManagedInstanceService(), alwaysManagedInstanceService));
+
+    assertThat(managedInstanceService.getManagedUsersSqlFilter(true)).isNotNull().isEqualTo(alwaysManagedInstanceService.getManagedUsersSqlFilter(
+      true));
+  }
+
   private ManagedInstanceService getManagedInstanceService(Set<String> userUuids, Map<String, Boolean> uuidToManaged) {
     ManagedInstanceService anotherManagedInstanceService = mock(ManagedInstanceService.class);
     when(anotherManagedInstanceService.isInstanceExternallyManaged()).thenReturn(true);
@@ -149,6 +167,11 @@ public class DelegatingManagedInstanceServiceTest {
     public Map<String, Boolean> getGroupUuidToManaged(DbSession dbSession, Set<String> groupUuids) {
       return null;
     }
+
+    @Override
+    public String getManagedUsersSqlFilter(boolean filterByManaged) {
+      return null;
+    }
   }
 
   private static class AlwaysManagedInstanceService implements ManagedInstanceService {
@@ -167,6 +190,11 @@ public class DelegatingManagedInstanceServiceTest {
     public Map<String, Boolean> getGroupUuidToManaged(DbSession dbSession, Set<String> groupUuids) {
       return null;
     }
+
+    @Override
+    public String getManagedUsersSqlFilter(boolean filterByManaged) {
+      return "any filter";
+    }
   }
 
 }