Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: incorrect statistics in organisation admin list #4546

Merged
merged 2 commits into from
Aug 29, 2024
Merged

fix: incorrect statistics in organisation admin list #4546

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
988cccb
Fix statistics in organisation admin list
matthewelwell Aug 28, 2024
3c1406c
Fix filters
matthewelwell Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions api/organisations/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from __future__ import unicode_literals

from django.contrib import admin
from django.db.models import Count
from django.db.models import Count, Q

from organisations.models import Organisation, Subscription, UserOrganisation
from projects.models import Project
Expand Down Expand Up @@ -49,12 +49,18 @@ class OrganisationAdmin(admin.ModelAdmin):
list_filter = ("subscription__plan",)
search_fields = ("id", "name", "subscription__subscription_id", "users__email")

def get_queryset(self, request):
def get_queryset(self, request): # pragma: no cover
return (
Organisation.objects.select_related("subscription")
.annotate(
num_users=Count("users", distinct=True),
num_projects=Count("projects", distinct=True),
num_users=Count(
"users", distinct=True, filter=Q(users__is_active=True)
),
num_projects=Count(
"projects",
distinct=True,
filter=Q(projects__deleted_at__isnull=True),
),
)
.all()
)
Expand Down
Loading