Created component wrapping the logic to determine what's the URL to redirect to for a ShortUrl

module/Core/src/Action/AbstractTrackingAction.php

@@ -5,8 +5,6 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Action;
 
 use Fig\Http\Message\RequestMethodInterface;
-use GuzzleHttp\Psr7\Query;
-use League\Uri\Uri;
 use Mezzio\Router\Middleware\ImplicitHeadMiddleware;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -14,16 +12,15 @@ use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\ShortUrlNotFoundException;
 use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Options\TrackingOptions;
 use Shlinkio\Shlink\Core\Service\ShortUrl\ShortUrlResolverInterface;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlRedirectionBuilderInterface;
 use Shlinkio\Shlink\Core\Visit\VisitsTrackerInterface;
 
 use function array_key_exists;
-use function array_merge;
 
 abstract class AbstractTrackingAction implements MiddlewareInterface, RequestMethodInterface
 {
@@ -32,6 +29,7 @@ abstract class AbstractTrackingAction implements MiddlewareInterface, RequestMet
     public function __construct(
         private ShortUrlResolverInterface $urlResolver,
         private VisitsTrackerInterface $visitTracker,
+        private ShortUrlRedirectionBuilderInterface $redirectionBuilder,
         private TrackingOptions $trackingOptions,
         ?LoggerInterface $logger = null
     ) {
@@ -42,36 +40,24 @@ abstract class AbstractTrackingAction implements MiddlewareInterface, RequestMet
     {
         $identifier = ShortUrlIdentifier::fromRedirectRequest($request);
         $query = $request->getQueryParams();
-        $disableTrackParam = $this->trackingOptions->getDisableTrackParam();
 
         try {
             $shortUrl = $this->urlResolver->resolveEnabledShortUrl($identifier);
 
-            if ($this->shouldTrackRequest($request, $query, $disableTrackParam)) {
+            if ($this->shouldTrackRequest($request, $query)) {
                 $this->visitTracker->track($shortUrl, Visitor::fromRequest($request));
             }
 
-            return $this->createSuccessResp($this->buildUrlToRedirectTo($shortUrl, $query, $disableTrackParam));
+            return $this->createSuccessResp($this->redirectionBuilder->buildShortUrlRedirect($shortUrl, $query));
         } catch (ShortUrlNotFoundException $e) {
             $this->logger->warning('An error occurred while tracking short code. {e}', ['e' => $e]);
             return $this->createErrorResp($request, $handler);
         }
     }
 
-    private function buildUrlToRedirectTo(ShortUrl $shortUrl, array $currentQuery, ?string $disableTrackParam): string
-    {
-        $uri = Uri::createFromString($shortUrl->getLongUrl());
-        $hardcodedQuery = Query::parse($uri->getQuery() ?? '');
-        if ($disableTrackParam !== null) {
-            unset($currentQuery[$disableTrackParam]);
-        }
-        $mergedQuery = array_merge($hardcodedQuery, $currentQuery);
-
-        return (string) (empty($mergedQuery) ? $uri : $uri->withQuery(Query::build($mergedQuery)));
-    }
-
-    private function shouldTrackRequest(ServerRequestInterface $request, array $query, ?string $disableTrackParam): bool
+    private function shouldTrackRequest(ServerRequestInterface $request, array $query): bool
     {
+        $disableTrackParam = $this->trackingOptions->getDisableTrackParam();
         $forwardedMethod = $request->getAttribute(ImplicitHeadMiddleware::FORWARDED_HTTP_METHOD_ATTRIBUTE);
         if ($forwardedMethod === self::METHOD_HEAD) {
             return false;

module/Core/src/Action/RedirectAction.php

@@ -11,6 +11,7 @@ use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Core\Options;
 use Shlinkio\Shlink\Core\Service\ShortUrl\ShortUrlResolverInterface;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlRedirectionBuilderInterface;
 use Shlinkio\Shlink\Core\Util\RedirectResponseHelperInterface;
 use Shlinkio\Shlink\Core\Visit\VisitsTrackerInterface;
 
@@ -19,11 +20,12 @@ class RedirectAction extends AbstractTrackingAction implements StatusCodeInterfa
     public function __construct(
         ShortUrlResolverInterface $urlResolver,
         VisitsTrackerInterface $visitTracker,
+        ShortUrlRedirectionBuilderInterface $redirectionBuilder,
         Options\TrackingOptions $trackingOptions,
         private RedirectResponseHelperInterface $redirectResponseHelper,
         ?LoggerInterface $logger = null
     ) {
-        parent::__construct($urlResolver, $visitTracker, $trackingOptions, $logger);
+        parent::__construct($urlResolver, $visitTracker, $redirectionBuilder, $trackingOptions, $logger);
     }
 
     protected function createSuccessResp(string $longUrl): Response

module/Core/src/ShortUrl/Helper/ShortUrlRedirectionBuilder.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\ShortUrl\Helper;
+
+use GuzzleHttp\Psr7\Query;
+use League\Uri\Uri;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Options\TrackingOptions;
+
+use function array_merge;
+use function sprintf;
+
+class ShortUrlRedirectionBuilder implements ShortUrlRedirectionBuilderInterface
+{
+    public function __construct(private TrackingOptions $trackingOptions)
+    {
+    }
+
+    public function buildShortUrlRedirect(ShortUrl $shortUrl, array $currentQuery, ?string $extraPath = null): string
+    {
+        $uri = Uri::createFromString($shortUrl->getLongUrl());
+
+        return $uri
+            ->withQuery($this->resolveQuery($uri, $currentQuery))
+            ->withPath($this->resolvePath($uri, $extraPath))
+            ->__toString();
+    }
+
+    private function resolveQuery(Uri $uri, array $currentQuery): string
+    {
+        $hardcodedQuery = Query::parse($uri->getQuery() ?? '');
+
+        $disableTrackParam = $this->trackingOptions->getDisableTrackParam();
+        if ($disableTrackParam !== null) {
+            unset($currentQuery[$disableTrackParam]);
+        }
+
+        $mergedQuery = array_merge($hardcodedQuery, $currentQuery);
+
+        return empty($mergedQuery) ? '' : Query::build($mergedQuery);
+    }
+
+    private function resolvePath(Uri $uri, ?string $extraPath): string
+    {
+        $hardcodedPath = $uri->getPath();
+        return $extraPath === null ? $hardcodedPath : sprintf('%s%s', $hardcodedPath, $extraPath);
+    }
+}

module/Core/src/ShortUrl/Helper/ShortUrlRedirectionBuilderInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\ShortUrl\Helper;
+
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+
+interface ShortUrlRedirectionBuilderInterface
+{
+    public function buildShortUrlRedirect(ShortUrl $shortUrl, array $currentQuery, ?string $extraPath = null): string;
+}