Merge pull request #8 from acelaya-forks/feature/consistencies

Feature/consistencies
shlinkio · Oct 24, 2020 · 9d3364f · 9d3364f
2 parents d942e85 + 54d2255
commit 9d3364f
Show file tree

Hide file tree

Showing 9 changed files with 121 additions and 62 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## 1.0.1 - 2020-10-24
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* Fixed `short-url:import` command throwing an exception if source is not provided.
+
+
 ## 1.0.0 - 2020-10-22
 
 #### Added

diff --git a/src/Command/ImportCommand.php b/src/Command/ImportCommand.php
@@ -57,9 +57,17 @@ protected function interact(InputInterface $input, OutputInterface $output): voi
         $source = $input->getArgument('source');
         $validSources = ImportSources::getAll();
 
-        if (! contains($validSources, $source)) {
+        if ($source !== null && ! contains($validSources, $source)) {
             throw InvalidSourceException::fromInvalidSource($source);
         }
+
+        if ($source === null) {
+            $source = (new SymfonyStyle($input, $output))->choice(
+                'What is the source you want to import from:',
+                $validSources,
+            );
+            $input->setArgument('source', $source);
+        }
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): ?int

diff --git a/src/ImportedLinksProcessorInterface.php b/src/ImportedLinksProcessorInterface.php
@@ -4,12 +4,12 @@
 
 namespace Shlinkio\Shlink\Importer;
 
-use Shlinkio\Shlink\Importer\Model\ShlinkUrl;
+use Shlinkio\Shlink\Importer\Model\ImportedShlinkUrl;
 
 interface ImportedLinksProcessorInterface
 {
     /**
-     * @param ShlinkUrl[] $shlinkUrls
+     * @param ImportedShlinkUrl[] $shlinkUrls
      */
     public function process(iterable $shlinkUrls, string $source, array $params): void;
 }
diff --git a/src/Model/ImportedShlinkUrl.php b/src/Model/ImportedShlinkUrl.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Importer\Model;
+
+use DateTimeInterface;
+
+class ImportedShlinkUrl
+{
+    private string $longUrl;
+    private array $tags;
+    private DateTimeInterface $createdAt;
+    private ?string $domain;
+    private ?string $shortCode;
+
+    public function __construct(
+        string $longUrl,
+        array $tags,
+        DateTimeInterface $createdAt,
+        ?string $domain,
+        ?string $shortCode
+    ) {
+        $this->longUrl = $longUrl;
+        $this->tags = $tags;
+        $this->createdAt = $createdAt;
+        $this->domain = $domain;
+        $this->shortCode = $shortCode;
+    }
+
+    public function longUrl(): string
+    {
+        return $this->longUrl;
+    }
+
+    public function tags(): array
+    {
+        return $this->tags;
+    }
+
+    public function createdAt(): DateTimeInterface
+    {
+        return $this->createdAt;
+    }
+
+    public function domain(): ?string
+    {
+        return $this->domain;
+    }
+
+    public function shortCode(): ?string
+    {
+        return $this->shortCode;
+    }
+}
diff --git a/src/Model/ShlinkUrl.php b/src/Model/ShlinkUrl.php
@@ -4,52 +4,7 @@
 
 namespace Shlinkio\Shlink\Importer\Model;
 
-use DateTimeInterface;
-
-final class ShlinkUrl
+/** @deprecated Use ImportedShlinkUrl instead */
+class ShlinkUrl extends ImportedShlinkUrl
 {
-    private string $longUrl;
-    private array $tags;
-    private DateTimeInterface $createdAt;
-    private ?string $domain;
-    private ?string $shortCode;
-
-    public function __construct(
-        string $longUrl,
-        array $tags,
-        DateTimeInterface $createdAt,
-        ?string $domain,
-        ?string $shortCode
-    ) {
-        $this->longUrl = $longUrl;
-        $this->tags = $tags;
-        $this->createdAt = $createdAt;
-        $this->domain = $domain;
-        $this->shortCode = $shortCode;
-    }
-
-    public function longUrl(): string
-    {
-        return $this->longUrl;
-    }
-
-    public function tags(): array
-    {
-        return $this->tags;
-    }
-
-    public function createdAt(): DateTimeInterface
-    {
-        return $this->createdAt;
-    }
-
-    public function domain(): ?string
-    {
-        return $this->domain;
-    }
-
-    public function shortCode(): ?string
-    {
-        return $this->shortCode;
-    }
 }
diff --git a/src/Strategy/BitlyApiImporter.php b/src/Strategy/BitlyApiImporter.php
@@ -11,7 +11,7 @@
 use Shlinkio\Shlink\Importer\Exception\BitlyApiException;
 use Shlinkio\Shlink\Importer\Exception\ImportException;
 use Shlinkio\Shlink\Importer\Model\BitlyApiProgressTracker;
-use Shlinkio\Shlink\Importer\Model\ShlinkUrl;
+use Shlinkio\Shlink\Importer\Model\ImportedShlinkUrl;
 use Shlinkio\Shlink\Importer\Params\BitlyApiParams;
 use Shlinkio\Shlink\Importer\Util\DateHelpersTrait;
 use Throwable;
@@ -40,7 +40,7 @@ public function __construct(ClientInterface $httpClient, RequestFactoryInterface
     }
 
     /**
-     * @return ShlinkUrl[]
+     * @return ImportedShlinkUrl[]
      * @throws ImportException
      */
     public function import(array $rawParams): iterable
@@ -70,7 +70,7 @@ public function import(array $rawParams): iterable
     }
 
     /**
-     * @return ShlinkUrl[]
+     * @return ImportedShlinkUrl[]
      * @throws ClientExceptionInterface
      * @throws JsonException
      */
@@ -98,7 +98,7 @@ private function loadUrlsForGroup(
                 static fn (array $link): bool => isset($link['long_url']) && ! empty($link['long_url']),
             );
 
-            yield from map($filteredLinks, function (array $link) use ($params, $progressTracker): ShlinkUrl {
+            yield from map($filteredLinks, function (array $link) use ($params, $progressTracker): ImportedShlinkUrl {
                 $hasCreatedDate = isset($link['created_at']);
                 if ($hasCreatedDate) {
                     $progressTracker->updateLastProcessedUrlDate($link['created_at']);
@@ -113,7 +113,7 @@ private function loadUrlsForGroup(
                 $shortCode = ltrim($parsedLink['path'] ?? '', '/');
                 $tags = $params->importTags() ? $link['tags'] ?? [] : [];
 
-                return new ShlinkUrl($link['long_url'], $tags, $date, $domain, $shortCode);
+                return new ImportedShlinkUrl($link['long_url'], $tags, $date, $domain, $shortCode);
             });
         } while (! empty($pagination['next']));
     }

diff --git a/src/Strategy/ImporterStrategyInterface.php b/src/Strategy/ImporterStrategyInterface.php
@@ -5,12 +5,12 @@
 namespace Shlinkio\Shlink\Importer\Strategy;
 
 use Shlinkio\Shlink\Importer\Exception\ImportException;
-use Shlinkio\Shlink\Importer\Model\ShlinkUrl;
+use Shlinkio\Shlink\Importer\Model\ImportedShlinkUrl;
 
 interface ImporterStrategyInterface
 {
     /**
-     * @return ShlinkUrl[]
+     * @return ImportedShlinkUrl[]
      * @throws ImportException
      */
     public function import(array $params): iterable;

diff --git a/test/Command/ImportCommandTest.php b/test/Command/ImportCommandTest.php
@@ -73,23 +73,41 @@ public function exceptionIsThrownWhenInvalidSourceIsProvided(): void
         $this->commandTester->execute(['source' => 'invalid']);
     }
 
-    /** @test */
-    public function dependenciesAreInvokedAsExpected(): void
+    /**
+     * @test
+     * @dataProvider provideSource
+     */
+    public function dependenciesAreInvokedAsExpected(?string $providedSource, bool $expectSourceQuestion): void
     {
-        $source = ImportSources::BITLY;
+        $source = $providedSource ?? ImportSources::BITLY;
 
         $requestParams = $this->paramsHelper->requestParams(Argument::type(StyleInterface::class))->willReturn([]);
         $import = $this->importerStrategy->import([])->willReturn([]);
         $process = $this->importedLinksProcessor->process([], $source, []);
 
-        $exitCode = $this->commandTester->execute(['source' => $source]);
+        if ($expectSourceQuestion) {
+            $this->commandTester->setInputs(['0']);
+        }
+        $exitCode = $this->commandTester->execute(['source' => $providedSource]);
+        $output = $this->commandTester->getDisplay();
 
         self::assertEquals(ImportCommand::SUCCESS, $exitCode);
         $this->consoleHelperManager->get($source)->shouldHaveBeenCalledOnce();
         $this->importerStrategyManager->get($source)->shouldHaveBeenCalledOnce();
         $requestParams->shouldHaveBeenCalledOnce();
         $import->shouldHaveBeenCalledOnce();
         $process->shouldHaveBeenCalledOnce();
+        if ($expectSourceQuestion) {
+            self::assertStringContainsString('What is the source you want to import from:', $output);
+        } else {
+            self::assertStringNotContainsString('What is the source you want to import from:', $output);
+        }
+    }
+
+    public function provideSource(): iterable
+    {
+        yield 'provided source' => [ImportSources::BITLY, false];
+        yield 'not provided source' => [null, true];
     }
 
     /**

diff --git a/test/Strategy/BitlyApiImporterTest.php b/test/Strategy/BitlyApiImporterTest.php
@@ -16,7 +16,7 @@
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\RequestInterface;
 use Shlinkio\Shlink\Importer\Exception\BitlyApiException;
-use Shlinkio\Shlink\Importer\Model\ShlinkUrl;
+use Shlinkio\Shlink\Importer\Model\ImportedShlinkUrl as ShlinkUrl;
 use Shlinkio\Shlink\Importer\Strategy\BitlyApiImporter;
 
 use function explode;