Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2020-04-17 09:44:45 +0300
committerGitHub <noreply@github.com>2020-04-17 09:44:45 +0300
commit9b359e1525ccf65013376cf75b5eb406d29b5f4b (patch)
tree116436609ca6ff8f41e6ac319a2ec7a5ff85a204 /plugins/UserId
parent934ad5ab3551e2d0994e4168e0b6503f3bde1cf4 (diff)
Use archive for userId segment suggested values (#15824)
* Use archive for userId segment suggested values * fix some tests
Diffstat (limited to 'plugins/UserId')
-rw-r--r--plugins/UserId/API.php1
-rw-r--r--plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml3
-rw-r--r--plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml3
-rw-r--r--plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml3
-rw-r--r--plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml3
-rw-r--r--plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml2
-rw-r--r--plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml2
-rw-r--r--plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml1
-rw-r--r--plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml1
9 files changed, 19 insertions, 0 deletions
diff --git a/plugins/UserId/API.php b/plugins/UserId/API.php
index a76d6ee7cf..fd5a7607f1 100644
--- a/plugins/UserId/API.php
+++ b/plugins/UserId/API.php
@@ -40,6 +40,7 @@ class API extends \Piwik\Plugin\API
$dataTable->queueFilter('ReplaceColumnNames');
$dataTable->queueFilter('ReplaceSummaryRowLabel');
+ $dataTable->queueFilter('AddSegmentByLabel', array('userId'));
return $dataTable;
}
diff --git a/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml
index 5ef64951ca..76eef7b786 100644
--- a/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml
+++ b/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml
@@ -11,6 +11,7 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>userId==user1</segment>
</row>
<row>
<label>user2</label>
@@ -23,6 +24,7 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>userId==user2</segment>
</row>
<row>
<label>user3</label>
@@ -35,5 +37,6 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>userId==user3</segment>
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml
index 9ea8701a8b..fc8e450e2e 100644
--- a/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml
+++ b/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml
@@ -11,6 +11,7 @@
<sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>30</sum_daily_nb_users>
+ <segment>userId==user3</segment>
</row>
<row>
<label>user2</label>
@@ -23,6 +24,7 @@
<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>20</sum_daily_nb_users>
+ <segment>userId==user2</segment>
</row>
<row>
<label>user1</label>
@@ -35,5 +37,6 @@
<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>10</sum_daily_nb_users>
+ <segment>userId==user1</segment>
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml
index 8c564d45eb..c501a92a17 100644
--- a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml
+++ b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml
@@ -11,6 +11,7 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>userId==user3</segment>
</row>
<row>
<label>user2</label>
@@ -23,6 +24,7 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>userId==user2</segment>
</row>
<row>
<label>user1</label>
@@ -35,5 +37,6 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>userId==user1</segment>
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml
index 15683a3709..4c4facb17c 100644
--- a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml
+++ b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml
@@ -11,6 +11,7 @@
<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>10</sum_daily_nb_users>
+ <segment>userId==user1</segment>
</row>
<row>
<label>user2</label>
@@ -23,6 +24,7 @@
<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>20</sum_daily_nb_users>
+ <segment>userId==user2</segment>
</row>
<row>
<label>user3</label>
@@ -35,5 +37,6 @@
<sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>30</sum_daily_nb_users>
+ <segment>userId==user3</segment>
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml
index df266da1fa..663e10d76b 100644
--- a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml
+++ b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml
@@ -11,6 +11,7 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>userId==user2</segment>
</row>
<row>
<label>user3</label>
@@ -23,5 +24,6 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>userId==user3</segment>
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml
index 81fc70ff6f..0ebc46bfd4 100644
--- a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml
+++ b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml
@@ -11,6 +11,7 @@
<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>20</sum_daily_nb_users>
+ <segment>userId==user2</segment>
</row>
<row>
<label>user1</label>
@@ -23,5 +24,6 @@
<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>10</sum_daily_nb_users>
+ <segment>userId==user1</segment>
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml
index f0596f12ca..e65c3830df 100644
--- a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml
+++ b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml
@@ -11,5 +11,6 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>userId==user2</segment>
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml
index dff804011e..14cd163444 100644
--- a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml
+++ b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml
@@ -11,5 +11,6 @@
<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>20</sum_daily_nb_users>
+ <segment>userId==user2</segment>
</row>
</result> \ No newline at end of file