From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sat, 18 Mar 2023 21:31:27 +0000 (-0700)
Subject: simplify character count query
X-Git-Tag: v1.14.0-beta.rc1~32^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bdf0aae14e025e0184c0e7f7dfce1644765cd85;p=thirdparty%2Fpaperless-ngx.git

simplify character count query

Co-Authored-By: Trenton H <797416+stumpylog@users.noreply.github.com>
---

diff --git a/src/documents/views.py b/src/documents/views.py
index ede5e0d90d..9a47d928d6 100644
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -20,6 +20,7 @@ from django.db.models import Case
 from django.db.models import Count
 from django.db.models import IntegerField
 from django.db.models import Max
+from django.db.models import Sum
 from django.db.models import When
 from django.db.models.functions import Length
 from django.db.models.functions import Lower
@@ -814,14 +815,11 @@ class StatisticsView(APIView):
         )
 
         character_count = (
-            sum(
-                Document.objects.annotate(characters=Length("content")).values_list(
-                    "characters",
-                    flat=True,
-                ),
+            Document.objects.annotate(
+                characters=Length("content"),
             )
-            if documents_total > 0
-            else 0
+            .aggregate(Sum("characters"))
+            .get("characters__sum")
         )
 
         return Response(