Merge pull request #175 from matomo-org/PG-4087-fix-retain-case-logic

Changes lower case logic to DB, #PG-4087, #174
matomo-org · Jan 15, 2025 · 0c3df01 · 0c3df01
2 parents f6a2868 + 5c43380
commit 0c3df01
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/MarketingCampaignsReporting.php b/MarketingCampaignsReporting.php
@@ -40,6 +40,7 @@ public function registerEvents()
             'Report.filterReports'                        => 'removeOriginalCampaignReport',
             'Insights.addReportToOverview'                => 'addReportToInsightsOverview',
             'AssetManager.getStylesheetFiles'             => 'getStylesheetFiles',
+            'Plugin.shouldLowerCampaignCase'              => 'shouldLowerCampaignCase',
         );
     }
 
@@ -120,4 +121,10 @@ public function isTrackerPlugin()
     {
         return true;
     }
+
+    public function shouldLowerCampaignCase($pluginName, &$shouldLowerCampaignCase)
+    {
+        $systemSettings = StaticContainer::get(SystemSettings::class);
+        $shouldLowerCampaignCase = !$systemSettings->doNotChangeCaseOfUtmParameters->getValue();
+    }
 }
diff --git a/RecordBuilders/CampaignReporting.php b/RecordBuilders/CampaignReporting.php
@@ -79,6 +79,16 @@ protected function aggregate(ArchiveProcessor $archiveProcessor): array
      */
     protected function aggregateFromLogs(LogAggregator $logAggregator, array $records, $dimensions, $table, $aggregatorMethod): void
     {
+        $systemSettings = StaticContainer::get(SystemSettings::class);
+        if (!$systemSettings->doNotChangeCaseOfUtmParameters->getValue()) {
+            $newDimensions = [];
+            foreach ($dimensions as $dimension) {
+                $lowerDimensionColumn = $table . '.' . $dimension;
+                $newDimensions[$dimension] = "LOWER($lowerDimensionColumn)";
+            }
+            $dimensions = $newDimensions;
+        }
+
         $whereClause = $table . ".referer_type = " . Common::REFERRER_TYPE_CAMPAIGN;
         $query = $aggregatorMethod === 'queryConversionsByDimension' && version_compare(Version::VERSION, '5.2.0-b6', '>=')
             ? $logAggregator->$aggregatorMethod($dimensions, $whereClause, [], [], false, false, true)
@@ -134,7 +144,6 @@ protected function aggregateFromLogs(LogAggregator $logAggregator, array $record
 
     protected function getLabelFromRowDimensions(array $dimensionsAsLabel, array $row): string
     {
-        $systemSettings = StaticContainer::get(SystemSettings::class);
         $labels = [];
         foreach ($dimensionsAsLabel as $dimensionLabelPart) {
             if (
@@ -144,12 +153,8 @@ protected function getLabelFromRowDimensions(array $dimensionsAsLabel, array $ro
                 $labels[] = $row[$dimensionLabelPart];
             }
         }
-        $label = implode(Archiver::SEPARATOR_COMBINED_DIMENSIONS, $labels);
-        if ($label && !$systemSettings->doNotChangeCaseOfUtmParameters->getValue()) {
-            $label = Common::mb_strtolower($label);
-        }
 
-        return $label;
+        return implode(Archiver::SEPARATOR_COMBINED_DIMENSIONS, $labels);
     }
 
     protected function getRecordToDimensions(): array