Add transaction events to django admin org view

organizations_ext/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from django.db.models import Sum
+from django.db.models import Sum, Count
 from organizations.base_admin import (
     BaseOrganizationAdmin,
     BaseOrganizationUserAdmin,
@@ -19,20 +19,42 @@ class OrganizationUserInline(admin.StackedInline):
 
 
 class OrganizationAdmin(BaseOrganizationAdmin):
-    list_display = ["name", "is_active", "is_accepting_events", "event_count"]
+    list_per_page = 50
+    list_display = [
+        "name",
+        "is_active",
+        "is_accepting_events",
+        "issue_events",
+        "transaction_events",
+        "total_events",
+    ]
+    list_filter = ("is_active", "is_accepting_events")
     inlines = [OrganizationUserInline, OwnerInline]
     show_full_result_count = False
 
-    def event_count(self, obj):
-        return obj.event_count
+    def issue_events(self, obj):
+        return obj.issue_events
+
+    def transaction_events(self, obj):
+        return obj.transaction_events
+
+    def total_events(self, obj):
+        total = 0
+        issue = self.issue_events(obj)
+        if issue:
+            total += issue
+        total += self.transaction_events(obj)
+        return total
 
     def get_queryset(self, request):
         queryset = super().get_queryset(request)
-        queryset = queryset.annotate(event_count=Sum("projects__issue__count"))
+        queryset = queryset.annotate(
+            issue_events=Sum("projects__issue__count"),
+            transaction_events=Count("projects__transactionevent"),
+        )
         return queryset
 
 
-
 class OrganizationUserAdmin(BaseOrganizationUserAdmin):
     list_display = ["user", "organization", "role"]