diff --git a/plugins/CoreHome/Columns/UserId.php b/plugins/CoreHome/Columns/UserId.php
index b0e207622c093fb774f287fa08c538d037ad8054..194056f437c0bcfd2ecdb7e07244023035ca29b1 100644
--- a/plugins/CoreHome/Columns/UserId.php
+++ b/plugins/CoreHome/Columns/UserId.php
@@ -9,6 +9,8 @@
namespace Piwik\Plugins\CoreHome\Columns;
use Piwik\Cache;
+use Piwik\DataTable;
+use Piwik\DataTable\Map;
use Piwik\Period\Range;
use Piwik\Plugin\Dimension\VisitDimension;
use Piwik\Plugins\VisitsSummary\API as VisitsSummaryApi;
@@ -60,8 +62,8 @@ class UserId extends VisitDimension
$period = 'month';
}
- if (Range::isMultiplePeriod($date, $period)) {
- $period = 'range';
+ if ($period === 'range') {
+ $period = 'day';
}
foreach ($idSites as $idSite) {
@@ -94,7 +96,12 @@ class UserId extends VisitDimension
return false;
}
- $numUsers = $result->getFirstRow()->getColumn('nb_users');
+ if ($result instanceof Map) {
+ $result = $result->mergeChildren();
+ }
+
+ $numUsers = $result->getColumn('nb_users');
+ $numUsers = array_sum($numUsers);
return !empty($numUsers);
}
diff --git a/plugins/CoreHome/tests/Integration/Column/UserIdTest.php b/plugins/CoreHome/tests/Integration/Column/UserIdTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..7861a4a65b058f72e6f5aaa170cafded360cc6da
--- /dev/null
+++ b/plugins/CoreHome/tests/Integration/Column/UserIdTest.php
@@ -0,0 +1,195 @@
+<?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\CoreHome\tests\Integration\Column;
+
+use Piwik\Access;
+use Piwik\Cache;
+use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\Db;
+use Piwik\Plugins\CoreHome\Columns\UserId;
+use Piwik\Tests\Framework\Fixture;
+use Piwik\Tests\Framework\Mock\FakeAccess;
+use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
+use Piwik\DataTable;
+
+/**
+ * @group CoreHome
+ * @group UserIdTest
+ * @group Plugins
+ * @group Column
+ */
+class UserIdTest extends IntegrationTestCase
+{
+ /**
+ * @var UserId
+ */
+ private $userId;
+
+ protected $date = '2014-04-04';
+
+ public function setUp()
+ {
+ parent::setUp();
+ $this->userId = new UserId();
+
+ $this->setSuperUser();
+
+ Fixture::createSuperUser();
+ Fixture::createWebsite('2014-01-01 00:00:00');
+ Fixture::createWebsite('2014-01-01 00:00:00');
+ }
+
+ public function tearDown()
+ {
+ // clean up your test here if needed
+ $tables = ArchiveTableCreator::getTablesArchivesInstalled();
+ if (!empty($tables)) {
+ Db::dropTables($tables);
+ }
+ parent::tearDown();
+ }
+
+ public function test_isUsedInAtLeastOneSite_shouldReturnFalseByDefault_WhenNothingIsTracked()
+ {
+ $this->assertNotUsedInAtLeastOneSite($idSites = array(1), 'day', $this->date);
+ }
+
+ public function test_isUsedInAtLeastOneSite_shouldCache()
+ {
+ $key = '1.month.' . $this->date;
+ $cache = Cache::getTransientCache();
+ $this->assertFalse($cache->contains($key));
+
+ $this->userId->isUsedInAtLeastOneSite($idSites = array(1), 'day', $this->date);
+
+ $this->assertTrue($cache->contains($key));
+ $this->assertFalse($cache->fetch($key));
+ }
+
+ public function test_isUsedInAtLeastOneSite_shouldDetectUserIdWasUsedInAllSites_WhenOneSiteGiven()
+ {
+ $this->trackPageviewsWithUsers();
+
+ $this->assertUsedInAtLeastOneSite($idSites = array(1), 'day', $this->date);
+ }
+
+ public function test_isUsedInAtLeastOneSite_shouldDetectUserIdWasUsedInAtLeastOneSite_WhenMultipleSitesGiven()
+ {
+ $this->trackPageviewsWithUsers();
+
+ $this->assertUsedInAtLeastOneSite($idSites = array(1,2), 'day', $this->date);
+ }
+
+ public function test_isUsedInAtLeastOneSite_shouldDetectUserIdWasNotUsedInAtLeastOneSite_WhenMultipleSitesGiven()
+ {
+ $this->trackPageviewsWithoutUsers();
+
+ $this->assertNotUsedInAtLeastOneSite($idSites = array(1,2), 'day', $this->date);
+ }
+
+ public function test_isUsedInAtLeastOneSite_shouldDetectUserIdWasNotUsed_WhenOneSiteGiven()
+ {
+ $this->trackPageviewsWithUsers();
+
+ $this->assertNotUsedInAtLeastOneSite($idSites = array(2), 'day', $this->date);
+ }
+
+ public function test_isUsedInAtLeastOneSite_shouldDefaultToMonthPeriodAndDetectUserIdIsUsedAlthoughNotTodayButYesterday()
+ {
+ $this->trackPageviewsWithUsers();
+
+ $this->assertUsedInAtLeastOneSite($idSites = array(1), 'day', '2014-04-03');
+ }
+
+ public function test_isUsedInAtLeastOneSite_shouldDefaultToMonthPeriodAndDetectUserIdIsUsedAlthoughNotTodayButTomorrow()
+ {
+ $this->trackPageviewsWithUsers();
+
+ $this->assertUsedInAtLeastOneSite($idSites = array(1), 'day', '2014-04-05');
+ }
+
+ public function test_isUsedInAtLeastOneSite_shouldDetectItWasNotUsedInMarchAlthoughItWasUsedInApril()
+ {
+ $this->trackPageviewsWithUsers();
+
+ $this->assertNotUsedInAtLeastOneSite($idSites = array(1), 'day', '2014-03-04');
+ }
+
+ public function test_isUsedInAtLeastOneSite_shouldDetectItCorrectWithRangeDates()
+ {
+ $this->trackPageviewsWithUsers();
+
+ $this->assertUsedInAtLeastOneSite($idSites = array(1), 'range', '2014-04-01,2014-05-05');
+
+ // not used in that range date
+ $this->assertNotUsedInAtLeastOneSite($idSites = array(1), 'range', '2014-04-01,2014-04-03');
+ }
+
+ private function assertUsedInAtLeastOneSite($idSites, $period, $date)
+ {
+ $result = $this->userId->isUsedInAtLeastOneSite($idSites, $period, $date);
+
+ $this->assertTrue($result);
+ }
+
+ private function assertNotUsedInAtLeastOneSite($idSites, $period, $date)
+ {
+ $result = $this->userId->isUsedInAtLeastOneSite($idSites, $period, $date);
+
+ $this->assertFalse($result);
+ }
+
+ private function trackPageviewsWithUsers()
+ {
+ $this->trackPageviewsWithDifferentUsers(array('user1', false, 'user3'));
+ }
+
+ private function trackPageviewsWithoutUsers()
+ {
+ $this->trackPageviewsWithDifferentUsers(array(false, false, false));
+ }
+
+ private function trackPageviewsWithDifferentUsers($userIds)
+ {
+ $tracker = $this->getTracker();
+
+ foreach ($userIds as $index => $userId) {
+ $tracker->setForceNewVisit();
+ $this->trackPageview($tracker, $userId, '/index/' . $index . '.html');
+ }
+ }
+
+ private function trackPageview(\PiwikTracker $tracker, $userId, $url = null)
+ {
+ if (null !== $url) {
+ $tracker->setUrl('http://www.example.org' . $url);
+ }
+
+ $tracker->setUserId($userId);
+
+ $title = $url ? : 'test';
+
+ $tracker->doTrackPageView($title);
+ }
+
+ private function getTracker()
+ {
+ $tracker = Fixture::getTracker(1, $this->date . ' 00:01:01', true, true);
+ $tracker->setTokenAuth(Fixture::getTokenAuth());
+ return $tracker;
+ }
+
+ private function setSuperUser()
+ {
+ $pseudoMockAccess = new FakeAccess();
+ $pseudoMockAccess::setSuperUserAccess(true);
+ Access::setSingletonInstance($pseudoMockAccess);
+ }
+
+}
diff --git a/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml b/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml
index 9327934fa529fb4651088957e92ac0fc8ccb8d11..0c2205988578c546d48ecdf7470d50b4d212f4ce 100644
--- a/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml
+++ b/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml
@@ -2,7 +2,6 @@
<result>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
- <nb_users>0</nb_users>
<nb_actions>4</nb_actions>
<max_actions>2</max_actions>
<bounce_count>0</bounce_count>
diff --git a/plugins/VisitsSummary/Reports/Get.php b/plugins/VisitsSummary/Reports/Get.php
index 7fcd9c54c6d2d0794f437a5b208c314fb684af16..7786c5a99ee4312c158f7949ec4998d50ad71fcd 100644
--- a/plugins/VisitsSummary/Reports/Get.php
+++ b/plugins/VisitsSummary/Reports/Get.php
@@ -46,16 +46,14 @@ class Get extends \Piwik\Plugin\Report
return;
}
- if (!empty($infos['idSites']) && !empty($infos['period']) && !empty($infos['date'])) {
+ $usersKey = array_search('nb_users', $this->metrics);
+ if ($usersKey !== false && !empty($infos['idSites']) && !empty($infos['period']) && !empty($infos['date'])) {
$userId = new UserId();
$isUserIdUsed = $userId->isUsedInAtLeastOneSite($infos['idSites'], $infos['period'], $infos['date']);
if (!$isUserIdUsed) {
- $key = array_search('nb_users', $this->metrics);
- if (false !== $key) {
- unset($this->metrics[$key]);
- $this->metrics = array_values($this->metrics);
- }
+ unset($this->metrics[$usersKey]);
+ $this->metrics = array_values($this->metrics);
}
}
@@ -66,7 +64,7 @@ class Get extends \Piwik\Plugin\Report
{
$metrics = parent::getMetrics();
- $metrics['max_actions'] = Piwik::translate('General_ColumnMaxActions');
+ $metrics['max_actions'] = Piwik::translate('General_ColumnMaxActions');
return $metrics;
}