OO-1117: add active user count to the system REST API

src/main/java/org/olat/basesecurity/Constants.java

@@ -211,4 +211,27 @@ public class Constants {
 	 */
 	public static final OLATResourceable ORESOURCE_GUESTONLY = OresHelper.lookupType(BaseSecurityModule.class, "RGuestOnly");
 
+	/**
+	 * status of a user
+	 * <code>USERSTATUS_ACTIVE</code> is an active user
+	 */
+	public static final Integer USERSTATUS_ACTIVE = 2;
+
+	/**
+	 * status of a user
+	 * <code>USERSTATUS_NOT_DELETEABLE</code> is a not deleteable user
+	 */
+	public static final Integer USERSTATUS_NOT_DELETEABLE = 1;
+
+	/**
+	 * status of a user
+	 * <code>USERSTATUS_LOGIN_DENIED</code> is a user, whose login is denied
+	 */
+	public static final Integer USERSTATUS_LOGIN_DENIED = 101;
+
+	/**
+	 * status of a user
+	 * <code>USERSTATUS_DELETED</code> is a deleted user
+	 */
+	public static final Integer USERSTATUS_DELETED = 199;
 }
\ No newline at end of file

src/main/java/org/olat/restapi/system/OpenOLATStatisticsWebService.java

@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
 import org.olat.admin.sysinfo.manager.SessionStatsManager;
 import org.olat.admin.sysinfo.model.SessionsStats;
 import org.olat.basesecurity.BaseSecurity;
+import org.olat.basesecurity.Constants;
 import org.olat.core.CoreSpringFactory;
 import org.olat.core.util.SessionInfo;
 import org.olat.core.util.UserSession;
@@ -170,6 +171,8 @@ public class OpenOLATStatisticsWebService implements Sampler {
 		BaseSecurity securityManager = CoreSpringFactory.getImpl(BaseSecurity.class);
 		long countUsers = securityManager.countIdentitiesByPowerSearch(null, null, false, null, null, null, null, null, null, null, null);
 		stats.setTotalUserCount(countUsers);
+		long countActiveUsers = securityManager.countIdentitiesByPowerSearch(null, null, false, null, null, null, null, null, null, null, Constants.USERSTATUS_ACTIVE);
+		stats.setActiveUserCount(countActiveUsers);
 		
 		BusinessGroupService bgs = CoreSpringFactory.getImpl(BusinessGroupService.class);
 		long countGroups = bgs.countBusinessGroups(null, null);

src/main/java/org/olat/restapi/system/vo/UserStatisticsVO.java

@@ -34,6 +34,8 @@ public class UserStatisticsVO {
 
 	@XmlAttribute(name="totalUserCount", required=true)
 	private long totalUserCount;
+	@XmlAttribute(name="activeUserCount", required=true)
+	private long activeUserCount;
 	@XmlAttribute(name="totalGroupCount", required=true)
 	private long totalGroupCount;
 	
@@ -46,6 +48,14 @@ public class UserStatisticsVO {
 		this.totalUserCount = totalUserCount;
 	}
 	
+	public long getActiveUserCount() {
+		return activeUserCount;
+	}
+	
+	public void setActiveUserCount(long activeUserCount) {
+		this.activeUserCount = activeUserCount;
+	}
+	
 	public long getTotalGroupCount() {
 		return totalGroupCount;
 	}

src/test/java/org/olat/restapi/SystemTest.java

@@ -157,6 +157,7 @@ public class SystemTest extends OlatJerseyTestCase {
 		assertNotNull(userStats);
 		assertTrue(userStats.getTotalUserCount() > 0);
 		assertTrue(userStats.getTotalGroupCount() >= 0);
+		assertTrue(userStats.getActiveUserCount() >= 0);
 		
 		conn.shutdown();	
 	}