From ff4aa13ee9e05e105e19a216a9d914e2f55d9981 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Tue, 17 Sep 2024 17:47:10 -0700 Subject: [PATCH] revert change to Report that set initial processed metrics as ProcessedMetric instances, as those are meant to be added conditionally based on a query parameter. for API consumers this means to get all formulas they will need to use API.getProcessedReport --- core/Plugin/Report.php | 10 +- ...ames_lastN__API.getProcessedReport_day.xml | 3 + ...eces_lastN__API.getProcessedReport_day.xml | 3 + ...GetReportMetadata__API.getMetadata_day.xml | 12 - ...rtMetadata__API.getProcessedReport_day.xml | 12 - ...ortMetadata__API.getReportMetadata_day.xml | 428 +----------------- ...RawMetrics__API.getProcessedReport_day.xml | 12 - ...data_year__API.getProcessedReport_year.xml | 12 - 8 files changed, 13 insertions(+), 479 deletions(-) diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php index b47721dc517..b29ae402d88 100644 --- a/core/Plugin/Report.php +++ b/core/Plugin/Report.php @@ -120,7 +120,8 @@ class Report * @var array * @api */ - protected $processedMetrics = []; // default set in constructor + protected $processedMetrics = array('nb_actions_per_visit', 'avg_time_on_site', 'bounce_rate', 'conversion_rate'); + // for a little performance improvement we avoid having to call Metrics::getDefaultProcessedMetrics for each report /** * The semantic types for all metrics this report displays (including processed metrics). @@ -261,13 +262,6 @@ final public function __construct() $this->action = lcfirst($parts[4]); } - $this->processedMetrics = [ - new ActionsPerVisit(), - new AverageTimeOnSite(), - new BounceRate(), - new ConversionRate(), - ]; - $this->init(); } diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml index 9a63d9fd177..bd7ea8762a8 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml @@ -23,6 +23,9 @@ Interaction Rate + + $nb_interactions / $nb_impressions + number number diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml index 66c940035f0..43f76e9f4d7 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml @@ -23,6 +23,9 @@ Interaction Rate + + $nb_interactions / $nb_impressions + number number diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml index ba22e42f378..34d2772557c 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml @@ -29,20 +29,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml index 1b80488a832..39ae703b811 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml @@ -31,20 +31,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 65791fa24b5..56ba343ca8b 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -238,20 +238,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -321,20 +309,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -400,20 +376,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -484,20 +448,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -552,20 +502,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -636,20 +574,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -706,20 +630,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -792,20 +704,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -878,20 +778,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -963,20 +851,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -1032,20 +906,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -1102,20 +962,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -1194,20 +1042,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -1263,20 +1097,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -1328,20 +1148,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -1397,20 +1203,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -1487,20 +1279,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -1557,20 +1335,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -1642,20 +1408,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -1706,20 +1458,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -1774,20 +1512,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -1998,7 +1724,7 @@ $goals["idgoal=0"].revenue / ($nb_visits == 0 ? $goals["idgoal=0"].nb_conversions : $nb_visits) $goals["idgoal=0"].nb_conversions / $nb_visits - min($goals["idgoal=%s"].nb_conversions_page_uniq / $total_conversions, 1) + min($goals["idgoal=0"].nb_conversions_page_uniq / goal_0_total_conversions, 1) index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=getPageUrls&period=day&date=2009-01-04 index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=getPageUrls&period=day&date=2008-12-06,2009-01-04 @@ -2413,7 +2139,7 @@ $goals["idgoal=0"].revenue / ($nb_visits == 0 ? $goals["idgoal=0"].nb_conversions : $nb_visits) $goals["idgoal=0"].nb_conversions / $nb_visits - min($goals["idgoal=%s"].nb_conversions_page_uniq / $total_conversions, 1) + min($goals["idgoal=0"].nb_conversions_page_uniq / goal_0_total_conversions, 1) index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=getPageTitles&period=day&date=2009-01-04 index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=getPageTitles&period=day&date=2008-12-06,2009-01-04 @@ -2718,7 +2444,7 @@ The average of all values for this event - $sum_event_value / $nb_evens_with_value + $sum_event_value / $nb_events_with_value number @@ -2765,7 +2491,7 @@ The average of all values for this event - $sum_event_value / $nb_evens_with_value + $sum_event_value / $nb_events_with_value number @@ -2812,7 +2538,7 @@ The average of all values for this event - $sum_event_value / $nb_evens_with_value + $sum_event_value / $nb_events_with_value number @@ -3170,20 +2896,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -3256,20 +2970,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -3318,20 +3018,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -3409,20 +3097,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -3496,20 +3172,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -3586,20 +3250,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -3651,20 +3301,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number @@ -4414,20 +4052,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -4470,20 +4094,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -4527,20 +4137,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number @@ -4584,20 +4180,6 @@ Bounce Rate Conversion Rate - - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits - - - sum - sum - - - number - number - number number diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml index a3f8481d8c2..709ed7718cf 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml @@ -31,20 +31,8 @@ Revenue per Visit - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml index 394fcf82776..1baa24a6b24 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml @@ -30,20 +30,8 @@ Revenu par visite - $nb_actions / $nb_visits - $sum_visit_length / $nb_visits - $bounce_count / $nb_visits - $nb_visits_converted / $nb_visits $revenue / ($nb_visits != 0 ? $nb_visits : $nb_conversions) - - sum - sum - - - number - number - number number