Implements #9389 - UserId module, that adds a new Users report (#9883)

* Implement the UserId module, that adds a new Users report showing all unique user IDs and some aggregated data. Includes reindexing of raw visitors log into aggregated user ids table

* Update UserId module: add total_actions, total_events and total_searches columns; format dates

* Use an injected model instead of creating a new object

* Rework the UserId plugin to use core archiver instead of custom indexer

* Users report small changes:
- remove logger injection
- change archive record name
- add low population filter
- add all columns visualization
- add datatable_archiving_maximum_rows_userid_users configuration, default value is 50000

* Remove unused method parameter

* Users report: remove custom visualizations and add data-row-metadata attribute for every row

19 files changed, 853 insertions, 0 deletions

diff --git a/plugins/UserId/.gitignore b/plugins/UserId/.gitignore
new file mode 100644
index 0000000000..c8c9480010
--- /dev/null
+++ b/plugins/UserId/.gitignore
@@ -0,0 +1 @@
+tests/System/processed/*xml
\ No newline at end of file
diff --git a/plugins/UserId/API.php b/plugins/UserId/API.php
new file mode 100644
index 0000000000..6e29c3afc9
--- /dev/null
+++ b/plugins/UserId/API.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UserId;
+
+use Piwik\Archive;
+use Piwik\Metrics;
+use Piwik\Piwik;
+use Piwik\DataTable;
+use Piwik\DataTable\Row;
+
+/**
+ * API for plugin UserId. Allows to get User IDs table.
+ *
+ * @method static \Piwik\Plugins\UserId\API getInstance()
+ */
+class API extends \Piwik\Plugin\API
+{
+    /**
+     * Get DataTable with User Ids and some aggregated data. Supports pagination, sorting
+     * and filtering by user_id
+     *
+     * @param int $idSite
+     *
+     * @param     $period
+     * @param     $date
+     * @param     $segment
+     * @param     $expanded
+     * @param     $flat
+     *
+     * @return DataTable
+     */
+    public function getUsers($idSite, $period, $date, $segment = false, $expanded = false, $flat = false)
+    {
+        Piwik::checkUserHasViewAccess($idSite);
+        $archive = Archive::build($idSite, $period, $date, $segment);
+        $dataTable = $archive->getDataTable(Archiver::USERID_ARCHIVE_RECORD);
+
+        $dataTable->queueFilter('ReplaceColumnNames');
+        $dataTable->queueFilter('ReplaceSummaryRowLabel');
+
+        return $dataTable;
+    }
+}
diff --git a/plugins/UserId/Archiver.php b/plugins/UserId/Archiver.php
new file mode 100644
index 0000000000..3e20dcf141
--- /dev/null
+++ b/plugins/UserId/Archiver.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\UserId;
+use Piwik\Config;
+use Piwik\DataArray;
+use Piwik\DataTable;
+use Piwik\Metrics;
+
+/**
+ * Archiver that aggregates metrics per user ID (user_id field).
+ */
+class Archiver extends \Piwik\Plugin\Archiver
+{
+    const USERID_ARCHIVE_RECORD = "UserId_users";
+
+    const VISITOR_ID_FIELD = 'idvisitor';
+    const USER_ID_FIELD = 'user_id';
+
+    protected $maximumRowsInDataTableLevelZero;
+
+    function __construct($processor)
+    {
+        parent::__construct($processor);
+
+        $this->maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_userid_users'];
+    }
+
+    /**
+     * @var DataArray
+     */
+    protected $arrays;
+
+    /**
+     * Array to save visitor IDs for every user ID met during archiving process. We use it to
+     * fill metadata before actual inserting rows to DB.
+     * @var array
+     */
+    protected $visitorIdsUserIdsMap = array();
+
+    /**
+     * Archives data for a day period.
+     */
+    public function aggregateDayReport()
+    {
+        $this->arrays = new DataArray();
+        $this->aggregateUsers();
+        $this->insertDayReports();
+    }
+    /**
+     * Period archiving: simply sums up daily archives
+     */
+    public function aggregateMultipleReports()
+    {
+        $dataTableRecords = array(self::USERID_ARCHIVE_RECORD);
+        $columnsAggregationOperation = null;
+        $this->getProcessor()->aggregateDataTableRecords(
+            $dataTableRecords,
+            $this->maximumRowsInDataTableLevelZero,
+            $this->maximumRowsInDataTableLevelZero,
+            $columnToSort = 'nb_visits',
+            $columnsAggregationOperation,
+            $columnsToRenameAfterAggregation = null,
+            $countRowsRecursive = array());
+    }
+
+    /**
+     * Used to aggregate daily data per user ID
+     */
+    protected function aggregateUsers()
+    {
+        $userIdFieldName = self::USER_ID_FIELD;
+        $visitorIdFieldName = self::VISITOR_ID_FIELD;
+
+        /** @var Zend_Db_Statement $query */
+        $query = $this->getLogAggregator()->queryVisitsByDimension(
+            array(self::USER_ID_FIELD),
+            "$userIdFieldName IS NOT NULL AND $userIdFieldName != ''",
+            array("LOWER(HEX($visitorIdFieldName)) as $visitorIdFieldName")
+        );
+        if ($query === false) {
+            return;
+        }
+
+        $rowsCount = 0;
+        while ($row = $query->fetch()) {
+            $rowsCount++;
+            $this->arrays->sumMetricsVisits($row[$userIdFieldName], $row);
+            $this->rememberVisitorId($row);
+        }
+    }
+
+    /**
+     * Insert aggregated daily data serialized
+     *
+     * @throws \Exception
+     */
+    protected function insertDayReports()
+    {
+        /** @var DataTable $dataTable */
+        $dataTable = $this->arrays->asDataTable();
+        $this->setVisitorIds($dataTable);
+        $report = $dataTable->getSerialized($this->maximumRowsInDataTableLevelZero, null, Metrics::INDEX_NB_VISITS);
+        $this->getProcessor()->insertBlobRecord(self::USERID_ARCHIVE_RECORD, $report);
+    }
+
+    /**
+     * Remember visitor ID per user. We use it to fill metadata before actual inserting rows to DB.
+     *
+     * @param array $row
+     */
+    protected function rememberVisitorId($row)
+    {
+        if (!empty($row[self::USER_ID_FIELD]) && !empty($row[self::VISITOR_ID_FIELD])) {
+            $this->visitorIdsUserIdsMap[$row[self::USER_ID_FIELD]] = $row[self::VISITOR_ID_FIELD];
+        }
+    }
+
+    /**
+     * Fill visitor ID as metadata before actual inserting rows to DB.
+     *
+     * @param DataTable $dataTable
+     */
+    protected function setVisitorIds(DataTable $dataTable)
+    {
+        foreach ($dataTable->getRows() as $row) {
+            $userId = $row->getColumn('label');
+            if (isset($this->visitorIdsUserIdsMap[$userId])) {
+                $row->setMetadata(self::VISITOR_ID_FIELD, $this->visitorIdsUserIdsMap[$userId]);
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/plugins/UserId/Reports/Base.php b/plugins/UserId/Reports/Base.php
new file mode 100644
index 0000000000..1971a19840
--- /dev/null
+++ b/plugins/UserId/Reports/Base.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\UserId\Reports;
+
+use Piwik\Plugin\Report;
+
+abstract class Base extends Report
+{
+    protected function init()
+    {
+        $this->category = 'General_Visitors';
+    }
+}
diff --git a/plugins/UserId/Reports/GetUsers.php b/plugins/UserId/Reports/GetUsers.php
new file mode 100644
index 0000000000..c5914776c5
--- /dev/null
+++ b/plugins/UserId/Reports/GetUsers.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\UserId\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugin\Report;
+use Piwik\Plugin\ViewDataTable;
+use Piwik\View;
+
+/**
+ * A report showing all unique user IDs and some aggregated information about them. It also allows
+ * to open a popover with visitor details
+ */
+class GetUsers extends Base
+{
+    /**
+     * @return array
+     */
+    public static function getColumnsToDisplay()
+    {
+        return array(
+            'label', 'nb_visits', 'nb_actions', 'nb_visits_converted'
+        );
+    }
+
+    protected function init()
+    {
+        parent::init();
+
+        $this->name          = Piwik::translate('UsersManager_MenuUsers');
+        $this->menuTitle     = $this->name;
+        $this->documentation = '';
+
+        // This defines in which order your report appears in the mobile app, in the menu and in the list of widgets
+        $this->order = 1;
+    }
+
+    /**
+     * @param ViewDataTable $view
+     */
+    public function configureView(ViewDataTable $view)
+    {
+        $view->config->addTranslation('label', Piwik::translate('General_UserId'));
+        $view->config->addTranslation('nb_visits_converted', Piwik::translate('General_VisitConvertedGoal'));
+
+        /*
+         * Hide most of the table footer actions, leaving only export icons and pagination
+         */
+        $view->config->columns_to_display = $this->getColumnsToDisplay();
+        $view->config->show_all_views_icons = false;
+        $view->config->show_active_view_icon = false;
+        $view->config->show_related_reports = false;
+        $view->config->show_insights = false;
+        $view->config->show_pivot_by_subtable = false;
+        $view->config->show_flatten_table = false;
+        $view->config->disable_row_evolution = true;
+
+        // exclude users with less then 2 visits, when low population filter is active
+        $view->requestConfig->filter_excludelowpop_value = 2;
+    }
+}
diff --git a/plugins/UserId/UserId.php b/plugins/UserId/UserId.php
new file mode 100644
index 0000000000..b69f47c4e7
--- /dev/null
+++ b/plugins/UserId/UserId.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\UserId;
+
+use Piwik\Db;
+
+/**
+ * Plugin adds a new Users report showing all unique user IDs and some aggregated data
+ */
+class UserId extends \Piwik\Plugin
+{
+    /**
+     * Register event observers
+     *
+     * @return array
+     */
+    public function registerEvents()
+    {
+        return array(
+            // Add plugin's custom JS files
+            'AssetManager.getJavaScriptFiles' => 'getJavaScriptFiles',
+            // Add translations for the client side JS
+            'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
+        );
+    }
+
+    /**
+     * Add a custom JS to the page. It adds possibility to open visitor details popover for each
+     * user ID in a report table
+     *
+     * @param $jsFiles
+     */
+    public function getJavaScriptFiles(&$jsFiles)
+    {
+        $jsFiles[] = "plugins/UserId/javascripts/rowaction.js";
+    }
+
+    /**
+     * Add translations for the client side JS
+     *
+     * @param $translationKeys
+     */
+    public function getClientSideTranslationKeys(&$translationKeys)
+    {
+        $translationKeys[] = "Live_ViewVisitorProfile";
+    }
+}
diff --git a/plugins/UserId/images/visitordetails-hover.png b/plugins/UserId/images/visitordetails-hover.png
new file mode 100644
index 0000000000..523a8ac6b4
--- /dev/null
+++ b/plugins/UserId/images/visitordetails-hover.png
diff --git a/plugins/UserId/images/visitordetails.png b/plugins/UserId/images/visitordetails.png
new file mode 100644
index 0000000000..423392db75
--- /dev/null
+++ b/plugins/UserId/images/visitordetails.png
diff --git a/plugins/UserId/javascripts/rowaction.js b/plugins/UserId/javascripts/rowaction.js
new file mode 100644
index 0000000000..5fba72dbe4
--- /dev/null
+++ b/plugins/UserId/javascripts/rowaction.js
@@ -0,0 +1,73 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+/**
+ * This file registers the visitor details overlay row action on the user IDs list page.
+ */
+(function () {
+
+    var actionName = 'visitorDetails';
+
+    function DataTable_RowActions_VisitorDetails(dataTable) {
+        this.dataTable = dataTable;
+        this.actionName = actionName;
+        this.trEventName = 'piwikTriggerVisitorDetailsAction';
+    }
+
+    DataTable_RowActions_VisitorDetails.prototype = new DataTable_RowAction();
+
+    DataTable_RowActions_VisitorDetails.prototype.performAction = function (label, tr, e) {
+        var visitorId = this.getRowMetadata($(tr)).idvisitor || '';
+        if (visitorId.length > 0) {
+            DataTable_RowAction.prototype.openPopover.apply(this, ['module=Live&action=getVisitorProfilePopup&visitorId=' + visitorId]);
+        }
+    };
+
+    DataTable_RowActions_VisitorDetails.prototype.doOpenPopover = function (urlParam) {
+        Piwik_Popover.createPopupAndLoadUrl(urlParam, _pk_translate('Live_VisitorProfile'), 'visitor-profile-popup');
+    };
+
+    DataTable_RowActions_Registry.register({
+
+        name: actionName,
+
+        instance: null,
+
+        dataTableIcon: 'plugins/UserId/images/visitordetails.png',
+        dataTableIconHover: 'plugins/UserId/images/visitordetails-hover.png',
+
+        order: 30,
+
+        dataTableIconTooltip: [
+            _pk_translate('Live_ViewVisitorProfile'),
+            ''
+        ],
+
+        isAvailableOnReport: function (dataTableParams, undefined) {
+            return dataTableParams.module == 'UserId';
+        },
+
+        isAvailableOnRow: function (dataTableParams, tr) {
+            return DataTable_RowAction.prototype.getRowMetadata(tr).hasOwnProperty('idvisitor');
+        },
+
+        createInstance: function (dataTable, param) {
+            if (dataTable !== null && typeof dataTable.visitorDetailsInstance != 'undefined') {
+                return dataTable.segmentVisitorLogInstance;
+            }
+
+            var instance = new DataTable_RowActions_VisitorDetails(dataTable);
+            if (dataTable !== null) {
+                dataTable.visitorDetailsInstance = instance;
+            }
+
+            this.instance = instance;
+
+            return instance;
+        }
+    });
+})();
\ No newline at end of file
diff --git a/plugins/UserId/tests/Fixtures/TrackFewVisitsAndCreateUsers.php b/plugins/UserId/tests/Fixtures/TrackFewVisitsAndCreateUsers.php
new file mode 100644
index 0000000000..3c5ac0fcbd
--- /dev/null
+++ b/plugins/UserId/tests/Fixtures/TrackFewVisitsAndCreateUsers.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\UserId\tests\Fixtures;
+
+use Piwik\Date;
+use Piwik\Plugins\UserId\API;
+use Piwik\Tests\Framework\Fixture;
+
+/**
+ * Generates visits with user IDs and creates the user IDs index for testing
+ */
+class TrackFewVisitsAndCreateUsers extends Fixture
+{
+    public $dateTime = '2010-02-01 11:22:33';
+    public $idSite = 1;
+
+    public function setUp()
+    {
+        if (!self::siteCreated($idSite = 1)) {
+            self::createWebsite($this->dateTime);
+        }
+
+        $this->trackVisits();
+    }
+
+    private function trackVisits()
+    {
+        $t = self::getTracker($this->idSite, $this->dateTime, $defaultInit = true);
+        $t->setTokenAuth(self::getTokenAuth());
+        $t->enableBulkTracking();
+
+        foreach (array('user1', 'user2', 'user3') as $key => $userId) {
+            for ($numVisits = 0; $numVisits < ($key+1) * 10; $numVisits++) {
+                $t->setUserId($userId);
+                if ($numVisits % 5 == 0) {
+                    $t->doTrackSiteSearch('some search term');
+                }
+                if ($numVisits % 4 == 0) {
+                    $t->doTrackEvent('Event action', 'event cat');
+                }
+                $t->setForceNewVisit();
+                $t->setUrl('http://example.org/my/dir/page' . ($numVisits % 4));
+
+                $visitDateTime = Date::factory($this->dateTime)->addDay($numVisits)->getDatetime();
+                $t->setForceVisitDateTime($visitDateTime);
+
+                self::assertTrue($t->doTrackPageView('incredible title ' . ($numVisits % 3)));
+            }
+        }
+
+        self::checkBulkTrackingResponse($t->doBulkTrack());
+    }
+}
\ No newline at end of file
diff --git a/plugins/UserId/tests/System/ApiTest.php b/plugins/UserId/tests/System/ApiTest.php
new file mode 100644
index 0000000000..ca73c2792d
--- /dev/null
+++ b/plugins/UserId/tests/System/ApiTest.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\UserId\tests\System;
+
+use Piwik\Plugins\UserId\tests\Fixtures\TrackFewVisitsAndCreateUsers;
+use Piwik\Tests\Framework\TestCase\SystemTestCase;
+
+/**
+ * Run system tests against the UserId.getUsers API method
+ *
+ * @group UserId
+ * @group ApiTest
+ * @group Plugins
+ */
+class ApiTest extends SystemTestCase
+{
+    /**
+     * @var TrackFewVisitsAndCreateUsers
+     */
+    public static $fixture;
+
+    /**
+     * @dataProvider getApiForTesting
+     */
+    public function testApi($api, $params)
+    {
+        $this->runApiTests($api, $params);
+    }
+
+    public function getApiForTesting()
+    {
+        $api = 'UserId.getUsers';
+        $startDate = substr(self::$fixture->dateTime, 0, 10);
+        $endDate = date('Y-m-d', strtotime($startDate) + 3600*24*365);
+
+        $apiToTest   = array();
+        $apiToTest[] = array(
+            $api,
+            array(
+                'date' => $startDate,
+                'periods' => array('day'),
+                'idSite'     => 1,
+                'testSuffix' => ''
+            )
+        );
+        $apiToTest[] = array(
+            $api,
+            array(
+                'date' => "$startDate,$endDate",
+                'periods' => array('range'),
+                'idSite'     => 1,
+                'testSuffix' => ''
+            )
+        );
+
+        $apiToTest[] = array(
+            $api,
+            array(
+                'date' => $startDate,
+                'periods' => array('day'),
+                'idSite'     => 1,
+                'testSuffix' => 'limit',
+                'otherRequestParameters' => array(
+                    'filter_limit' => '2',
+                    'filter_offset' => '1',
+                )
+            )
+        );
+        $apiToTest[] = array(
+            $api,
+            array(
+                'date' => "$startDate,$endDate",
+                'periods' => array('range'),
+                'idSite'     => 1,
+                'testSuffix' => 'limit',
+                'otherRequestParameters' => array(
+                    'filter_limit' => '2',
+                    'filter_offset' => '1',
+                )
+            )
+        );
+
+        $apiToTest[] = array(
+            $api,
+            array(
+                'date' => $startDate,
+                'periods' => array('day'),
+                'idSite'     => 1,
+                'testSuffix' => 'ascSortOrder',
+                'otherRequestParameters' => array(
+                    'filter_sort_order' => 'asc',
+                )
+            )
+        );
+        $apiToTest[] = array(
+            $api,
+            array(
+                'date' => "$startDate,$endDate",
+                'periods' => array('range'),
+                'idSite'     => 1,
+                'testSuffix' => 'ascSortOrder',
+                'otherRequestParameters' => array(
+                    'filter_sort_order' => 'asc',
+                )
+            )
+        );
+
+        $apiToTest[] = array(
+            $api,
+            array(
+                'date' => $startDate,
+                'periods' => array('day'),
+                'idSite'     => 1,
+                'testSuffix' => 'searchByUserId',
+                'otherRequestParameters' => array(
+                    'filter_pattern' => 'user2'
+                )
+            )
+        );
+        $apiToTest[] = array(
+            $api,
+            array(
+                'date' => "$startDate,$endDate",
+                'periods' => array('range'),
+                'idSite'     => 1,
+                'testSuffix' => 'searchByUserId',
+                'otherRequestParameters' => array(
+                    'filter_pattern' => 'user2'
+                )
+            )
+        );
+
+        return $apiToTest;
+    }
+
+    public static function getOutputPrefix()
+    {
+        return '';
+    }
+
+    public static function getPathToTestDirectory()
+    {
+        return dirname(__FILE__);
+    }
+
+}
+
+ApiTest::$fixture = new TrackFewVisitsAndCreateUsers();
\ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml
new file mode 100644
index 0000000000..19e7d78d39
--- /dev/null
+++ b/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>user1</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>3</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>2</max_actions>
+		<sum_visit_length>1</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<idvisitor>b3daa77b4c04a955</idvisitor>
+	</row>
+	<row>
+		<label>user2</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<idvisitor>a1881c06eec96db9</idvisitor>
+	</row>
+	<row>
+		<label>user3</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<idvisitor>0b7f849446d33835</idvisitor>
+	</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
new file mode 100644
index 0000000000..184a718ff4
--- /dev/null
+++ b/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>user3</label>
+		<nb_visits>31</nb_visits>
+		<nb_actions>44</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>12</sum_visit_length>
+		<bounce_count>19</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>30</sum_daily_nb_users>
+		<idvisitor>0b7f849446d33835</idvisitor>
+	</row>
+	<row>
+		<label>user2</label>
+		<nb_visits>21</nb_visits>
+		<nb_actions>29</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>8</sum_visit_length>
+		<bounce_count>13</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>20</sum_daily_nb_users>
+		<idvisitor>a1881c06eec96db9</idvisitor>
+	</row>
+	<row>
+		<label>user1</label>
+		<nb_visits>11</nb_visits>
+		<nb_actions>15</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>7</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>10</sum_daily_nb_users>
+		<idvisitor>b3daa77b4c04a955</idvisitor>
+	</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
new file mode 100644
index 0000000000..9cf17c8b03
--- /dev/null
+++ b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>user3</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<idvisitor>0b7f849446d33835</idvisitor>
+	</row>
+	<row>
+		<label>user2</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<idvisitor>a1881c06eec96db9</idvisitor>
+	</row>
+	<row>
+		<label>user1</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>3</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>2</max_actions>
+		<sum_visit_length>1</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<idvisitor>b3daa77b4c04a955</idvisitor>
+	</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
new file mode 100644
index 0000000000..99aa12454a
--- /dev/null
+++ b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>user1</label>
+		<nb_visits>11</nb_visits>
+		<nb_actions>15</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>7</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>10</sum_daily_nb_users>
+		<idvisitor>b3daa77b4c04a955</idvisitor>
+	</row>
+	<row>
+		<label>user2</label>
+		<nb_visits>21</nb_visits>
+		<nb_actions>29</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>8</sum_visit_length>
+		<bounce_count>13</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>20</sum_daily_nb_users>
+		<idvisitor>a1881c06eec96db9</idvisitor>
+	</row>
+	<row>
+		<label>user3</label>
+		<nb_visits>31</nb_visits>
+		<nb_actions>44</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>12</sum_visit_length>
+		<bounce_count>19</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>30</sum_daily_nb_users>
+		<idvisitor>0b7f849446d33835</idvisitor>
+	</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
new file mode 100644
index 0000000000..52fcd98131
--- /dev/null
+++ b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>user2</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<idvisitor>a1881c06eec96db9</idvisitor>
+	</row>
+	<row>
+		<label>user3</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<idvisitor>0b7f849446d33835</idvisitor>
+	</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
new file mode 100644
index 0000000000..9545aadbb7
--- /dev/null
+++ b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>user2</label>
+		<nb_visits>21</nb_visits>
+		<nb_actions>29</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>8</sum_visit_length>
+		<bounce_count>13</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>20</sum_daily_nb_users>
+		<idvisitor>a1881c06eec96db9</idvisitor>
+	</row>
+	<row>
+		<label>user1</label>
+		<nb_visits>11</nb_visits>
+		<nb_actions>15</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>7</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>10</sum_daily_nb_users>
+		<idvisitor>b3daa77b4c04a955</idvisitor>
+	</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
new file mode 100644
index 0000000000..ac2a60152a
--- /dev/null
+++ b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>user2</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>1</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<idvisitor>a1881c06eec96db9</idvisitor>
+	</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
new file mode 100644
index 0000000000..ec3854dfb3
--- /dev/null
+++ b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>user2</label>
+		<nb_visits>21</nb_visits>
+		<nb_actions>29</nb_actions>
+		<max_actions>2</max_actions>
+		<sum_visit_length>8</sum_visit_length>
+		<bounce_count>13</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>20</sum_daily_nb_users>
+		<idvisitor>a1881c06eec96db9</idvisitor>
+	</row>
+</result>
\ No newline at end of file