Revert "IBX-8180: OpenAPI compatible location swap endpoint (#107)"

This reverts commit 3f1fbf6.

Author: adamwojs

composer.json

@@ -41,8 +41,7 @@
         "symfony/routing": "^5.3",
         "symfony/security-bundle": "^5.3",
         "symfony/security-csrf": "^5.3",
-        "symfony/yaml": "^5.3",
-        "webmozart/assert": "^1.11"
+        "symfony/yaml": "^5.3"
     },
     "require-dev": {
         "ibexa/ci-scripts": "^0.2@dev",

src/bundle/Resources/config/input_parsers.yml

@@ -866,11 +866,3 @@ services:
             $validator: '@validator'
         tags:
             - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.MoveLocationInput }
-
-    Ibexa\Rest\Server\Input\Parser\SwapLocationInput:
-        parent: Ibexa\Rest\Server\Common\Parser
-        arguments:
-            $locationService: '@ibexa.api.service.location'
-            $validator: '@validator'
-        tags:
-            - { name: ibexa.rest.input.parser, mediaType: application/vnd.ibexa.api.SwapLocationInput }

src/bundle/Resources/config/routing.yml

@@ -432,17 +432,8 @@ ibexa.rest.languages.view:
 
 # Locations
 
-ibexa.rest.location.swap:
-    path: /content/locations/{locationPath}
-    controller: Ibexa\Rest\Server\Controller\Location::swap
-    condition: 'ibexa_get_media_type(request) === "SwapLocationInput"'
-    methods: [POST]
-    options:
-        options_route_suffix: 'SwapLocationInput'
-    requirements:
-        locationPath: "[0-9/]+"
 
-ibexa.rest.location.move:
+ibexa.rest.move_location:
     path: /content/locations/{locationPath}
     controller: Ibexa\Rest\Server\Controller\Location::moveLocation
     condition: 'ibexa_get_media_type(request) === "MoveLocationInput"'

src/lib/Server/Controller/Location.php

@@ -338,27 +338,6 @@ public function swapLocation($locationPath, Request $request)
         return new Values\NoContent();
     }
 
-    /**
-     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
-     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
-     */
-    public function swap(Request $request, string $locationPath): Values\NoContent
-    {
-        $locationId = $this->extractLocationIdFromPath($locationPath);
-        $location = $this->locationService->loadLocation($locationId);
-
-        $destinationLocation = $this->inputDispatcher->parse(
-            new Message(
-                ['Content-Type' => $request->headers->get('Content-Type')],
-                $request->getContent(),
-            ),
-        );
-
-        $this->locationService->swapLocation($location, $destinationLocation);
-
-        return new Values\NoContent();
-    }
-
     /**
      * Loads a location by remote ID.
      *

src/lib/Server/Input/Parser/AbstractDestinationLocationParser.php

@@ -8,15 +8,77 @@
 
 namespace Ibexa\Rest\Server\Input\Parser;
 
-use Ibexa\Rest\Server\Validation\Builder\Input\Parser\BaseInputParserValidatorBuilder;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
+use Ibexa\Rest\Input\BaseParser;
+use Ibexa\Rest\Server\Exceptions\ValidationFailedException;
 use Ibexa\Rest\Server\Validation\Builder\Input\Parser\MoveLocationInputValidatorBuilder;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 
-final class MoveLocation extends AbstractDestinationLocationParser
+final class MoveLocation extends BaseParser
 {
-    protected const string PARSER = 'MoveLocation';
+    public const string DESTINATION_KEY = 'destination';
 
-    protected function getValidatorBuilder(): BaseInputParserValidatorBuilder
+    public function __construct(
+        private readonly LocationService $locationService,
+        private readonly ValidatorInterface $validator,
+    ) {
+    }
+
+    /**
+     * @phpstan-param array{
+     *     'destination': string,
+     * } $data
+     *
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Rest\Exceptions\Parser
+     */
+    public function parse(array $data, ParsingDispatcher $parsingDispatcher): Location
+    {
+        $this->validateInputData($data);
+
+        return $this->getLocationByPath($data[self::DESTINATION_KEY]);
+    }
+
+    /**
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     */
+    private function getLocationByPath(string $path): Location
+    {
+        return $this->locationService->loadLocation(
+            $this->extractLocationIdFromPath($path)
+        );
+    }
+
+    private function extractLocationIdFromPath(string $path): int
+    {
+        $pathParts = explode('/', $path);
+
+        return (int)array_pop($pathParts);
+    }
+
+    /**
+     * @phpstan-assert array{
+     *      'destination': string,
+     *  } $data
+     *
+     * @param array<mixed> $data
+     *
+     * @throws \Ibexa\Rest\Server\Exceptions\ValidationFailedException
+     */
+    private function validateInputData(array $data): void
     {
-        return new MoveLocationInputValidatorBuilder($this->validator);
+        $builder = new MoveLocationInputValidatorBuilder($this->validator);
+        $builder->validateInputArray($data);
+        $violations = $builder->build()->getViolations();
+        if ($violations->count() > 0) {
+            throw new ValidationFailedException(
+                'MoveLocation',
+                $violations,
+            );
+        }
     }
 }

src/lib/Server/Input/Parser/MoveLocation.php

@@ -81,7 +81,6 @@ public function providerForTestHttpOptions(): array
             ['/content/objects/1/objectstates', ['GET', 'PATCH']],
             ['/content/locations', ['GET']],
             ['/content/locations/1/2', ['POST'], 'MoveLocationInput+json'],
-            ['/content/locations/1/2', ['POST'], 'SwapLocationInput+json'],
             ['/content/locations/1/2', ['GET', 'PATCH', 'DELETE', 'COPY', 'MOVE', 'SWAP']],
             ['/content/locations/1/2/children', ['GET']],
             ['/content/objects/1/locations', ['GET', 'POST']],

src/lib/Server/Input/Parser/SwapLocationInput.php

@@ -268,7 +268,7 @@ private function createUrlAlias(string $locationHref, string $urlAlias): string
     /**
      * @depends testMoveSubtree
      */
-    public function testMoveLocation(string $locationHref): string
+    public function testMoveLocation(string $locationHref): void
     {
         $request = $this->createHttpRequest(
             'POST',
@@ -282,55 +282,5 @@ public function testMoveLocation(string $locationHref): string
 
         self::assertHttpResponseCodeEquals($response, 201);
         self::assertHttpResponseHasHeader($response, 'Location');
-
-        return $locationHref;
-    }
-
-    /**
-     * @depends testMoveLocation
-     */
-    public function testSwap(string $locationHref): void
-    {
-        $request = $this->createHttpRequest(
-            'COPY',
-            $locationHref,
-            '',
-            '',
-            '',
-            ['Destination' => '/api/ibexa/v2/content/locations/1/43']
-        );
-        $response = $this->sendHttpRequest($request);
-        $newCopiedLocation = $response->getHeader('Location')[0];
-
-        $request = $this->createHttpRequest(
-            'COPY',
-            $locationHref,
-            '',
-            '',
-            '',
-            ['Destination' => '/api/ibexa/v2/content/locations/1/43']
-        );
-        $response = $this->sendHttpRequest($request);
-        $secondCopiedLocation = $response->getHeader('Location')[0];
-
-        $request = $this->createHttpRequest(
-            'POST',
-            $newCopiedLocation,
-            'SwapLocationInput+json',
-            '',
-            json_encode([
-                'SwapLocationInput' => [
-                    'destination' => str_replace(
-                        '/api/ibexa/v2/content/locations',
-                        '',
-                        $secondCopiedLocation,
-                    ),
-                ],
-            ], JSON_THROW_ON_ERROR),
-        );
-
-        $response = $this->sendHttpRequest($request);
-
-        self::assertHttpResponseCodeEquals($response, 204);
     }
 }