[statistics] fix: add missing last period to custom date ranges (#3661)

* fix: last node in previous data matches first node of current data * fix: add previous period support for custom periods * test: update to show previous period for custom range
flarum · Nov 6, 2022 · 6e1a944 · 6e1a944
1 parent 5733a8e
commit 6e1a944
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/js/src/admin/components/StatisticsWidget.tsx b/js/src/admin/components/StatisticsWidget.tsx
@@ -348,7 +348,7 @@ export default class StatisticsWidget extends DashboardWidget {
           }
         : this.periods![this.selectedPeriod!];
     const periodLength = period.end - period.start;
-    const labels = [];
+    const labels: string[] = [];
     const thisPeriod = [];
     const lastPeriod = [];
 
@@ -373,7 +373,7 @@ export default class StatisticsWidget extends DashboardWidget {
       labels.push(label);
 
       thisPeriod.push(this.getPeriodCount(this.selectedEntity, { start: i, end: i + period.step }));
-      lastPeriod.push(this.getPeriodCount(this.selectedEntity, { start: i - periodLength, end: i - periodLength + period.step }));
+      lastPeriod.push(this.getPeriodCount(this.selectedEntity, { start: i - periodLength, end: i - periodLength }));
     }
 
     if (thisPeriod.length === 0) {

diff --git a/src/Api/Controller/ShowStatisticsData.php b/src/Api/Controller/ShowStatisticsData.php
@@ -126,8 +126,15 @@ private function getTimedStatistics(string $model)
 
     private function getTimedCounts(Builder $query, string $column, ?DateTime $startDate = null, ?DateTime $endDate = null)
     {
+        $diff = $startDate && $endDate ? $startDate->diff($endDate) : null;
+
         if (! isset($startDate)) {
-            $startDate = new DateTime('-365 days');
+            // need -12 months and period before that
+            $startDate = new DateTime('-2 years');
+        } else {
+            // If the start date is custom, we need to include an equal amount beforehand
+            // to show the data for the previous period.
+            $startDate = (new Carbon($startDate))->subtract($diff)->toDateTime();
         }
 
         if (! isset($endDate)) {

diff --git a/tests/integration/api/CanRequestCustomTimedStatisticsTest.php b/tests/integration/api/CanRequestCustomTimedStatisticsTest.php
@@ -73,12 +73,15 @@ public function can_request_timed_stats()
             'users' => [
                 $timeStart->copy()->getTimestamp() => 1,
                 $timeStart->copy()->subDays(1)->getTimestamp() => 1,
+                $timeStart->copy()->subDays(2)->getTimestamp() => 1,
             ], 'discussions' => [
                 $timeStart->copy()->getTimestamp() => 1,
                 $timeStart->copy()->subDays(1)->getTimestamp() => 2,
+                $timeStart->copy()->subDays(2)->getTimestamp() => 1,
             ], 'posts' => [
                 $timeStart->copy()->getTimestamp() => 2,
                 $timeStart->copy()->subDays(1)->getTimestamp() => 2,
+                $timeStart->copy()->subDays(2)->getTimestamp() => 1,
             ]
         ];