Exclude service users from total user count

netbirdio · Feb 21, 2024 · 396fae5 · 396fae5
1 parent 0740aff
commit 396fae5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/management/server/file_store.go b/management/server/file_store.go
@@ -683,14 +683,23 @@ func (s *FileStore) CalculateUsageStats(_ context.Context, accountID string, sta
 
 	activeUsers := make(map[string]bool)
 	for _, peer := range account.Peers {
-		lastSeen := peer.Status.LastSeen
-		if lastSeen.Compare(start) >= 0 && lastSeen.Compare(end) <= 0 {
+		if user, exists := account.Users[peer.UserID]; exists {
+			if user.IsServiceUser {
+				continue
+			}
 
-			if _, exists := account.Users[peer.UserID]; exists && !activeUsers[peer.UserID] {
-				activeUsers[peer.UserID] = true
-				stats.ActiveUsers++
+			if !activeUsers[peer.UserID] {
+				stats.TotalUsers++
+			}
+
+			lastSeen := peer.Status.LastSeen
+			if lastSeen.Compare(start) >= 0 && lastSeen.Compare(end) <= 0 {
+				if !activeUsers[peer.UserID] {
+					activeUsers[peer.UserID] = true
+					stats.ActiveUsers++
+				}
+				stats.ActivePeers++
 			}
-			stats.ActivePeers++
 		}
 	}
 

diff --git a/management/server/sqlite_store.go b/management/server/sqlite_store.go
@@ -514,7 +514,7 @@ func (s *SqliteStore) CalculateUsageStats(ctx context.Context, accountID string,
 		}
 
 		err = tx.Model(&User{}).
-			Where("account_id = ?", accountID).
+			Where("account_id = ? AND is_service_user = ?", accountID, false).
 			Count(&stats.TotalUsers).Error
 		if err != nil {
 			return fmt.Errorf("get total users: %w", err)

diff --git a/management/server/testdata/store_stats.json b/management/server/testdata/store_stats.json
@@ -23,6 +23,10 @@
         },
         "user-4-account-1": {
           "Id": "user-4-account-1"
+        },
+        "user-5-account-1": {
+          "Id": "user-5-account-1",
+          "IsServiceUser": true
         }
       },
       "Peers": {