almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-04-28 19:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat: add more users counts in /stats/ (#2555)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Details
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Details
Test & Docs / lint (push) Waiting to run
Details

Browse source
This commit is contained in:
Yohan Boniface 2025-03-10 16:56:29 +01:00 committed by GitHub
commit 3b195e562a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
umap/tests/test_views.py
View file

@ -185,6 +185,10 @@ def test_stats_empty(client):
"users_count": 0, "users_count": 0,
"active_sessions": 0, "active_sessions": 0,
"version": VERSION, "version": VERSION,
"editors_count": 0,
"members_count": 0,
"orphans_count": 0,
"owners_count": 0,
} }
@ -202,6 +206,10 @@ def test_stats_basic(client, map, datalayer, user2):
"users_count": 2, "users_count": 2,
"active_sessions": 0, "active_sessions": 0,
"version": VERSION, "version": VERSION,
"editors_count": 0,
"members_count": 0,
"orphans_count": 1,
"owners_count": 1,
} }

11
umap/views.py
View file

@ -1372,6 +1372,13 @@ class PictogramJSONList(ListView):
def stats(request): def stats(request):
last_week = make_aware(datetime.now()) - timedelta(days=7) last_week = make_aware(datetime.now()) - timedelta(days=7)
users = User.objects.values_list("pk", flat=True)
owners = set(
Map.objects.filter(owner__isnull=False).values_list("owner", flat=True)
)
editors = set(Map.editors.through.objects.values_list("user_id", flat=True))
members = set(Team.users.through.objects.values_list("user_id", flat=True))
orphans = set(users) - owners - editors - members
return simple_json_response( return simple_json_response(
**{ **{
"version": VERSION, "version": VERSION,
@ -1386,6 +1393,10 @@ def stats(request):
"active_sessions": Session.objects.filter( "active_sessions": Session.objects.filter(
expire_date__gt=datetime.utcnow() expire_date__gt=datetime.utcnow()
).count(), ).count(),
"owners_count": len(owners),
"editors_count": len(editors),
"members_count": len(members),
"orphans_count": len(orphans),
} }
) )