ensure same column ordering as before

matomo-org · Jun 28, 2023 · a565ea3 · a565ea3
1 parent 776e269
commit a565ea3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/plugins/VisitTime/RecordBuilders/LocalTime.php b/plugins/VisitTime/RecordBuilders/LocalTime.php
@@ -13,6 +13,7 @@
 use Piwik\ArchiveProcessor\Record;
 use Piwik\DataTable;
 use Piwik\DataTable\Filter\Sort;
+use Piwik\Metrics;
 use Piwik\Plugins\VisitTime\Archiver;
 
 class LocalTime extends Base
@@ -32,7 +33,18 @@ protected function aggregate(ArchiveProcessor $archiveProcessor): array
 
         $query = $logAggregator->queryVisitsByDimension(["label" => "HOUR(log_visit.visitor_localtime)"]);
         while ($row = $query->fetch()) {
-            $record->sumRowWithLabel($row['label'], $row);
+            $columns = [
+                Metrics::INDEX_NB_UNIQ_VISITORS => $row[Metrics::INDEX_NB_UNIQ_VISITORS],
+                Metrics::INDEX_NB_VISITS => $row[Metrics::INDEX_NB_VISITS],
+                Metrics::INDEX_NB_ACTIONS => $row[Metrics::INDEX_NB_ACTIONS],
+                Metrics::INDEX_NB_USERS => $row[Metrics::INDEX_NB_USERS],
+                Metrics::INDEX_MAX_ACTIONS => $row[Metrics::INDEX_MAX_ACTIONS],
+                Metrics::INDEX_SUM_VISIT_LENGTH => $row[Metrics::INDEX_SUM_VISIT_LENGTH],
+                Metrics::INDEX_BOUNCE_COUNT => $row[Metrics::INDEX_BOUNCE_COUNT],
+                Metrics::INDEX_NB_VISITS_CONVERTED => $row[Metrics::INDEX_NB_VISITS_CONVERTED],
+            ];
+
+            $record->sumRowWithLabel($row['label'], $columns);
         }
 
         $this->ensureAllHoursAreSet($record);

diff --git a/plugins/VisitTime/RecordBuilders/ServerTime.php b/plugins/VisitTime/RecordBuilders/ServerTime.php
@@ -35,7 +35,19 @@ protected function aggregate(ArchiveProcessor $archiveProcessor): array
         $query = $logAggregator->queryVisitsByDimension(["label" => "HOUR(log_visit.visit_first_action_time)"]);
         while ($row = $query->fetch()) {
             $row['label'] = $this->convertTimeToLocalTimezone($row['label'], $archiveProcessor);
-            $record->sumRowWithLabel($row['label'], $row);
+
+            $columns = [
+                Metrics::INDEX_NB_UNIQ_VISITORS => $row[Metrics::INDEX_NB_UNIQ_VISITORS],
+                Metrics::INDEX_NB_VISITS => $row[Metrics::INDEX_NB_VISITS],
+                Metrics::INDEX_NB_ACTIONS => $row[Metrics::INDEX_NB_ACTIONS],
+                Metrics::INDEX_NB_USERS => $row[Metrics::INDEX_NB_USERS],
+                Metrics::INDEX_MAX_ACTIONS => $row[Metrics::INDEX_MAX_ACTIONS],
+                Metrics::INDEX_SUM_VISIT_LENGTH => $row[Metrics::INDEX_SUM_VISIT_LENGTH],
+                Metrics::INDEX_BOUNCE_COUNT => $row[Metrics::INDEX_BOUNCE_COUNT],
+                Metrics::INDEX_NB_VISITS_CONVERTED => $row[Metrics::INDEX_NB_VISITS_CONVERTED],
+            ];
+
+            $record->sumRowWithLabel($row['label'], $columns);
         }
 
         $query = $logAggregator->queryConversionsByDimension(["label" => "HOUR(log_conversion.server_time)"]);