Merge pull request #1451 from acelaya-forks/feature/missing-visits-commands

Feature/missing visits commands

CHANGELOG.md

@@ -6,7 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 ## [Unreleased]
 ### Added
-* *Nothing*
+* [#1280](https://github.com/shlinkio/shlink/issues/1280) Added missing visit-related commands.
+
+  Now you can run `tag:visits`, `domain:visits`, `visit:orphan` or `visit:non-orphan` to get the corresponding list of visits from the command line.
 
 ### Changed
 * *Nothing*

module/CLI/config/cli.config.php

@@ -11,11 +11,13 @@ return [
             Command\ShortUrl\CreateShortUrlCommand::NAME => Command\ShortUrl\CreateShortUrlCommand::class,
             Command\ShortUrl\ResolveUrlCommand::NAME => Command\ShortUrl\ResolveUrlCommand::class,
             Command\ShortUrl\ListShortUrlsCommand::NAME => Command\ShortUrl\ListShortUrlsCommand::class,
-            Command\ShortUrl\GetVisitsCommand::NAME => Command\ShortUrl\GetVisitsCommand::class,
+            Command\ShortUrl\GetShortUrlVisitsCommand::NAME => Command\ShortUrl\GetShortUrlVisitsCommand::class,
             Command\ShortUrl\DeleteShortUrlCommand::NAME => Command\ShortUrl\DeleteShortUrlCommand::class,
 
             Command\Visit\LocateVisitsCommand::NAME => Command\Visit\LocateVisitsCommand::class,
             Command\Visit\DownloadGeoLiteDbCommand::NAME => Command\Visit\DownloadGeoLiteDbCommand::class,
+            Command\Visit\GetOrphanVisitsCommand::NAME => Command\Visit\GetOrphanVisitsCommand::class,
+            Command\Visit\GetNonOrphanVisitsCommand::NAME => Command\Visit\GetNonOrphanVisitsCommand::class,
 
             Command\Api\GenerateKeyCommand::NAME => Command\Api\GenerateKeyCommand::class,
             Command\Api\DisableKeyCommand::NAME => Command\Api\DisableKeyCommand::class,
@@ -24,9 +26,11 @@ return [
             Command\Tag\ListTagsCommand::NAME => Command\Tag\ListTagsCommand::class,
             Command\Tag\RenameTagCommand::NAME => Command\Tag\RenameTagCommand::class,
             Command\Tag\DeleteTagsCommand::NAME => Command\Tag\DeleteTagsCommand::class,
+            Command\Tag\GetTagVisitsCommand::NAME => Command\Tag\GetTagVisitsCommand::class,
 
             Command\Domain\ListDomainsCommand::NAME => Command\Domain\ListDomainsCommand::class,
             Command\Domain\DomainRedirectsCommand::NAME => Command\Domain\DomainRedirectsCommand::class,
+            Command\Domain\GetDomainVisitsCommand::NAME => Command\Domain\GetDomainVisitsCommand::class,
 
             Command\Db\CreateDatabaseCommand::NAME => Command\Db\CreateDatabaseCommand::class,
             Command\Db\MigrateDatabaseCommand::NAME => Command\Db\MigrateDatabaseCommand::class,

module/CLI/config/dependencies.config.php

@@ -42,11 +42,13 @@ return [
             Command\ShortUrl\CreateShortUrlCommand::class => ConfigAbstractFactory::class,
             Command\ShortUrl\ResolveUrlCommand::class => ConfigAbstractFactory::class,
             Command\ShortUrl\ListShortUrlsCommand::class => ConfigAbstractFactory::class,
-            Command\ShortUrl\GetVisitsCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\GetShortUrlVisitsCommand::class => ConfigAbstractFactory::class,
             Command\ShortUrl\DeleteShortUrlCommand::class => ConfigAbstractFactory::class,
 
             Command\Visit\DownloadGeoLiteDbCommand::class => ConfigAbstractFactory::class,
             Command\Visit\LocateVisitsCommand::class => ConfigAbstractFactory::class,
+            Command\Visit\GetOrphanVisitsCommand::class => ConfigAbstractFactory::class,
+            Command\Visit\GetNonOrphanVisitsCommand::class => ConfigAbstractFactory::class,
 
             Command\Api\GenerateKeyCommand::class => ConfigAbstractFactory::class,
             Command\Api\DisableKeyCommand::class => ConfigAbstractFactory::class,
@@ -55,12 +57,14 @@ return [
             Command\Tag\ListTagsCommand::class => ConfigAbstractFactory::class,
             Command\Tag\RenameTagCommand::class => ConfigAbstractFactory::class,
             Command\Tag\DeleteTagsCommand::class => ConfigAbstractFactory::class,
+            Command\Tag\GetTagVisitsCommand::class => ConfigAbstractFactory::class,
 
             Command\Db\CreateDatabaseCommand::class => ConfigAbstractFactory::class,
             Command\Db\MigrateDatabaseCommand::class => ConfigAbstractFactory::class,
 
             Command\Domain\ListDomainsCommand::class => ConfigAbstractFactory::class,
             Command\Domain\DomainRedirectsCommand::class => ConfigAbstractFactory::class,
+            Command\Domain\GetDomainVisitsCommand::class => ConfigAbstractFactory::class,
         ],
     ],
 
@@ -85,7 +89,7 @@ return [
             Service\ShortUrlService::class,
             ShortUrlDataTransformer::class,
         ],
-        Command\ShortUrl\GetVisitsCommand::class => [Visit\VisitsStatsHelper::class],
+        Command\ShortUrl\GetShortUrlVisitsCommand::class => [Visit\VisitsStatsHelper::class],
         Command\ShortUrl\DeleteShortUrlCommand::class => [Service\ShortUrl\DeleteShortUrlService::class],
 
         Command\Visit\DownloadGeoLiteDbCommand::class => [Util\GeolocationDbUpdater::class],
@@ -94,6 +98,8 @@ return [
             IpLocationResolverInterface::class,
             LockFactory::class,
         ],
+        Command\Visit\GetOrphanVisitsCommand::class => [Visit\VisitsStatsHelper::class],
+        Command\Visit\GetNonOrphanVisitsCommand::class => [Visit\VisitsStatsHelper::class, ShortUrlStringifier::class],
 
         Command\Api\GenerateKeyCommand::class => [ApiKeyService::class, ApiKey\RoleResolver::class],
         Command\Api\DisableKeyCommand::class => [ApiKeyService::class],
@@ -102,9 +108,11 @@ return [
         Command\Tag\ListTagsCommand::class => [TagService::class],
         Command\Tag\RenameTagCommand::class => [TagService::class],
         Command\Tag\DeleteTagsCommand::class => [TagService::class],
+        Command\Tag\GetTagVisitsCommand::class => [Visit\VisitsStatsHelper::class, ShortUrlStringifier::class],
 
         Command\Domain\ListDomainsCommand::class => [DomainService::class],
         Command\Domain\DomainRedirectsCommand::class => [DomainService::class],
+        Command\Domain\GetDomainVisitsCommand::class => [Visit\VisitsStatsHelper::class, ShortUrlStringifier::class],
 
         Command\Db\CreateDatabaseCommand::class => [
             LockFactory::class,

module/CLI/src/Command/Domain/GetDomainVisitsCommand.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Domain;
+
+use Shlinkio\Shlink\CLI\Command\Visit\AbstractVisitsListCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Common\Util\DateRange;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Model\VisitsParams;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+
+class GetDomainVisitsCommand extends AbstractVisitsListCommand
+{
+    public const NAME = 'domain:visits';
+
+    public function __construct(
+        VisitsStatsHelperInterface $visitsHelper,
+        private readonly ShortUrlStringifierInterface $shortUrlStringifier,
+    ) {
+        parent::__construct($visitsHelper);
+    }
+
+    protected function doConfigure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Returns the list of visits for provided domain.')
+            ->addArgument('domain', InputArgument::REQUIRED, 'The domain which visits we want to get.');
+    }
+
+    protected function getVisitsPaginator(InputInterface $input, DateRange $dateRange): Paginator
+    {
+        $domain = $input->getArgument('domain');
+        return $this->visitsHelper->visitsForDomain($domain, new VisitsParams($dateRange));
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    protected function mapExtraFields(Visit $visit): array
+    {
+        $shortUrl = $visit->getShortUrl();
+        return $shortUrl === null ? [] : ['shortUrl' => $this->shortUrlStringifier->stringify($shortUrl)];
+    }
+}

module/CLI/src/Command/ShortUrl/GetShortUrlVisitsCommand.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
+
+use Shlinkio\Shlink\CLI\Command\Visit\AbstractVisitsListCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Common\Util\DateRange;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier;
+use Shlinkio\Shlink\Core\Model\VisitsParams;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+class GetShortUrlVisitsCommand extends AbstractVisitsListCommand
+{
+    public const NAME = 'short-url:visits';
+
+    protected function doConfigure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Returns the detailed visits information for provided short code')
+            ->addArgument('shortCode', InputArgument::REQUIRED, 'The short code which visits we want to get.')
+            ->addOption('domain', 'd', InputOption::VALUE_REQUIRED, 'The domain for the short code.');
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output): void
+    {
+        $shortCode = $input->getArgument('shortCode');
+        if (! empty($shortCode)) {
+            return;
+        }
+
+        $io = new SymfonyStyle($input, $output);
+        $shortCode = $io->ask('A short code was not provided. Which short code do you want to use?');
+        if (! empty($shortCode)) {
+            $input->setArgument('shortCode', $shortCode);
+        }
+    }
+
+    protected function getVisitsPaginator(InputInterface $input, DateRange $dateRange): Paginator
+    {
+        $identifier = ShortUrlIdentifier::fromCli($input);
+        return $this->visitsHelper->visitsForShortUrl($identifier, new VisitsParams($dateRange));
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    protected function mapExtraFields(Visit $visit): array
+    {
+        return [];
+    }
+}

module/CLI/src/Command/ShortUrl/GetVisitsCommand.php

@@ -1,88 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
-
-use Shlinkio\Shlink\CLI\Command\Util\AbstractWithDateRangeCommand;
-use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\CLI\Util\ShlinkTable;
-use Shlinkio\Shlink\Core\Entity\Visit;
-use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier;
-use Shlinkio\Shlink\Core\Model\VisitsParams;
-use Shlinkio\Shlink\Core\Visit\Model\UnknownVisitLocation;
-use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-
-use function Functional\map;
-use function Functional\select_keys;
-use function Shlinkio\Shlink\Common\buildDateRange;
-use function sprintf;
-
-class GetVisitsCommand extends AbstractWithDateRangeCommand
-{
-    public const NAME = 'short-url:visits';
-
-    public function __construct(private VisitsStatsHelperInterface $visitsHelper)
-    {
-        parent::__construct();
-    }
-
-    protected function doConfigure(): void
-    {
-        $this
-            ->setName(self::NAME)
-            ->setDescription('Returns the detailed visits information for provided short code')
-            ->addArgument('shortCode', InputArgument::REQUIRED, 'The short code which visits we want to get.')
-            ->addOption('domain', 'd', InputOption::VALUE_REQUIRED, 'The domain for the short code.');
-    }
-
-    protected function getStartDateDesc(string $optionName): string
-    {
-        return sprintf('Allows to filter visits, returning only those older than "%s".', $optionName);
-    }
-
-    protected function getEndDateDesc(string $optionName): string
-    {
-        return sprintf('Allows to filter visits, returning only those newer than "%s".', $optionName);
-    }
-
-    protected function interact(InputInterface $input, OutputInterface $output): void
-    {
-        $shortCode = $input->getArgument('shortCode');
-        if (! empty($shortCode)) {
-            return;
-        }
-
-        $io = new SymfonyStyle($input, $output);
-        $shortCode = $io->ask('A short code was not provided. Which short code do you want to use?');
-        if (! empty($shortCode)) {
-            $input->setArgument('shortCode', $shortCode);
-        }
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): ?int
-    {
-        $identifier = ShortUrlIdentifier::fromCli($input);
-        $startDate = $this->getStartDateOption($input, $output);
-        $endDate = $this->getEndDateOption($input, $output);
-
-        $paginator = $this->visitsHelper->visitsForShortUrl(
-            $identifier,
-            new VisitsParams(buildDateRange($startDate, $endDate)),
-        );
-
-        $rows = map($paginator->getCurrentPageResults(), function (Visit $visit) {
-            $rowData = $visit->jsonSerialize();
-            $rowData['country'] = ($visit->getVisitLocation() ?? new UnknownVisitLocation())->getCountryName();
-            return select_keys($rowData, ['referer', 'date', 'userAgent', 'country']);
-        });
-        ShlinkTable::default($output)->render(['Referer', 'Date', 'User agent', 'Country'], $rows);
-
-        return ExitCodes::EXIT_SUCCESS;
-    }
-}

module/CLI/src/Command/Tag/GetTagVisitsCommand.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Tag;
+
+use Shlinkio\Shlink\CLI\Command\Visit\AbstractVisitsListCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Common\Util\DateRange;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Model\VisitsParams;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+
+class GetTagVisitsCommand extends AbstractVisitsListCommand
+{
+    public const NAME = 'tag:visits';
+
+    public function __construct(
+        VisitsStatsHelperInterface $visitsHelper,
+        private readonly ShortUrlStringifierInterface $shortUrlStringifier,
+    ) {
+        parent::__construct($visitsHelper);
+    }
+
+    protected function doConfigure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Returns the list of visits for provided tag.')
+            ->addArgument('tag', InputArgument::REQUIRED, 'The tag which visits we want to get.');
+    }
+
+    protected function getVisitsPaginator(InputInterface $input, DateRange $dateRange): Paginator
+    {
+        $tag = $input->getArgument('tag');
+        return $this->visitsHelper->visitsForTag($tag, new VisitsParams($dateRange));
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    protected function mapExtraFields(Visit $visit): array
+    {
+        $shortUrl = $visit->getShortUrl();
+        return $shortUrl === null ? [] : ['shortUrl' => $this->shortUrlStringifier->stringify($shortUrl)];
+    }
+}

module/CLI/src/Command/Tag/RenameTagCommand.php

@@ -19,7 +19,7 @@ class RenameTagCommand extends Command
 {
     public const NAME = 'tag:rename';
 
-    public function __construct(private TagServiceInterface $tagService)
+    public function __construct(private readonly TagServiceInterface $tagService)
     {
         parent::__construct();
     }

module/CLI/src/Command/Visit/AbstractVisitsListCommand.php

@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Visit;
+
+use Shlinkio\Shlink\CLI\Command\Util\AbstractWithDateRangeCommand;
+use Shlinkio\Shlink\CLI\Util\ExitCodes;
+use Shlinkio\Shlink\CLI\Util\ShlinkTable;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Common\Util\DateRange;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+use function array_keys;
+use function Functional\map;
+use function Functional\select_keys;
+use function Shlinkio\Shlink\Common\buildDateRange;
+use function Shlinkio\Shlink\Core\camelCaseToHumanFriendly;
+use function sprintf;
+
+abstract class AbstractVisitsListCommand extends AbstractWithDateRangeCommand
+{
+    public function __construct(protected readonly VisitsStatsHelperInterface $visitsHelper)
+    {
+        parent::__construct();
+    }
+
+    final protected function getStartDateDesc(string $optionName): string
+    {
+        return sprintf('Allows to filter visits, returning only those older than "%s".', $optionName);
+    }
+
+    final protected function getEndDateDesc(string $optionName): string
+    {
+        return sprintf('Allows to filter visits, returning only those newer than "%s".', $optionName);
+    }
+
+    final protected function execute(InputInterface $input, OutputInterface $output): ?int
+    {
+        $startDate = $this->getStartDateOption($input, $output);
+        $endDate = $this->getEndDateOption($input, $output);
+        $paginator = $this->getVisitsPaginator($input, buildDateRange($startDate, $endDate));
+        [$rows, $headers] = $this->resolveRowsAndHeaders($paginator);
+
+        ShlinkTable::default($output)->render($headers, $rows);
+
+        return ExitCodes::EXIT_SUCCESS;
+    }
+
+    private function resolveRowsAndHeaders(Paginator $paginator): array
+    {
+        $extraKeys = [];
+        $rows = map($paginator->getCurrentPageResults(), function (Visit $visit) use (&$extraKeys) {
+            $extraFields = $this->mapExtraFields($visit);
+            $extraKeys = array_keys($extraFields);
+
+            $rowData = [
+                ...$visit->jsonSerialize(),
+                'country' => $visit->getVisitLocation()?->getCountryName() ?? 'Unknown',
+                'city' => $visit->getVisitLocation()?->getCityName() ?? 'Unknown',
+                ...$extraFields,
+            ];
+
+            return select_keys($rowData, ['referer', 'date', 'userAgent', 'country', 'city', ...$extraKeys]);
+        });
+        $extra = map($extraKeys, camelCaseToHumanFriendly(...));
+
+        return [
+            $rows,
+            ['Referer', 'Date', 'User agent', 'Country', 'City', ...$extra],
+        ];
+    }
+
+    abstract protected function getVisitsPaginator(InputInterface $input, DateRange $dateRange): Paginator;
+
+    /**
+     * @return array<string, string>
+     */
+    abstract protected function mapExtraFields(Visit $visit): array;
+}

module/CLI/src/Command/Visit/GetNonOrphanVisitsCommand.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Visit;
+
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Common\Util\DateRange;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Model\VisitsParams;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Symfony\Component\Console\Input\InputInterface;
+
+class GetNonOrphanVisitsCommand extends AbstractVisitsListCommand
+{
+    public const NAME = 'visit:non-orphan';
+
+    public function __construct(
+        VisitsStatsHelperInterface $visitsHelper,
+        private readonly ShortUrlStringifierInterface $shortUrlStringifier,
+    ) {
+        parent::__construct($visitsHelper);
+    }
+
+    protected function doConfigure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Returns the list of non-orphan visits.');
+    }
+
+    protected function getVisitsPaginator(InputInterface $input, DateRange $dateRange): Paginator
+    {
+        return $this->visitsHelper->nonOrphanVisits(new VisitsParams($dateRange));
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    protected function mapExtraFields(Visit $visit): array
+    {
+        $shortUrl = $visit->getShortUrl();
+        return $shortUrl === null ? [] : ['shortUrl' => $this->shortUrlStringifier->stringify($shortUrl)];
+    }
+}

module/CLI/src/Command/Visit/GetOrphanVisitsCommand.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Visit;
+
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Common\Util\DateRange;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Model\VisitsParams;
+use Symfony\Component\Console\Input\InputInterface;
+
+class GetOrphanVisitsCommand extends AbstractVisitsListCommand
+{
+    public const NAME = 'visit:orphan';
+
+    protected function doConfigure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Returns the list of orphan visits.');
+    }
+
+    protected function getVisitsPaginator(InputInterface $input, DateRange $dateRange): Paginator
+    {
+        return $this->visitsHelper->orphanVisits(new VisitsParams($dateRange));
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    protected function mapExtraFields(Visit $visit): array
+    {
+        return ['type' => $visit->type()->value];
+    }
+}

module/CLI/test/Command/Domain/GetDomainVisitsCommandTest.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\CLI\Command\Domain;
+
+use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Domain\GetDomainVisitsCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Entity\VisitLocation;
+use Shlinkio\Shlink\Core\Model\Visitor;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class GetDomainVisitsCommandTest extends TestCase
+{
+    use CliTestUtilsTrait;
+
+    private CommandTester $commandTester;
+    private ObjectProphecy $visitsHelper;
+    private ObjectProphecy $stringifier;
+
+    protected function setUp(): void
+    {
+        $this->visitsHelper = $this->prophesize(VisitsStatsHelperInterface::class);
+        $this->stringifier = $this->prophesize(ShortUrlStringifierInterface::class);
+
+        $this->commandTester = $this->testerForCommand(
+            new GetDomainVisitsCommand($this->visitsHelper->reveal(), $this->stringifier->reveal()),
+        );
+    }
+
+    /** @test */
+    public function outputIsProperlyGenerated(): void
+    {
+        $shortUrl = ShortUrl::createEmpty();
+        $visit = Visit::forValidShortUrl($shortUrl, new Visitor('bar', 'foo', '', ''))->locate(
+            VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
+        );
+        $domain = 'doma.in';
+        $getVisits = $this->visitsHelper->visitsForDomain($domain, Argument::any())->willReturn(
+            new Paginator(new ArrayAdapter([$visit])),
+        );
+        $stringify = $this->stringifier->stringify($shortUrl)->willReturn('the_short_url');
+
+        $this->commandTester->execute(['domain' => $domain]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertEquals(
+            <<<OUTPUT
+            +---------+---------------------------+------------+---------+--------+---------------+
+            | Referer | Date                      | User agent | Country | City   | Short Url     |
+            +---------+---------------------------+------------+---------+--------+---------------+
+            | foo     | {$visit->getDate()->toAtomString()} | bar        | Spain   | Madrid | the_short_url |
+            +---------+---------------------------+------------+---------+--------+---------------+
+
+            OUTPUT,
+            $output,
+        );
+        $getVisits->shouldHaveBeenCalledOnce();
+        $stringify->shouldHaveBeenCalledOnce();
+    }
+}

module/CLI/test/Command/ShortUrl/GetShortUrlVisitsCommandTest.php

@@ -9,7 +9,7 @@ use Pagerfanta\Adapter\ArrayAdapter;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\ShortUrl\GetVisitsCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\GetShortUrlVisitsCommand;
 use Shlinkio\Shlink\Common\Paginator\Paginator;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
@@ -23,9 +23,10 @@ use Shlinkio\Shlink\IpGeolocation\Model\Location;
 use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
 use Symfony\Component\Console\Tester\CommandTester;
 
+use function Shlinkio\Shlink\Common\buildDateRange;
 use function sprintf;
 
-class GetVisitsCommandTest extends TestCase
+class GetShortUrlVisitsCommandTest extends TestCase
 {
     use CliTestUtilsTrait;
 
@@ -35,7 +36,7 @@ class GetVisitsCommandTest extends TestCase
     public function setUp(): void
     {
         $this->visitsHelper = $this->prophesize(VisitsStatsHelperInterface::class);
-        $command = new GetVisitsCommand($this->visitsHelper->reveal());
+        $command = new GetShortUrlVisitsCommand($this->visitsHelper->reveal());
         $this->commandTester = $this->testerForCommand($command);
     }
 
@@ -61,7 +62,7 @@ class GetVisitsCommandTest extends TestCase
         $endDate = '2016-02-01';
         $this->visitsHelper->visitsForShortUrl(
             ShortUrlIdentifier::fromShortCodeAndDomain($shortCode),
-            new VisitsParams(DateRange::withStartAndEndDate(Chronos::parse($startDate), Chronos::parse($endDate))),
+            new VisitsParams(buildDateRange(Chronos::parse($startDate), Chronos::parse($endDate))),
         )
             ->willReturn(new Paginator(new ArrayAdapter([])))
             ->shouldBeCalledOnce();
@@ -99,22 +100,30 @@ class GetVisitsCommandTest extends TestCase
     /** @test */
     public function outputIsProperlyGenerated(): void
     {
+        $visit = Visit::forValidShortUrl(ShortUrl::createEmpty(), new Visitor('bar', 'foo', '', ''))->locate(
+            VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
+        );
         $shortCode = 'abc123';
         $this->visitsHelper->visitsForShortUrl(
             ShortUrlIdentifier::fromShortCodeAndDomain($shortCode),
             Argument::any(),
         )->willReturn(
-            new Paginator(new ArrayAdapter([
-                Visit::forValidShortUrl(ShortUrl::createEmpty(), new Visitor('bar', 'foo', '', ''))->locate(
-                    VisitLocation::fromGeolocation(new Location('', 'Spain', '', '', 0, 0, '')),
-                ),
-            ])),
+            new Paginator(new ArrayAdapter([$visit])),
         )->shouldBeCalledOnce();
 
         $this->commandTester->execute(['shortCode' => $shortCode]);
         $output = $this->commandTester->getDisplay();
-        self::assertStringContainsString('foo', $output);
-        self::assertStringContainsString('Spain', $output);
-        self::assertStringContainsString('bar', $output);
+
+        self::assertEquals(
+            <<<OUTPUT
+            +---------+---------------------------+------------+---------+--------+
+            | Referer | Date                      | User agent | Country | City   |
+            +---------+---------------------------+------------+---------+--------+
+            | foo     | {$visit->getDate()->toAtomString()} | bar        | Spain   | Madrid |
+            +---------+---------------------------+------------+---------+--------+
+
+            OUTPUT,
+            $output,
+        );
     }
 }

module/CLI/test/Command/Tag/GetTagVisitsCommandTest.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\CLI\Command\Tag;
+
+use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Tag\GetTagVisitsCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Entity\VisitLocation;
+use Shlinkio\Shlink\Core\Model\Visitor;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class GetTagVisitsCommandTest extends TestCase
+{
+    use CliTestUtilsTrait;
+
+    private CommandTester $commandTester;
+    private ObjectProphecy $visitsHelper;
+    private ObjectProphecy $stringifier;
+
+    protected function setUp(): void
+    {
+        $this->visitsHelper = $this->prophesize(VisitsStatsHelperInterface::class);
+        $this->stringifier = $this->prophesize(ShortUrlStringifierInterface::class);
+
+        $this->commandTester = $this->testerForCommand(
+            new GetTagVisitsCommand($this->visitsHelper->reveal(), $this->stringifier->reveal()),
+        );
+    }
+
+    /** @test */
+    public function outputIsProperlyGenerated(): void
+    {
+        $shortUrl = ShortUrl::createEmpty();
+        $visit = Visit::forValidShortUrl($shortUrl, new Visitor('bar', 'foo', '', ''))->locate(
+            VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
+        );
+        $tag = 'abc123';
+        $getVisits = $this->visitsHelper->visitsForTag($tag, Argument::any())->willReturn(
+            new Paginator(new ArrayAdapter([$visit])),
+        );
+        $stringify = $this->stringifier->stringify($shortUrl)->willReturn('the_short_url');
+
+        $this->commandTester->execute(['tag' => $tag]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertEquals(
+            <<<OUTPUT
+            +---------+---------------------------+------------+---------+--------+---------------+
+            | Referer | Date                      | User agent | Country | City   | Short Url     |
+            +---------+---------------------------+------------+---------+--------+---------------+
+            | foo     | {$visit->getDate()->toAtomString()} | bar        | Spain   | Madrid | the_short_url |
+            +---------+---------------------------+------------+---------+--------+---------------+
+
+            OUTPUT,
+            $output,
+        );
+        $getVisits->shouldHaveBeenCalledOnce();
+        $stringify->shouldHaveBeenCalledOnce();
+    }
+}

module/CLI/test/Command/Visit/GetNonOrphanVisitsCommandTest.php

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\CLI\Command\Visit;
+
+use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Visit\GetNonOrphanVisitsCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Entity\VisitLocation;
+use Shlinkio\Shlink\Core\Model\Visitor;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class GetNonOrphanVisitsCommandTest extends TestCase
+{
+    use CliTestUtilsTrait;
+
+    private CommandTester $commandTester;
+    private ObjectProphecy $visitsHelper;
+    private ObjectProphecy $stringifier;
+
+    protected function setUp(): void
+    {
+        $this->visitsHelper = $this->prophesize(VisitsStatsHelperInterface::class);
+        $this->stringifier = $this->prophesize(ShortUrlStringifierInterface::class);
+
+        $this->commandTester = $this->testerForCommand(
+            new GetNonOrphanVisitsCommand($this->visitsHelper->reveal(), $this->stringifier->reveal()),
+        );
+    }
+
+    /** @test */
+    public function outputIsProperlyGenerated(): void
+    {
+        $shortUrl = ShortUrl::createEmpty();
+        $visit = Visit::forValidShortUrl($shortUrl, new Visitor('bar', 'foo', '', ''))->locate(
+            VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
+        );
+        $getVisits = $this->visitsHelper->nonOrphanVisits(Argument::any())->willReturn(
+            new Paginator(new ArrayAdapter([$visit])),
+        );
+        $stringify = $this->stringifier->stringify($shortUrl)->willReturn('the_short_url');
+
+        $this->commandTester->execute([]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertEquals(
+            <<<OUTPUT
+            +---------+---------------------------+------------+---------+--------+---------------+
+            | Referer | Date                      | User agent | Country | City   | Short Url     |
+            +---------+---------------------------+------------+---------+--------+---------------+
+            | foo     | {$visit->getDate()->toAtomString()} | bar        | Spain   | Madrid | the_short_url |
+            +---------+---------------------------+------------+---------+--------+---------------+
+
+            OUTPUT,
+            $output,
+        );
+        $getVisits->shouldHaveBeenCalledOnce();
+        $stringify->shouldHaveBeenCalledOnce();
+    }
+}

module/CLI/test/Command/Visit/GetOrphanVisitsCommandTest.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\CLI\Command\Visit;
+
+use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Visit\GetOrphanVisitsCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Entity\VisitLocation;
+use Shlinkio\Shlink\Core\Model\Visitor;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class GetOrphanVisitsCommandTest extends TestCase
+{
+    use CliTestUtilsTrait;
+
+    private CommandTester $commandTester;
+    private ObjectProphecy $visitsHelper;
+
+    protected function setUp(): void
+    {
+        $this->visitsHelper = $this->prophesize(VisitsStatsHelperInterface::class);
+        $this->commandTester = $this->testerForCommand(new GetOrphanVisitsCommand($this->visitsHelper->reveal()));
+    }
+
+    /** @test */
+    public function outputIsProperlyGenerated(): void
+    {
+        $visit = Visit::forBasePath(new Visitor('bar', 'foo', '', ''))->locate(
+            VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
+        );
+        $getVisits = $this->visitsHelper->orphanVisits(Argument::any())->willReturn(
+            new Paginator(new ArrayAdapter([$visit])),
+        );
+
+        $this->commandTester->execute([]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertEquals(
+            <<<OUTPUT
+            +---------+---------------------------+------------+---------+--------+----------+
+            | Referer | Date                      | User agent | Country | City   | Type     |
+            +---------+---------------------------+------------+---------+--------+----------+
+            | foo     | {$visit->getDate()->toAtomString()} | bar        | Spain   | Madrid | base_url |
+            +---------+---------------------------+------------+---------+--------+----------+
+
+            OUTPUT,
+            $output,
+        );
+        $getVisits->shouldHaveBeenCalledOnce();
+    }
+}

module/Core/functions/functions.php

@@ -8,6 +8,7 @@ use Cake\Chronos\Chronos;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping\Builder\FieldBuilder;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
+use Laminas\Filter\Word\CamelCaseToSeparator;
 use Laminas\InputFilter\InputFilter;
 use PUGX\Shortid\Factory as ShortIdFactory;
 use Shlinkio\Shlink\Common\Util\DateRange;
@@ -19,6 +20,7 @@ use function print_r;
 use function Shlinkio\Shlink\Common\buildDateRange;
 use function sprintf;
 use function str_repeat;
+use function ucfirst;
 
 function generateRandomShortCode(int $length): string
 {
@@ -115,3 +117,13 @@ function fieldWithUtf8Charset(FieldBuilder $field, array $emConfig, string $coll
         default => $field,
     };
 }
+
+function camelCaseToHumanFriendly(string $value): string
+{
+    static $filter;
+    if ($filter === null) {
+        $filter = new CamelCaseToSeparator(' ');
+    }
+
+    return ucfirst($filter->filter($value));
+}

module/Core/src/Entity/Visit.php

@@ -10,7 +10,6 @@ use Shlinkio\Shlink\Common\Entity\AbstractEntity;
 use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
 use Shlinkio\Shlink\Common\Util\IpAddress;
 use Shlinkio\Shlink\Core\Model\Visitor;
-use Shlinkio\Shlink\Core\Visit\Model\VisitLocationInterface;
 use Shlinkio\Shlink\Core\Visit\Model\VisitType;
 use Shlinkio\Shlink\Importer\Model\ImportedShlinkVisit;
 
@@ -119,7 +118,7 @@ class Visit extends AbstractEntity implements JsonSerializable
         return $this->shortUrl;
     }
 
-    public function getVisitLocation(): ?VisitLocationInterface
+    public function getVisitLocation(): ?VisitLocation
     {
         return $this->visitLocation;
     }

module/Core/src/Entity/VisitLocation.php

@@ -5,11 +5,10 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Entity;
 
 use Shlinkio\Shlink\Common\Entity\AbstractEntity;
-use Shlinkio\Shlink\Core\Visit\Model\VisitLocationInterface;
 use Shlinkio\Shlink\Importer\Model\ImportedShlinkVisitLocation;
 use Shlinkio\Shlink\IpGeolocation\Model\Location;
 
-class VisitLocation extends AbstractEntity implements VisitLocationInterface
+class VisitLocation extends AbstractEntity
 {
     private string $countryCode;
     private string $countryName;

module/Core/src/Visit/Model/UnknownVisitLocation.php

@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Core\Visit\Model;
-
-final class UnknownVisitLocation implements VisitLocationInterface
-{
-    public function getCountryName(): string
-    {
-        return 'Unknown';
-    }
-
-    public function getLatitude(): float
-    {
-        return 0.0;
-    }
-
-    public function getLongitude(): float
-    {
-        return 0.0;
-    }
-
-    public function getCityName(): string
-    {
-        return 'Unknown';
-    }
-
-    public function jsonSerialize(): array
-    {
-        return [
-            'countryCode' => 'Unknown',
-            'countryName' => 'Unknown',
-            'regionName' => 'Unknown',
-            'cityName' => 'Unknown',
-            'latitude' => 0.0,
-            'longitude' => 0.0,
-            'timezone' => 'Unknown',
-        ];
-    }
-}

module/Core/src/Visit/Model/VisitLocationInterface.php

@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Core\Visit\Model;
-
-use JsonSerializable;
-
-interface VisitLocationInterface extends JsonSerializable
-{
-    public function getCountryName(): string;
-
-    public function getLatitude(): float;
-
-    public function getLongitude(): float;
-
-    public function getCityName(): string;
-}