From c096cbf6f20dcfb5b5cee6405b7d01c5f0b33ade Mon Sep 17 00:00:00 2001
From: Wojtek Wajerowicz
 <115081248+wojciech-wajerowicz-sonarsource@users.noreply.github.com>
Date: Tue, 22 Aug 2023 16:37:33 +0200
Subject: [PATCH] SONAR-20184 Don't return group and token count in API v2
 users responses.

---
 .../api/user/converter/UsersSearchRestResponseGenerator.java  | 4 ----
 .../org/sonar/server/v2/api/user/model/RestUserForAdmins.java | 4 ----
 .../v2/api/user/controller/DefaultUserControllerTest.java     | 2 --
 .../user/converter/UsersSearchRestResponseGeneratorTest.java  | 4 ----
 4 files changed, 14 deletions(-)

diff --git a/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/user/converter/UsersSearchRestResponseGenerator.java b/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/user/converter/UsersSearchRestResponseGenerator.java
index f92c3e3784d..ef3c07b5702 100644
--- a/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/user/converter/UsersSearchRestResponseGenerator.java
+++ b/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/user/converter/UsersSearchRestResponseGenerator.java
@@ -76,8 +76,6 @@ public class UsersSearchRestResponseGenerator implements UsersSearchResponseGene
       Boolean managed = userSearchResult.managed();
       String sqLastConnectionDate = toDateTime(userDto.getLastConnectionDate());
       String slLastConnectionDate = toDateTime(userDto.getLastSonarlintConnectionDate());
-      int groupSize = userSearchResult.groups().size();
-      int tokensCount = userSearchResult.tokensCount();
       List<String> scmAccounts = userSearchResult.userDto().getSortedScmAccounts();
       return new RestUserForAdmins(
         login,
@@ -92,8 +90,6 @@ public class UsersSearchRestResponseGenerator implements UsersSearchResponseGene
         avatar,
         sqLastConnectionDate,
         slLastConnectionDate,
-        groupSize,
-        tokensCount,
         scmAccounts);
     }
     return new RestUserForLoggedInUsers(login, login, name, email, active, local, externalIdentityProvider, avatar);
diff --git a/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/user/model/RestUserForAdmins.java b/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/user/model/RestUserForAdmins.java
index cb559458da1..5de5cc9bdbc 100644
--- a/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/user/model/RestUserForAdmins.java
+++ b/server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/user/model/RestUserForAdmins.java
@@ -45,10 +45,6 @@ public record RestUserForAdmins(
   @Nullable
   String sonarLintLastConnectionDate,
   @Nullable
-  Integer groupsCount,
-  @Nullable
-  Integer tokensCount,
-  @Nullable
   List<String> scmAccounts
 ) implements RestUser {
 }
diff --git a/server/sonar-webserver-webapi-v2/src/test/java/org/sonar/server/v2/api/user/controller/DefaultUserControllerTest.java b/server/sonar-webserver-webapi-v2/src/test/java/org/sonar/server/v2/api/user/controller/DefaultUserControllerTest.java
index 290f87e10f9..ed6a8bd2b55 100644
--- a/server/sonar-webserver-webapi-v2/src/test/java/org/sonar/server/v2/api/user/controller/DefaultUserControllerTest.java
+++ b/server/sonar-webserver-webapi-v2/src/test/java/org/sonar/server/v2/api/user/controller/DefaultUserControllerTest.java
@@ -213,8 +213,6 @@ public class DefaultUserControllerTest {
       userSearchResult.avatar().orElse(""),
       formatDateTime(userSearchResult.userDto().getLastConnectionDate()),
       formatDateTime(userSearchResult.userDto().getLastSonarlintConnectionDate()),
-      userSearchResult.groups().size(),
-      userSearchResult.tokensCount(),
       userSearchResult.userDto().getSortedScmAccounts());
   }
 
diff --git a/server/sonar-webserver-webapi-v2/src/test/java/org/sonar/server/v2/api/user/converter/UsersSearchRestResponseGeneratorTest.java b/server/sonar-webserver-webapi-v2/src/test/java/org/sonar/server/v2/api/user/converter/UsersSearchRestResponseGeneratorTest.java
index 665e80a2761..d1f40524fd9 100644
--- a/server/sonar-webserver-webapi-v2/src/test/java/org/sonar/server/v2/api/user/converter/UsersSearchRestResponseGeneratorTest.java
+++ b/server/sonar-webserver-webapi-v2/src/test/java/org/sonar/server/v2/api/user/converter/UsersSearchRestResponseGeneratorTest.java
@@ -96,8 +96,6 @@ public class UsersSearchRestResponseGeneratorTest {
       userSearchResult.avatar().orElse(null),
       toDateTime(userDto.getLastConnectionDate()),
       toDateTime(userDto.getLastSonarlintConnectionDate()),
-      userSearchResult.groups().size(),
-      userSearchResult.tokensCount(),
       userSearchResult.userDto().getSortedScmAccounts()
     );
   }
@@ -178,8 +176,6 @@ public class UsersSearchRestResponseGeneratorTest {
 
     when(userSearchResult.userDto()).thenReturn(user1);
     when(userSearchResult.managed()).thenReturn(booleanFlagsValue);
-    when(userSearchResult.tokensCount()).thenReturn(i);
-    when(userSearchResult.groups().size()).thenReturn(i * 100);
     return userSearchResult;
   }
 
-- 
2.39.5