From 34a50e79eb0e6f2efb3e629000e08fa86ef8168a Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Mon, 8 Sep 2014 22:33:18 +1200
Subject: [PATCH] refs #6162 when aggregating periods, do not sum 'Unique
Users' metric as this is not a valid operation.
---
core/ArchiveProcessor.php | 3 ++-
core/Metrics.php | 2 ++
...VariablesIntegrationTest__Live.getLastVisitsDetails_day.xml | 1 +
tests/PHPUnit/Core/MetricsTest.php | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index c1de099a26..800db50a11 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -154,7 +154,8 @@ class ArchiveProcessor
* @var array
*/
protected static $columnsToRenameAfterAggregation = array(
- Metrics::INDEX_NB_UNIQ_VISITORS => Metrics::INDEX_SUM_DAILY_NB_UNIQ_VISITORS
+ Metrics::INDEX_NB_UNIQ_VISITORS => Metrics::INDEX_SUM_DAILY_NB_UNIQ_VISITORS,
+ Metrics::INDEX_NB_USERS => Metrics::INDEX_SUM_DAILY_NB_USERS,
);
/**
diff --git a/core/Metrics.php b/core/Metrics.php
index bacfe12831..f99ff55e92 100644
--- a/core/Metrics.php
+++ b/core/Metrics.php
@@ -80,6 +80,7 @@ class Metrics
// Number of unique User IDs
const INDEX_NB_USERS = 39;
+ const INDEX_SUM_DAILY_NB_USERS = 40;
// Goal reports
const INDEX_GOAL_NB_CONVERSIONS = 1;
@@ -104,6 +105,7 @@ class Metrics
Metrics::INDEX_REVENUE => 'revenue',
Metrics::INDEX_GOALS => 'goals',
Metrics::INDEX_SUM_DAILY_NB_UNIQ_VISITORS => 'sum_daily_nb_uniq_visitors',
+ Metrics::INDEX_SUM_DAILY_NB_UNIQ_VISITORS => 'sum_daily_nb_users',
// Actions metrics
Metrics::INDEX_PAGE_NB_HITS => 'nb_hits',
diff --git a/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
index 463462262e..5d1eec5750 100644
--- a/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
+++ b/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
@@ -4,6 +4,7 @@
<idSite>1</idSite>
<idVisit>1</idVisit>
<visitIp>156.5.3.2</visitIp>
+ <userId />
<actionDetails>
<row>
diff --git a/tests/PHPUnit/Core/MetricsTest.php b/tests/PHPUnit/Core/MetricsTest.php
index fcddc44b7c..76ae1aa521 100644
--- a/tests/PHPUnit/Core/MetricsTest.php
+++ b/tests/PHPUnit/Core/MetricsTest.php
@@ -48,6 +48,7 @@ class Core_MetricsTest extends PHPUnit_Framework_TestCase
'revenue' => 23,
'goals' => 10,
'sum_daily_nb_uniq_visitors' => 11,
+ 'sum_daily_nb_users' => 40,
'nb_hits' => 12,
'sum_time_spent' => 13,
'sum_time_generation' => 30,
--
GitLab