WIP

databox/api/migrations/Version20230920160828.php

@@ -4,7 +4,6 @@
 
 namespace DoctrineMigrations;
 
-use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
@@ -31,8 +30,7 @@ public function up(Schema $schema): void
         foreach ([
             ['attribute_definition', 'fallback'],
             ['file', 'alternate_urls'],
-                 ] as $t)
-        {
+                 ] as $t) {
             [$table, $column] = $t;
             $rows = $connection->fetchAllAssociative(sprintf('SELECT "id", "%s" FROM "%s"', $column, $table));
 

databox/api/src/Api/InputTransformer/MoveAssetInputTransformer.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Api\InputTransformer;
+
+use App\Api\Model\Input\MoveAssetInput;
+
+class MoveAssetInputTransformer extends AbstractFileInputTransformer
+{
+    public function supports(string $resourceClass, object $data): bool
+    {
+        return $data instanceof MoveAssetInput;
+    }
+
+    /**
+     * @param MoveAssetInput $data
+     */
+    public function transform(object $data, string $resourceClass, array $context = []): object|iterable
+    {
+        return $data;
+    }
+}

databox/api/src/Api/Processor/MoveCollectionProcessor.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Api\Processor;
+
+use ApiPlatform\Api\IriConverterInterface;
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use App\Entity\Core\Collection;
+use App\Security\Voter\AbstractVoter;
+use App\Util\SecurityAwareTrait;
+use Arthem\Bundle\RabbitBundle\Producer\EventProducer;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class MoveCollectionProcessor implements ProcessorInterface
+{
+    use SecurityAwareTrait;
+
+    public function __construct(
+        private readonly EventProducer $eventProducer,
+        private readonly EntityManagerInterface $em,
+        private readonly IriConverterInterface $iriConverter
+    ) {
+    }
+
+    /**
+     * @param Collection $data
+     */
+    public function process($data, Operation $operation, array $uriVariables = [], array $context = []): Response
+    {
+        $this->denyAccessUnlessGranted(AbstractVoter::EDIT, $data);
+        $dest = $uriVariables['dest'];
+        $isRoot = 'root' === $dest;
+
+        if ($isRoot) {
+            $destination = null;
+        } else {
+            $destination = $this->em->find(Collection::class, $dest);
+            if (!$destination instanceof Collection) {
+                throw new NotFoundHttpException(sprintf('Collection destination "%s" not found', $dest));
+            }
+            $this->denyAccessUnlessGranted(AbstractVoter::EDIT, $destination);
+        }
+
+        if ($destination === $data) {
+            throw new \InvalidArgumentException('Cannot reference parent to itself!');
+        }
+
+        $data->setParent($destination);
+
+        $this->em->persist($data);
+        $this->em->flush();
+
+        return new Response('', 204);
+    }
+}

databox/api/src/Elasticsearch/AssetDataTemplateSearch.php

@@ -14,7 +14,6 @@
 use FOS\ElasticaBundle\Paginator\FantaPaginatorAdapter;
 use Pagerfanta\Pagerfanta;
 use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 final readonly class AssetDataTemplateSearch
@@ -103,7 +102,7 @@ public function search(
 
     protected function createACLBoolQuery(array $filters, ?string $userId, array $groupIds, ?Collection $collection): ?Query\BoolQuery
     {
-        $workspaceId = $filters['workspace'] ?? ($collection?->getWorkspaceId()) ?? null;
+        $workspaceId = $filters['workspace'] ?? $collection?->getWorkspaceId() ?? null;
 
         if (empty($workspaceId)) {
             throw new BadRequestHttpException('"workspace" filter is mandatory');

databox/api/src/Elasticsearch/CollectionSearch.php

@@ -5,7 +5,6 @@
 namespace App\Elasticsearch;
 
 use App\Entity\Core\Collection;
-use App\Entity\Core\Workspace;
 use Elastica\Aggregation;
 use Elastica\Query;
 use FOS\ElasticaBundle\Finder\PaginatedFinderInterface;

databox/api/src/Elasticsearch/Mapping/ElasticsearchClient.php

@@ -12,8 +12,7 @@
     public function __construct(
         private Client $client,
         private bool $useAlias,
-    )
-    {
+    ) {
     }
 
     public function updateMapping(string $indexName, array $mapping): void

databox/api/src/Entity/AbstractUuidEntity.php

@@ -5,7 +5,6 @@
 namespace App\Entity;
 
 use ApiPlatform\Metadata\ApiProperty;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Ramsey\Uuid\Doctrine\UuidType;
 use Ramsey\Uuid\Uuid;

databox/api/src/Entity/Basket/Basket.php

@@ -6,7 +6,6 @@
 
 use App\Entity\AbstractUuidEntity;
 use App\Entity\Core\Collection;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]

databox/api/src/Entity/Core/AssetRendition.php

@@ -18,7 +18,6 @@
 use App\Entity\Traits\CreatedAtTrait;
 use App\Entity\Traits\UpdatedAtTrait;
 use App\Repository\Core\AssetRenditionRepository;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 

databox/api/src/Entity/Core/Collection.php

@@ -9,13 +9,14 @@
 use ApiPlatform\Metadata\Delete;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\Link;
 use ApiPlatform\Metadata\Patch;
 use ApiPlatform\Metadata\Post;
 use ApiPlatform\Metadata\Put;
 use App\Api\Model\Input\CollectionInput;
 use App\Api\Model\Output\CollectionOutput;
+use App\Api\Processor\MoveCollectionProcessor;
 use App\Api\Provider\CollectionProvider;
-use App\Controller\Core\MoveCollectionAction;
 use App\Doctrine\Listener\SoftDeleteableInterface;
 use App\Entity\AbstractUuidEntity;
 use App\Entity\ESIndexableInterface;
@@ -49,7 +50,10 @@
         new Patch(security: 'is_granted("EDIT", object)'),
         new Put(
             uriTemplate: '/collections/{id}/move/{dest}',
-            controller: MoveCollectionAction::class,
+            uriVariables: [
+                'dest' => new Link(fromClass: Collection::class, identifiers: ['id'], expandedValue: '{dest}'),
+                'id' => new Link(fromClass: Collection::class, identifiers: ['id']),
+            ],
             openapiContext: [
                 'parameters' => [
                     [
@@ -62,7 +66,8 @@
             ],
             security: 'is_granted("EDIT", object)',
             deserialize: false,
-            name: 'put_move'
+            name: 'put_move',
+            processor: MoveCollectionProcessor::class
         ),
         new GetCollection(),
         new Post(securityPostDenormalize: 'is_granted("CREATE", object)'),

databox/api/src/Entity/Core/CollectionAsset.php

@@ -11,7 +11,6 @@
 use App\Entity\SearchDependencyInterface;
 use App\Entity\Traits\CreatedAtTrait;
 use App\Repository\Core\CollectionAssetRepository;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ApiResource(

databox/api/src/Entity/Media/MediaIndex.php

@@ -7,7 +7,6 @@
 use App\Entity\AbstractUuidEntity;
 use App\Entity\Core\Collection;
 use App\Entity\Traits\WorkspaceTrait;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]

databox/api/src/Entity/Traits/WorkspaceTrait.php

@@ -5,7 +5,6 @@
 namespace App\Entity\Traits;
 
 use App\Entity\Core\Workspace;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 trait WorkspaceTrait

databox/api/src/Entity/Workflow/WorkflowState.php

@@ -17,8 +17,8 @@
 use App\Controller\Workflow\RerunJobAction;
 use App\Entity\Core\Asset;
 use App\Workflow\Event\IncomingUploaderFileWorkflowEvent;
-use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ApiResource(

databox/api/src/Validator/ValidAttributeConstraintValidator.php

@@ -16,7 +16,7 @@ public function __construct(private readonly AttributeTypeRegistry $typeRegistry
     }
 
     /**
-     * @param AbstractBaseAttribute               $value
+     * @param AbstractBaseAttribute   $value
      * @param SameWorkspaceConstraint $constraint
      */
     public function validate($value, Constraint $constraint): void

databox/api/tests/Attribute/Type/DateAttributeTypeTest.php

@@ -41,7 +41,7 @@ public function getDenormalizationCases(): array
             ['2009', null],
             ['foo', null],
             ['1', null],
-            ['2008-01-12T12:13:00Z', \DateTimeImmutable::createFromFormat(\DateTimeInterface::ATOM, '2008-01-12T12:13:00Z')],
+            ['2008-01-12T12:13:00Z', '2008-01-12'],
         ];
     }
 }