fix: seat count calculation in plan detail resolver (#418)

backend/backend/graphene/queries/quotas.py

@@ -1,5 +1,11 @@
 from api.utils.access.permissions import user_is_org_member
-from api.models import App, Organisation, OrganisationMember, OrganisationMemberInvite
+from api.models import (
+    App,
+    Organisation,
+    OrganisationMember,
+    OrganisationMemberInvite,
+    ServiceAccount,
+)
 from backend.quotas import PLAN_CONFIG
 from django.utils import timezone
 
@@ -11,13 +17,24 @@ def resolve_organisation_plan(self, info, organisation_id):
 
         plan = PLAN_CONFIG[organisation.plan]
 
-        plan["user_count"] = (
-            OrganisationMember.objects.filter(
+        plan["seats_used"] = {
+            "users": (
+                OrganisationMember.objects.filter(
+                    organisation=organisation, deleted_at=None
+                ).count()
+                + OrganisationMemberInvite.objects.filter(
+                    organisation=organisation,
+                    valid=True,
+                    expires_at__gte=timezone.now(),
+                ).count()
+            ),
+            "service_accounts": ServiceAccount.objects.filter(
                 organisation=organisation, deleted_at=None
-            ).count()
-            + OrganisationMemberInvite.objects.filter(
-                organisation=organisation, valid=True, expires_at__gte=timezone.now()
-            ).count()
+            ).count(),
+        }
+
+        plan["seats_used"]["total"] = (
+            plan["seats_used"]["users"] + plan["seats_used"]["service_accounts"]
         )
 
         plan["app_count"] = App.objects.filter(