Exclude service users from total user count

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

Hide file tree

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

diff --git a/management/server/file_store_test.go b/management/server/file_store_test.go
@@ -659,7 +659,7 @@ func newStore(t *testing.T) *FileStore {
 	return store
 }
 
-func TestFileStore_CalculateStats(t *testing.T) {
+func TestFileStore_CalculateUsageStats(t *testing.T) {
 	storeDir := t.TempDir()
 
 	err := util.CopyFileContents("testdata/store_stats.json", filepath.Join(storeDir, "store.json"))

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": {
@@ -122,6 +126,10 @@
         },
         "user-2-account-2": {
           "Id": "user-1-account-2"
+        },
+        "user-3-account-1": {
+          "Id": "user-3-account-1",
+          "IsServiceUser": true
         }
       },
       "Peers": {