diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-04-17 09:44:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 09:44:45 +0300 |
| commit | 9b359e1525ccf65013376cf75b5eb406d29b5f4b (patch) | |
| tree | 116436609ca6ff8f41e6ac319a2ec7a5ff85a204 | |
| parent | 934ad5ab3551e2d0994e4168e0b6503f3bde1cf4 (diff) | |
Use archive for userId segment suggested values (#15824)
* Use archive for userId segment suggested values
* fix some tests
18 files changed, 46 insertions, 0 deletions
diff --git a/plugins/CoreHome/Columns/UserId.php b/plugins/CoreHome/Columns/UserId.php index cf5b16db99..0c3a37b36b 100644 --- a/plugins/CoreHome/Columns/UserId.php +++ b/plugins/CoreHome/Columns/UserId.php @@ -12,6 +12,7 @@ use Piwik\Cache; use Piwik\DataTable; use Piwik\DataTable\Map; use Piwik\Metrics; +use Piwik\Plugin; use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Plugins\VisitsSummary\API as VisitsSummaryApi; use Piwik\Tracker\Request; @@ -39,6 +40,13 @@ class UserId extends VisitDimension */ protected $columnType = 'VARCHAR(200) NULL'; + public function __construct() + { + if (Plugin\Manager::getInstance()->isPluginActivated('UserId')) { + $this->suggestedValuesApi = 'UserId.getUsers'; + } + } + /** * @param Request $request * @param Visitor $visitor diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__UserId.getUsers_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__UserId.getUsers_month.xml index 66ddc67d77..e93486db7f 100644 --- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__UserId.getUsers_month.xml +++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__UserId.getUsers_month.xml @@ -11,6 +11,7 @@ <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <segment>userId==user3</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>2</sum_daily_nb_users> + <segment>userId==user1</segment> </row> </result>
\ No newline at end of file diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml index 88cc874456..0b5f83f67f 100644 --- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml +++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml @@ -11,6 +11,7 @@ <sum_daily_nb_uniq_visitors>40</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>3</sum_daily_nb_users> + <segment>userId==user4</segment> </row> <row> <label>user3</label> @@ -23,6 +24,7 @@ <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <segment>userId==user3</segment> </row> <row> <label>user2</label> @@ -35,6 +37,7 @@ <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <segment>userId==user2</segment> </row> <row> <label>user1</label> @@ -47,5 +50,6 @@ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <segment>userId==user1</segment> </row> </result>
\ No newline at end of file diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml index 9f798cd7bf..cf949e8960 100644 --- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml +++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml @@ -11,6 +11,7 @@ <sum_daily_nb_uniq_visitors>40</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>3</sum_daily_nb_users> + <segment>userId==user4</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>2</sum_daily_nb_users> + <segment>userId==user1</segment> </row> </result>
\ No newline at end of file diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__UserId.getUsers_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__UserId.getUsers_month.xml index 2fe5964a40..a43820c465 100644 --- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__UserId.getUsers_month.xml +++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__UserId.getUsers_month.xml @@ -11,6 +11,7 @@ <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <segment>userId==user3</segment> </row> <row> <label>user2</label> @@ -23,5 +24,6 @@ <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <segment>userId==user2</segment> </row> </result>
\ No newline at end of file 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 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml index 2534a6173c..e535c0e66b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml @@ -11,6 +11,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segment>userId==user1</segment> </row> <row> <label>commonuser</label> @@ -23,6 +24,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segment>userId==commonuser</segment> </row> <row> <label>user2</label> @@ -35,5 +37,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> + <segment>userId==user2</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserId.getUsers_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserId.getUsers_day.xml index 582741e8d1..cdd2992728 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserId.getUsers_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserId.getUsers_day.xml @@ -11,6 +11,7 @@ <bounce_count>5</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user0</segment> </row> <row> <label>user1</label> @@ -23,6 +24,7 @@ <bounce_count>5</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user1</segment> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserId.getUsers_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserId.getUsers_day.xml index 582741e8d1..cdd2992728 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserId.getUsers_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__UserId.getUsers_day.xml @@ -11,6 +11,7 @@ <bounce_count>5</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user0</segment> </row> <row> <label>user1</label> @@ -23,6 +24,7 @@ <bounce_count>5</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user1</segment> </row> <row> <label>Others</label> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserId.getUsers_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserId.getUsers_day.xml index 582741e8d1..cdd2992728 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserId.getUsers_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserId.getUsers_day.xml @@ -11,6 +11,7 @@ <bounce_count>5</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user0</segment> </row> <row> <label>user1</label> @@ -23,6 +24,7 @@ <bounce_count>5</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user1</segment> </row> <row> <label>Others</label> |