Merge pull request #441 from Amdrel/T396683

Fix graph date range showing irrelevant dates

Author: katydidnot

extlinks/organisations/views.py

@@ -18,6 +18,11 @@
     PageProjectAggregate,
     UserAggregate,
 )
+from extlinks.aggregates.storage import (
+    find_unique,
+    calculate_totals,
+    download_aggregates,
+)
 from extlinks.common.forms import FilterForm
 from extlinks.common.helpers import (
     get_linksearchtotal_data_by_time,
@@ -192,10 +197,16 @@ def _fill_chart_context(self, context, queryset_filter):
         existing_link_aggregates = {}
         eventstream_dates = []
         eventstream_net_change = []
-        current_date = date.today()
         filtered_link_aggregate = LinkAggregate.objects.filter(queryset_filter)
         to_date = None
 
+        # Figure out what date the graph should end on.
+        date_cursor = self.request.GET.get("end_date")
+        if date_cursor:
+            date_cursor = datetime.strptime(date_cursor, "%Y-%m-%d").date()
+        else:
+            date_cursor = date.today()
+            
         if filtered_link_aggregate.exists():
             earliest_link_date = filtered_link_aggregate.earliest("full_date").full_date
 
@@ -207,7 +218,21 @@ def _fill_chart_context(self, context, queryset_filter):
         else:
             # No link information from that collection, so setting earliest_link_date
             # to the first of the current month
-            earliest_link_date = current_date.replace(day=1)
+            earliest_link_date = date_cursor.replace(day=1)
+
+        links_aggregated_date = []
+
+        # Download aggregates from object storage and calculate totals grouped
+        # by year and month.
+        totals = calculate_totals(
+            download_aggregates(
+                prefix="aggregates_linkaggregate",
+                queryset_filter=queryset_filter,
+                to_date=to_date,
+            ),
+            group_by=lambda record: (record["year"], record["month"]),
+        )
+        links_aggregated_date.extend(totals)
 
         links_aggregated_date = []
 
@@ -222,7 +247,7 @@ def _fill_chart_context(self, context, queryset_filter):
             group_by=lambda record: (record["year"], record["month"]),
         )
         links_aggregated_date.extend(totals)
-
+        
         # Fetch remaining aggregates that are present in the database and
         # append them after the aggregates from the archives.
         links_aggregated_date.extend(
@@ -242,10 +267,10 @@ def _fill_chart_context(self, context, queryset_filter):
                 earliest_link_date = full_date
 
         # Filling an array of dates that should be in the chart
-        while current_date >= earliest_link_date:
-            dates.append(current_date.strftime("%Y-%m"))
+        while date_cursor >= earliest_link_date:
+            dates.append(date_cursor.strftime("%Y-%m"))
             # Figure out what the last month is regardless of today's date
-            current_date = current_date.replace(day=1) - timedelta(days=1)
+            date_cursor = date_cursor.replace(day=1) - timedelta(days=1)
 
         dates = dates[::-1]
 

extlinks/programs/views.py

@@ -1,4 +1,8 @@
 import json
+import json
+
+from datetime import date, timedelta, datetime
+from logging import getLogger
 
 from datetime import date, timedelta
 from logging import getLogger
@@ -125,7 +129,13 @@ def _fill_chart_context(self, context, queryset_filter):
         existing_link_aggregates = {}
         eventstream_dates = []
         eventstream_net_change = []
-        current_date = date.today()
+
+        # Figure out what date the graph should end on.
+        date_cursor = self.request.GET.get("end_date")
+        if date_cursor:
+            date_cursor = datetime.strptime(date_cursor, "%Y-%m-%d").date()
+        else:
+            date_cursor = date.today()
 
         # Query program-level totals from top organisations since it is the
         # smallest totals table that's available.
@@ -136,7 +146,7 @@ def _fill_chart_context(self, context, queryset_filter):
         else:
             # No link information from that collection, so setting earliest_link_date
             # to the first of the current month
-            earliest_total_date = current_date.replace(day=1)
+            earliest_total_date = date_cursor.replace(day=1)
 
         # We can GROUP BY 'full_date' as if it was just year and month as
         # program totals always set the day to the last day of the month.
@@ -149,10 +159,10 @@ def _fill_chart_context(self, context, queryset_filter):
         )
 
         # Filling an array of dates that should be in the chart
-        while current_date >= earliest_total_date:
-            dates.append(current_date.strftime("%Y-%m"))
+        while date_cursor >= earliest_total_date:
+            dates.append(date_cursor.strftime("%Y-%m"))
             # Figure out what the last month is regardless of today's date
-            current_date = current_date.replace(day=1) - timedelta(days=1)
+            date_cursor = date_cursor.replace(day=1) - timedelta(days=1)
 
         dates = dates[::-1]