From 47a2c18c7ee19b4f7aff4e93371b5ff84f77f694 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 22 Oct 2016 13:11:24 +0200
Subject: [PATCH] Added the ability to filter by tag in shotcodes:list command

---
 .../Command/Shortcode/ListShortcodesCommand.php    | 12 ++++++++++--
 .../Shortcode/ListShortcodesCommandTest.php        | 14 +++++++-------
 .../Rest/test/Action/ListShortcodesActionTest.php  |  8 ++++----
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/module/CLI/src/Command/Shortcode/ListShortcodesCommand.php b/module/CLI/src/Command/Shortcode/ListShortcodesCommand.php
index b8a1310c..bfe2ae6f 100644
--- a/module/CLI/src/Command/Shortcode/ListShortcodesCommand.php
+++ b/module/CLI/src/Command/Shortcode/ListShortcodesCommand.php
@@ -67,6 +67,12 @@ class ListShortcodesCommand extends Command
              ->addOption(
                  'tags',
                  't',
+                 InputOption::VALUE_OPTIONAL,
+                 $this->translator->translate('A comma-separated list of tags to filter results')
+             )
+             ->addOption(
+                 'showTags',
+                 null,
                  InputOption::VALUE_NONE,
                  $this->translator->translate('Whether to display the tags or not')
              );
@@ -76,13 +82,15 @@ class ListShortcodesCommand extends Command
     {
         $page = intval($input->getOption('page'));
         $searchTerm = $input->getOption('searchTerm');
-        $showTags = $input->getOption('tags');
+        $tags = $input->getOption('tags');
+        $tags = ! empty($tags) ? explode(',', $tags) : [];
+        $showTags = $input->getOption('showTags');
 
         /** @var QuestionHelper $helper */
         $helper = $this->getHelper('question');
 
         do {
-            $result = $this->shortUrlService->listShortUrls($page, $searchTerm);
+            $result = $this->shortUrlService->listShortUrls($page, $searchTerm, $tags);
             $page++;
             $table = new Table($output);
 
diff --git a/module/CLI/test/Command/Shortcode/ListShortcodesCommandTest.php b/module/CLI/test/Command/Shortcode/ListShortcodesCommandTest.php
index 8ab0d232..306cb87b 100644
--- a/module/CLI/test/Command/Shortcode/ListShortcodesCommandTest.php
+++ b/module/CLI/test/Command/Shortcode/ListShortcodesCommandTest.php
@@ -46,8 +46,8 @@ class ListShortcodesCommandTest extends TestCase
     public function noInputCallsListJustOnce()
     {
         $this->questionHelper->setInputStream($this->getInputStream('\n'));
-        $this->shortUrlService->listShortUrls(1, null)->willReturn(new Paginator(new ArrayAdapter()))
-                                                      ->shouldBeCalledTimes(1);
+        $this->shortUrlService->listShortUrls(1, null, [])->willReturn(new Paginator(new ArrayAdapter()))
+                                                          ->shouldBeCalledTimes(1);
 
         $this->commandTester->execute(['command' => 'shortcode:list']);
     }
@@ -103,8 +103,8 @@ class ListShortcodesCommandTest extends TestCase
     {
         $page = 5;
         $this->questionHelper->setInputStream($this->getInputStream('\n'));
-        $this->shortUrlService->listShortUrls($page, null)->willReturn(new Paginator(new ArrayAdapter()))
-                                                          ->shouldBeCalledTimes(1);
+        $this->shortUrlService->listShortUrls($page, null, [])->willReturn(new Paginator(new ArrayAdapter()))
+                                                              ->shouldBeCalledTimes(1);
 
         $this->commandTester->execute([
             'command' => 'shortcode:list',
@@ -118,12 +118,12 @@ class ListShortcodesCommandTest extends TestCase
     public function ifTagsFlagIsProvidedTagsColumnIsIncluded()
     {
         $this->questionHelper->setInputStream($this->getInputStream('\n'));
-        $this->shortUrlService->listShortUrls(1, null)->willReturn(new Paginator(new ArrayAdapter()))
-                                                      ->shouldBeCalledTimes(1);
+        $this->shortUrlService->listShortUrls(1, null, [])->willReturn(new Paginator(new ArrayAdapter()))
+                                                          ->shouldBeCalledTimes(1);
 
         $this->commandTester->execute([
             'command' => 'shortcode:list',
-            '--tags' => true,
+            '--showTags' => true,
         ]);
         $output = $this->commandTester->getDisplay();
         $this->assertTrue(strpos($output, 'Tags') > 0);
diff --git a/module/Rest/test/Action/ListShortcodesActionTest.php b/module/Rest/test/Action/ListShortcodesActionTest.php
index 9ff2e54a..df15bb0c 100644
--- a/module/Rest/test/Action/ListShortcodesActionTest.php
+++ b/module/Rest/test/Action/ListShortcodesActionTest.php
@@ -34,8 +34,8 @@ class ListShortcodesActionTest extends TestCase
     public function properListReturnsSuccessResponse()
     {
         $page = 3;
-        $this->service->listShortUrls($page, null)->willReturn(new Paginator(new ArrayAdapter()))
-                                                  ->shouldBeCalledTimes(1);
+        $this->service->listShortUrls($page, null, [])->willReturn(new Paginator(new ArrayAdapter()))
+                                                      ->shouldBeCalledTimes(1);
 
         $response = $this->action->__invoke(
             ServerRequestFactory::fromGlobals()->withQueryParams([
@@ -52,8 +52,8 @@ class ListShortcodesActionTest extends TestCase
     public function anExceptionsReturnsErrorResponse()
     {
         $page = 3;
-        $this->service->listShortUrls($page, null)->willThrow(\Exception::class)
-                                                  ->shouldBeCalledTimes(1);
+        $this->service->listShortUrls($page, null, [])->willThrow(\Exception::class)
+                                                      ->shouldBeCalledTimes(1);
 
         $response = $this->action->__invoke(
             ServerRequestFactory::fromGlobals()->withQueryParams([