Added support for ordering in shortcode:list command

module/CLI/src/Command/Shortcode/ListShortcodesCommand.php

@@ -70,6 +70,14 @@ class ListShortcodesCommand extends Command
                  InputOption::VALUE_OPTIONAL,
                  $this->translator->translate('A comma-separated list of tags to filter results')
              )
+             ->addOption(
+                 'orderBy',
+                 'o',
+                 InputOption::VALUE_OPTIONAL,
+                 $this->translator->translate(
+                     'The field from which we want to order by. Pass ASC or DESC separated by a comma'
+                 )
+             )
              ->addOption(
                  'showTags',
                  null,
@@ -85,12 +93,13 @@ class ListShortcodesCommand extends Command
         $tags = $input->getOption('tags');
         $tags = ! empty($tags) ? explode(',', $tags) : [];
         $showTags = $input->getOption('showTags');
+        $orderBy = $input->getOption('orderBy');
 
         /** @var QuestionHelper $helper */
         $helper = $this->getHelper('question');
 
         do {
-            $result = $this->shortUrlService->listShortUrls($page, $searchTerm, $tags);
+            $result = $this->shortUrlService->listShortUrls($page, $searchTerm, $tags, $this->processOrderBy($input));
             $page++;
             $table = new Table($output);
 
@@ -136,4 +145,15 @@ class ListShortcodesCommand extends Command
             }
         } while ($continue);
     }
+
+    protected function processOrderBy(InputInterface $input)
+    {
+        $orderBy = $input->getOption('orderBy');
+        if (empty($orderBy)) {
+            return null;
+        }
+
+        $orderBy = explode(',', $orderBy);
+        return count($orderBy) === 1 ? $orderBy[0] : [$orderBy[0] => $orderBy[1]];
+    }
 }

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()))
+        $this->shortUrlService->listShortUrls(1, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))
-                                                          ->shouldBeCalledTimes(1);
+                                                                ->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()))
+        $this->shortUrlService->listShortUrls($page, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))
-                                                              ->shouldBeCalledTimes(1);
+                                                                    ->shouldBeCalledTimes(1);
 
         $this->commandTester->execute([
             'command' => 'shortcode:list',
@@ -118,8 +118,8 @@ class ListShortcodesCommandTest extends TestCase
     public function ifTagsFlagIsProvidedTagsColumnIsIncluded()
     {
         $this->questionHelper->setInputStream($this->getInputStream('\n'));
-        $this->shortUrlService->listShortUrls(1, null, [])->willReturn(new Paginator(new ArrayAdapter()))
+        $this->shortUrlService->listShortUrls(1, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))
-                                                          ->shouldBeCalledTimes(1);
+                                                                ->shouldBeCalledTimes(1);
 
         $this->commandTester->execute([
             'command' => 'shortcode:list',

module/Core/src/Repository/ShortUrlRepository.php

@@ -43,7 +43,11 @@ class ShortUrlRepository extends EntityRepository implements ShortUrlRepositoryI
         $fieldName = is_array($orderBy) ? key($orderBy) : $orderBy;
         $order = is_array($orderBy) ? $orderBy[$fieldName] : 'ASC';
 
-        if ($fieldName === 'visits') {
+        if (in_array($fieldName, [
+            'visits',
+            'visitsCount',
+            'visitCount',
+        ])) {
             $qb->addSelect('COUNT(v) AS totalVisits')
                ->leftJoin('s.visits', 'v')
                ->groupBy('s')

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()))
+        $this->service->listShortUrls($page, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))
-                                                      ->shouldBeCalledTimes(1);
+                                                            ->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)
+        $this->service->listShortUrls($page, null, [], null)->willThrow(\Exception::class)
-                                                      ->shouldBeCalledTimes(1);
+                                                            ->shouldBeCalledTimes(1);
 
         $response = $this->action->__invoke(
             ServerRequestFactory::fromGlobals()->withQueryParams([