Only include APPROVED users for stats on homepage

dandiapi/api/models/asset.py

@@ -218,10 +218,7 @@ def is_different_from(
         if self.path != path:
             return True
 
-        if self.metadata != metadata:
-            return True
-
-        return False
+        return self.metadata != metadata
 
     @staticmethod
     def dandi_asset_id(asset_id: str | uuid.UUID):

dandiapi/api/tests/test_stats.py

@@ -1,15 +1,18 @@
 from __future__ import annotations
 
+from django.contrib.auth.models import User
 import pytest
 
+from dandiapi.api.models import UserMetadata
+
 
 @pytest.mark.django_db()
 def test_stats_baseline(api_client):
     assert api_client.get('/api/stats/').data == {
         'dandiset_count': 0,
         'published_dandiset_count': 0,
-        # django-guardian automatically creates an AnonymousUser
-        'user_count': 1,
+        # django-guardian automatically creates an AnonymousUser, but user is not approved
+        'user_count': 0,
         'size': 0,
     }
 
@@ -33,10 +36,23 @@ def test_stats_published(api_client, published_version_factory):
 
 @pytest.mark.django_db()
 def test_stats_user(api_client, user):
+    # Reset the User table for test
+    User.objects.all().delete()
+
+    # Create users with different statuses
+    approved_user_count = 0
+    for status in UserMetadata.Status.choices:
+        status_value = status[0]
+        user = User.objects.create(username=f'{status_value.lower()}_user')
+        UserMetadata.objects.create(user=user, status=status_value)
+        if status_value == UserMetadata.Status.APPROVED:
+            approved_user_count += 1
+
     stats = api_client.get('/api/stats/').data
 
-    # django-guardian automatically creates an AnonymousUser
-    assert stats['user_count'] == 2
+    # Assert that the user count only includes users with APPROVED status
+    assert stats['user_count'] == 1
+    assert stats['user_count'] == approved_user_count
 
 
 @pytest.mark.django_db()

dandiapi/api/views/stats.py

@@ -5,7 +5,7 @@
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 
-from dandiapi.api.models import Asset, Dandiset
+from dandiapi.api.models import Asset, Dandiset, UserMetadata
 
 
 # Cache this response for 12 hours
@@ -14,7 +14,7 @@
 def stats_view(self):
     dandiset_count = Dandiset.objects.count()
     published_dandiset_count = Dandiset.published_count()
-    user_count = User.objects.count()
+    user_count = User.objects.filter(metadata__status=UserMetadata.Status.APPROVED).count()
     size = Asset.total_size()
     return Response(
         {