SONAR-18589 Fix system info user count

diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoIT.java
index d9bb04089dbe743903ca32e2a67f4757c9a32e97..1b9d348c1fba547f4e24beb4ba13f591f41be79b 100644 (file)
--- a/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoIT.java
+++ b/server/sonar-db-dao/src/it/java/org/sonar/db/user/UserDaoIT.java
@@ -407,6 +407,16 @@ public class UserDaoIT {
     assertThat(underTest.countSonarlintWeeklyUsers(db.getSession())).isEqualTo(2);
   }
 
+  @Test
+  public void count_active_users() {
+    db.users().insertUser();
+    db.users().insertUser();
+    db.users().insertUser();
+    db.users().insertUser(c -> c.setActive(false));
+
+    assertThat(underTest.countActiveUsers(db.getSession())).isEqualTo(3);
+  }
+
   @Test
   public void clean_user_homepage() {
 

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java
index 442edf73596365fb7c77a11239157475ee62e56f..8387c648d9be0ef52829aedbd8be478ac1e8fecd 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java
@@ -189,6 +189,10 @@ public class UserDao implements Dao {
     return mapper(dbSession).countActiveSonarlintUsers(threshold);
   }
 
+  public long countActiveUsers(DbSession dbSession) {
+    return mapper(dbSession).countActiveUsers();
+  }
+
   public void scrollByUuids(DbSession dbSession, Collection<String> uuids, Consumer<UserDto> consumer) {
     UserMapper mapper = mapper(dbSession);
 

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java
index 3bc198edb01bde4435f6975c253f616af336d0be..8676a8a04a2d77a0c0c03a38bdb05cbbb2b484e1 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java
@@ -81,4 +81,6 @@ public interface UserMapper {
   void clearHomepage(@Param("login") String login, @Param("now") long now);
 
   long countActiveSonarlintUsers(@Param("sinceDate") long sinceDate);
+
+  long countActiveUsers();
 }

diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
index abab22c87573746edaaa433d8da2a099c05aa8d4..2f5ae52d2ec04327a553e17eb5028278818bcdb5 100644 (file)
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
@@ -269,4 +269,8 @@
         where last_sonarlint_connection > #{sinceDate,jdbcType=BIGINT}
     </select>
 
+    <select id="countActiveUsers" resultType="long">
+        select count(1) from users u WHERE u.active=${_true}
+    </select>
+
 </mapper>