Mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2026-03-06 23:33:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added option to filter by date the visits list

Browse Source
This commit is contained in:
Alejandro Celaya
2016-07-21 09:36:38 +02:00
parent 84c4021b24
commit d97287ab0c
6 changed files with 101 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
module/Core/src/Service/VisitsTracker.php
View File

@@ -4,9 +4,10 @@ namespace Shlinkio\Shlink\Core\Service;
use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
use Doctrine\ORM\EntityManagerInterface;
use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
use Shlinkio\Shlink\Common\Util\DateRange;
use Shlinkio\Shlink\Core\Entity\ShortUrl;
use Shlinkio\Shlink\Core\Entity\Visit;
use Zend\Paginator\Paginator;
use Shlinkio\Shlink\Core\Repository\VisitRepository;
class VisitsTracker implements VisitsTrackerInterface
{
@@ -62,12 +63,13 @@ class VisitsTracker implements VisitsTrackerInterface
}
/**
* Returns the visits on certain shortcode
* Returns the visits on certain short code
*
* @param $shortCode
* @return Paginator|Visit[]
* @param DateRange $dateRange
* @return Visit[]
*/
public function info($shortCode)
public function info($shortCode, DateRange $dateRange = null)
{
/** @var ShortUrl $shortUrl */
$shortUrl = $this->em->getRepository(ShortUrl::class)->findOneBy([
@@ -77,10 +79,8 @@ class VisitsTracker implements VisitsTrackerInterface
throw new InvalidArgumentException(sprintf('Short code "%s" not found', $shortCode));
}
return $this->em->getRepository(Visit::class)->findBy([
'shortUrl' => $shortUrl,
], [
'date' => 'DESC'
]);
/** @var VisitRepository $repo */
$repo = $this->em->getRepository(Visit::class);
return $repo->findVisitsByShortUrl($shortUrl, $dateRange);
}
}

9
module/Core/src/Service/VisitsTrackerInterface.php
View File

@@ -1,8 +1,8 @@
<?php
namespace Shlinkio\Shlink\Core\Service;
use Shlinkio\Shlink\Common\Util\DateRange;
use Shlinkio\Shlink\Core\Entity\Visit;
use Zend\Paginator\Paginator;
interface VisitsTrackerInterface
{
@@ -15,10 +15,11 @@ interface VisitsTrackerInterface
public function track($shortCode, array $visitorData = null);
/**
* Returns the visits on certain shortcode
* Returns the visits on certain short code
*
* @param $shortCode
* @return Paginator|Visit[]
* @param DateRange $dateRange
* @return Visit[]
*/
public function info($shortCode);
public function info($shortCode, DateRange $dateRange = null);
}