From f7d09bf1732d4a8d214c382e1947a97949c4d380 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Tue, 17 Dec 2019 10:11:12 +0100
Subject: [PATCH] Slight refactoring on ListSHortUrlsCommand

---
 .../src/Command/ShortUrl/GetVisitsCommand.php |  4 ---
 .../Command/ShortUrl/ListShortUrlsCommand.php | 27 +++++--------------
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/module/CLI/src/Command/ShortUrl/GetVisitsCommand.php b/module/CLI/src/Command/ShortUrl/GetVisitsCommand.php
index 416c1bfb..7a51ac0b 100644
--- a/module/CLI/src/Command/ShortUrl/GetVisitsCommand.php
+++ b/module/CLI/src/Command/ShortUrl/GetVisitsCommand.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
-use Cake\Chronos\Chronos;
 use Shlinkio\Shlink\CLI\Command\Util\AbstractWithDateRangeCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\CLI\Util\ShlinkTable;
@@ -14,14 +13,11 @@ use Shlinkio\Shlink\Core\Model\VisitsParams;
 use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
 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 Throwable;
 
 use function Functional\map;
 use function Functional\select_keys;
-use function sprintf;
 
 class GetVisitsCommand extends AbstractWithDateRangeCommand
 {
diff --git a/module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php b/module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php
index 52918afa..01080189 100644
--- a/module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php
+++ b/module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php
@@ -9,7 +9,6 @@ use Shlinkio\Shlink\CLI\Command\Util\AbstractWithDateRangeCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\CLI\Util\ShlinkTable;
 use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait;
-use Shlinkio\Shlink\Common\Rest\DataTransformerInterface;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Paginator\Adapter\ShortUrlRepositoryAdapter;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
@@ -45,14 +44,14 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
 
     /** @var ShortUrlServiceInterface */
     private $shortUrlService;
-    /** @var array */
-    private $domainConfig;
+    /** @var ShortUrlDataTransformer */
+    private $transformer;
 
     public function __construct(ShortUrlServiceInterface $shortUrlService, array $domainConfig)
     {
         parent::__construct();
         $this->shortUrlService = $shortUrlService;
-        $this->domainConfig = $domainConfig;
+        $this->transformer = new ShortUrlDataTransformer($domainConfig);
     }
 
     protected function doConfigure(): void
@@ -102,6 +101,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
     protected function execute(InputInterface $input, OutputInterface $output): ?int
     {
         $io = new SymfonyStyle($input, $output);
+
         $page = (int) $input->getOption('page');
         $searchTerm = $input->getOption('searchTerm');
         $tags = $input->getOption('tags');
@@ -111,20 +111,8 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
         $endDate = $this->getDateOption($input, $output, 'endDate');
         $orderBy = $this->processOrderBy($input);
 
-        $transformer = new ShortUrlDataTransformer($this->domainConfig);
-
         do {
-            $result = $this->renderPage(
-                $output,
-                $page,
-                $searchTerm,
-                $tags,
-                $showTags,
-                $startDate,
-                $endDate,
-                $orderBy,
-                $transformer
-            );
+            $result = $this->renderPage($output, $page, $searchTerm, $tags, $showTags, $startDate, $endDate, $orderBy);
             $page++;
 
             $continue = $this->isLastPage($result)
@@ -146,8 +134,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
         bool $showTags,
         ?Chronos $startDate,
         ?Chronos $endDate,
-        $orderBy,
-        DataTransformerInterface $transformer
+        $orderBy
     ): Paginator {
         $result = $this->shortUrlService->listShortUrls(
             $page,
@@ -164,7 +151,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
 
         $rows = [];
         foreach ($result as $row) {
-            $shortUrl = $transformer->transform($row);
+            $shortUrl = $this->transformer->transform($row);
             if ($showTags) {
                 $shortUrl['tags'] = implode(', ', $shortUrl['tags']);
             } else {