Exclude amendments from totals and counts

Code4PuertoRico · Aug 21, 2019 · a9573be · a9573be
1 parent 853ccb4
commit a9573be
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 12 deletions.
diff --git a/contratospr/api/filters.py b/contratospr/api/filters.py
@@ -144,9 +144,13 @@ def filter_entities(self, queryset, name, value):
             .distinct()
             .annotate(
                 contracts_total=Sum(
-                    "contract__amount_to_pay", filter=Q(contract__entity__in=value)
+                    "contract__amount_to_pay",
+                    filter=Q(contract__parent=None, contract__entity__in=value),
+                ),
+                contracts_count=Count(
+                    "contract",
+                    filter=Q(contract__parent=None, contract__entity__in=value),
                 ),
-                contracts_count=Count("contract", filter=Q(contract__entity__in=value)),
             )
         )
 
@@ -224,9 +228,12 @@ def filter_entity_by_id(self, queryset, name, value):
             .distinct()
             .annotate(
                 contracts_total=Sum(
-                    "contract__amount_to_pay", filter=Q(contract__in=contracts)
+                    "contract__amount_to_pay",
+                    filter=Q(contract__parent=None, contract__in=contracts),
+                ),
+                contracts_count=Count(
+                    "contract", filter=Q(contract__parent=None, contract__in=contracts)
                 ),
-                contracts_count=Count("contract", filter=Q(contract__in=contracts)),
             )
         )
 
@@ -241,8 +248,11 @@ def filter_contractors_by_id(self, queryset, name, value):
             .distinct()
             .annotate(
                 contracts_total=Sum(
-                    "contract__amount_to_pay", filter=Q(contract__in=contracts)
+                    "contract__amount_to_pay",
+                    filter=Q(contract__parent=None, contract__in=contracts),
+                ),
+                contracts_count=Count(
+                    "contract", filter=Q(contract__parent=None, contract__in=contracts)
                 ),
-                contracts_count=Count("contract", filter=Q(contract__in=contracts)),
             )
         )
diff --git a/contratospr/api/views.py b/contratospr/api/views.py
@@ -128,7 +128,8 @@ def get(self, request, format=None):
         start_date, end_date = get_fiscal_year_range(fiscal_year)
 
         contracts = (
-            Contract.objects.select_related(
+            Contract.objects.without_amendments()
+            .select_related(
                 "document",
                 "entity",
                 "service",
@@ -142,9 +143,7 @@ def get(self, request, format=None):
                 "contractors", "parent__contractors", "amendments", "parent__amendments"
             )
             .filter(
-                parent=None,
-                effective_date_from__gte=start_date,
-                effective_date_from__lte=end_date,
+                effective_date_from__gte=start_date, effective_date_from__lte=end_date
             )
         )
 

diff --git a/contratospr/api/viewsets.py b/contratospr/api/viewsets.py
@@ -86,8 +86,7 @@ def spending_over_time(self, request):
             )
 
         queryset = (
-            # TODO: should amendments be excluded?
-            queryset.filter(parent=None)
+            queryset.without_amendments()
             .annotate(month=TruncMonth("date_of_grant"))
             .values("month")
             .annotate(total=Sum("amount_to_pay"), count=Count("id"))

diff --git a/contratospr/contracts/models.py b/contratospr/contracts/models.py
@@ -19,6 +19,7 @@
 from ..utils.filepreviews import FilePreviews
 from ..utils.models import BaseModel
 from ..utils.pdftotext import pdf_to_text
+from .queryset import ContractQuerySet
 
 if settings.FILEPREVIEWS_API_KEY and settings.FILEPREVIEWS_API_SECRET:
     filepreviews = FilePreviews(
@@ -257,6 +258,8 @@ class Contract(BaseModel):
 
     search_vector = SearchVectorField(null=True)
 
+    objects = ContractQuerySet.as_manager()
+
     class Meta:
         indexes = [GinIndex(fields=["search_vector"])]
 

diff --git a/contratospr/contracts/queryset.py b/contratospr/contracts/queryset.py
@@ -0,0 +1,11 @@
+from django.db import models
+
+
+class ContractQuerySet(models.QuerySet):
+    def amendments(self):
+        # Amended contracts
+        return self.filter(parent__isnull=False)
+
+    def without_amendments(self):
+        # Contracts excluding amendments
+        return self.filter(parent=None)