Created specific service to delete short URLs

module/Core/src/Entity/ShortUrl.php

@@ -175,7 +175,7 @@ class ShortUrl extends AbstractEntity
 
     public function getVisitsCount(): int
     {
-        return count($this->visits);
+        return \count($this->visits);
     }
 
     /**

module/Core/src/Exception/DeleteShortUrlException.php

@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Exception;
+
+use Throwable;
+
+class DeleteShortUrlException extends RuntimeException
+{
+    /**
+     * @var int
+     */
+    private $visitsThreshold;
+
+    public function __construct(int $visitsThreshold, string $message = '', int $code = 0, Throwable $previous = null)
+    {
+        $this->visitsThreshold = $visitsThreshold;
+        parent::__construct($message, $code, $previous);
+    }
+
+    public static function fromVisitsThreshold(int $threshold, string $shortCode): self
+    {
+        return new self($threshold, \sprintf(
+            'Impossible to delete short URL with short code "%s" since it has more than "%s" visits.',
+            $shortCode,
+            $threshold
+        ));
+    }
+
+    public function getVisitsThreshold(): int
+    {
+        return $this->visitsThreshold;
+    }
+}

module/Core/src/Exception/InvalidShortCodeException.php

@@ -7,9 +7,9 @@ class InvalidShortCodeException extends RuntimeException
 {
     public static function fromCharset($shortCode, $charSet, \Exception $previous = null)
     {
-        $code = isset($previous) ? $previous->getCode() : -1;
+        $code = $previous !== null ? $previous->getCode() : -1;
         return new static(
-            sprintf('Provided short code "%s" does not match the char set "%s"', $shortCode, $charSet),
+            \sprintf('Provided short code "%s" does not match the char set "%s"', $shortCode, $charSet),
             $code,
             $previous
         );
@@ -17,6 +17,6 @@ class InvalidShortCodeException extends RuntimeException
 
     public static function fromNotFoundShortCode($shortCode)
     {
-        return new static(sprintf('Provided short code "%s" does not belong to a short URL', $shortCode));
+        return new static(\sprintf('Provided short code "%s" does not belong to a short URL', $shortCode));
     }
 }

module/Core/src/Service/ShortUrl/DeleteShortUrlService.php

@@ -0,0 +1,56 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Service\ShortUrl;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Exception;
+use Shlinkio\Shlink\Core\Options\DeleteShortUrlsOptions;
+
+class DeleteShortUrlService implements DeleteShortUrlServiceInterface
+{
+    use FindShortCodeTrait;
+
+    /**
+     * @var EntityManagerInterface
+     */
+    private $em;
+    /**
+     * @var DeleteShortUrlsOptions
+     */
+    private $deleteShortUrlsOptions;
+
+    public function __construct(EntityManagerInterface $em, DeleteShortUrlsOptions $deleteShortUrlsOptions)
+    {
+        $this->em = $em;
+        $this->deleteShortUrlsOptions = $deleteShortUrlsOptions;
+    }
+
+    /**
+     * @throws Exception\InvalidShortCodeException
+     * @throws Exception\DeleteShortUrlException
+     */
+    public function deleteByShortCode(string $shortCode): void
+    {
+        $shortUrl = $this->findByShortCode($this->em, $shortCode);
+        if ($this->isThresholdReached($shortUrl)) {
+            throw Exception\DeleteShortUrlException::fromVisitsThreshold(
+                $this->deleteShortUrlsOptions->getVisitsThreshold(),
+                $shortUrl->getShortCode()
+            );
+        }
+
+        $this->em->remove($shortUrl);
+        $this->em->flush();
+    }
+
+    private function isThresholdReached(ShortUrl $shortUrl): bool
+    {
+        if (! $this->deleteShortUrlsOptions->doCheckVisitsThreshold()) {
+            return false;
+        }
+
+        return $shortUrl->getVisitsCount() >= $this->deleteShortUrlsOptions->getVisitsThreshold();
+    }
+}

module/Core/src/Service/ShortUrl/DeleteShortUrlServiceInterface.php

@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Service\ShortUrl;
+
+use Shlinkio\Shlink\Core\Exception;
+
+interface DeleteShortUrlServiceInterface
+{
+    /**
+     * @throws Exception\InvalidShortCodeException
+     * @throws Exception\DeleteShortUrlException
+     */
+    public function deleteByShortCode(string $shortCode): void;
+}

module/Core/src/Service/ShortUrl/FindShortCodeTrait.php

@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Service\ShortUrl;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
+
+trait FindShortCodeTrait
+{
+    /**
+     * @param string $shortCode
+     * @return ShortUrl
+     * @throws InvalidShortCodeException
+     */
+    private function findByShortCode(EntityManagerInterface $em, string $shortCode): ShortUrl
+    {
+        /** @var ShortUrl|null $shortUrl */
+        $shortUrl = $em->getRepository(ShortUrl::class)->findOneBy([
+            'shortCode' => $shortCode,
+        ]);
+        if ($shortUrl === null) {
+            throw InvalidShortCodeException::fromNotFoundShortCode($shortCode);
+        }
+
+        return $shortUrl;
+    }
+}

module/Core/src/Service/ShortUrlService.php

@@ -9,11 +9,13 @@ use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
 use Shlinkio\Shlink\Core\Repository\ShortUrlRepository;
+use Shlinkio\Shlink\Core\Service\ShortUrl\FindShortCodeTrait;
 use Shlinkio\Shlink\Core\Util\TagManagerTrait;
 use Zend\Paginator\Paginator;
 
 class ShortUrlService implements ShortUrlServiceInterface
 {
+    use FindShortCodeTrait;
     use TagManagerTrait;
 
     /**
@@ -48,7 +50,7 @@ class ShortUrlService implements ShortUrlServiceInterface
      */
     public function setTagsByShortCode(string $shortCode, array $tags = []): ShortUrl
     {
-        $shortUrl = $this->findByShortCode($shortCode);
+        $shortUrl = $this->findByShortCode($this->em, $shortCode);
         $shortUrl->setTags($this->tagNamesToEntities($this->em, $tags));
         $this->em->flush();
 
@@ -60,7 +62,7 @@ class ShortUrlService implements ShortUrlServiceInterface
      */
     public function updateMetadataByShortCode(string $shortCode, ShortUrlMeta $shortCodeMeta): ShortUrl
     {
-        $shortUrl = $this->findByShortCode($shortCode);
+        $shortUrl = $this->findByShortCode($this->em, $shortCode);
         if ($shortCodeMeta->hasValidSince()) {
             $shortUrl->setValidSince($shortCodeMeta->getValidSince());
         }
@@ -77,31 +79,4 @@ class ShortUrlService implements ShortUrlServiceInterface
 
         return $shortUrl;
     }
-
-    /**
-     * @throws InvalidShortCodeException
-     */
-    public function deleteByShortCode(string $shortCode): void
-    {
-        $this->em->remove($this->findByShortCode($shortCode));
-        $this->em->flush();
-    }
-
-    /**
-     * @param string $shortCode
-     * @return ShortUrl
-     * @throws InvalidShortCodeException
-     */
-    private function findByShortCode(string $shortCode): ShortUrl
-    {
-        /** @var ShortUrl|null $shortUrl */
-        $shortUrl = $this->em->getRepository(ShortUrl::class)->findOneBy([
-            'shortCode' => $shortCode,
-        ]);
-        if ($shortUrl === null) {
-            throw InvalidShortCodeException::fromNotFoundShortCode($shortCode);
-        }
-
-        return $shortUrl;
-    }
 }

module/Core/src/Service/ShortUrlServiceInterface.php

@@ -27,9 +27,4 @@ interface ShortUrlServiceInterface
      * @throws InvalidShortCodeException
      */
     public function updateMetadataByShortCode(string $shortCode, ShortUrlMeta $shortCodeMeta): ShortUrl;
-
-    /**
-     * @throws InvalidShortCodeException
-     */
-    public function deleteByShortCode(string $shortCode): void;
 }