local conflict resolution

Author: nmaillat

bin/dev/reset-db-fixtures.sh

@@ -17,3 +17,11 @@ docker compose run --rm databox-api-php /bin/ash -c 'bin/console doctrine:databa
 && bin/console doctrine:migrations:version --add --all --no-interaction \
 && bin/console hautelook:fixtures:load --no-interaction \
 && bin/console fos:elastica:populate'
+
+docker compose run --rm -e DATABOX_UPLOADER_TARGET_SLUG uploader-api-php /bin/ash -c 'bin/console doctrine:database:drop --force \
+&& bin/console doctrine:database:create \
+&& bin/console doctrine:schema:create \
+&& bin/console doctrine:migrations:sync-metadata-storage \
+&& bin/console doctrine:migrations:version --delete --all --no-interaction \
+&& bin/console doctrine:migrations:version --add --all --no-interaction \
+&& bin/console app:create-target ${DATABOX_UPLOADER_TARGET_SLUG} Databox\ Uploader http://databox-api/incoming-uploads'

databox/api/config/workflows/incoming-uploader-file.yaml

@@ -24,6 +24,7 @@ jobs:
         outputs:
             fileId: ${{ steps.accept_file.outputs.fileId }}
             assetId: ${{ steps.accept_file.outputs.assetId }}
+            renditionId: ${{ steps.accept_file.outputs.renditionId }}
 
     uploader_ack:
         needs: [ border ]
@@ -37,3 +38,4 @@ jobs:
         with:
             assetId: ${{ jobs.border.outputs.assetId }}
             fileId: ${{ jobs.border.outputs.fileId }}
+            renditionId: ${{ jobs.border.outputs.renditionId }}

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

@@ -5,7 +5,6 @@
 namespace App\Api\Processor;
 
 use Alchemy\AuthBundle\Security\Traits\SecurityAwareTrait;
-use Alchemy\CoreBundle\Pusher\PusherManager;
 use Alchemy\CoreBundle\Util\DoctrineUtil;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
@@ -27,7 +26,6 @@ public function __construct(
         private readonly EntityManagerInterface $em,
         private readonly MessageBusInterface $bus,
         private readonly ThreadRepository $threadRepository,
-        private readonly PusherManager $pusherManager,
         private readonly DiscussionPusher $discussionPusher,
     ) {
     }

databox/api/src/Security/Voter/ThreadMessageVoter.php

@@ -26,6 +26,8 @@ public function supportsType(string $subjectType): bool
     protected function voteOnAttribute(string $attribute, $subject, TokenInterface $token): bool
     {
         switch ($attribute) {
+            case self::READ:
+                return $this->security->isGranted(self::READ, $subject->getThread());
             case self::EDIT:
             case self::DELETE:
                 $user = $token->getUser();

databox/api/src/Security/Voter/ThreadVoter.php

@@ -38,7 +38,7 @@ protected function voteOnAttribute(string $attribute, $subject, TokenInterface $
                 return $this->security->isGranted(self::READ, $object);
             case self::EDIT:
                 return $this->security->isGranted(JwtUser::IS_AUTHENTICATED_FULLY)
-                    && $this->security->isGranted(self::EDIT, $object);
+                    && $this->security->isGranted(self::READ, $object);
         }
 
         return false;

databox/api/src/Service/DiscussionPusher.php

@@ -5,13 +5,11 @@
 use Alchemy\CoreBundle\Pusher\PusherManager;
 use App\Entity\Discussion\Message;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Serializer\SerializerInterface;
 
 final readonly class DiscussionPusher
 {
     public function __construct(
         private PusherManager $pusherManager,
-        private SerializerInterface $serializer,
         private MessageBusInterface $bus,
     ) {
     }
@@ -23,14 +21,9 @@ public function dispatchMessageToThread(Message $message, bool $removed = false)
         $this->bus->dispatch($this->pusherManager->createBusMessage(
             'thread-'.$message->getThread()->getKey(),
             $event,
-            $removed ? [
+            [
                 'id' => $message->getId(),
-            ] : json_decode($this->serializer->serialize($message, 'json', [
-                'groups' => [
-                    '_',
-                    Message::GROUP_READ,
-                ],
-            ]), true, 512, JSON_THROW_ON_ERROR),
+            ],
         ));
     }
 }

databox/api/src/Workflow/Action/AcceptFileAction.php

@@ -12,6 +12,7 @@
 use App\Border\UploaderClient;
 use App\Entity\Core\Asset;
 use App\Entity\Core\Collection;
+use App\Entity\Core\RenditionDefinition;
 use App\Entity\Core\Workspace;
 use Doctrine\ORM\EntityManagerInterface;
 
@@ -28,16 +29,22 @@ public function handle(RunContext $context): void
     {
         $inputs = $context->getInputs();
         $userId = $inputs['userId'];
-        $assetData = $this->uploaderClient->getAsset($inputs['baseUrl'], $inputs['assetId'], $inputs['token']);
         $data = $assetData['data'];
-        $assetId = $data['targetAsset'] ?? null;
+        $assetId = $assetData['data']['targetAsset'] ?? null;
+        $assetData = $this->uploaderClient->getAsset($inputs['baseUrl'], $inputs['assetId'], $inputs['token']);
+        $renditionDefId = $assetData['data']['targetRendition'] ?? null;
 
         if (null !== $assetId) {
             $asset = DoctrineUtil::findStrict($this->em, Asset::class, $assetId);
-            $uploadToken = $data['uploadToken'];
+            if ($renditionDefId) {
+                DoctrineUtil::findStrict($this->em, RenditionDefinition::class, $renditionDefId);
+            } else {
+                $uploadToken = $assetData['data']['uploadToken'];
 
-            if ($uploadToken !== $asset->getPendingUploadToken()) {
-                throw new \InvalidArgumentException('Unexpected upload token');
+
+                if ($uploadToken !== $asset->getPendingUploadToken()) {
+                    throw new \InvalidArgumentException('Unexpected upload token');
+                }
             }
         } else {
             $collection = null;
@@ -76,5 +83,6 @@ public function handle(RunContext $context): void
         $file = $this->borderManager->acceptFile($inputFile, $asset->getWorkspace());
         $context->setOutput('fileId', $file->getId());
         $context->setOutput('assetId', $asset->getId());
+        $context->setOutput('renditionId', $renditionDefId);
     }
 }

databox/api/src/Workflow/Action/AssignSourceFileToAssetAction.php

@@ -10,13 +10,16 @@
 use App\Asset\AssetManager;
 use App\Entity\Core\Asset;
 use App\Entity\Core\File;
+use App\Entity\Core\RenditionDefinition;
+use App\Storage\RenditionManager;
 use Doctrine\ORM\EntityManagerInterface;
 
 readonly class AssignSourceFileToAssetAction implements ActionInterface
 {
     public function __construct(
         private AssetManager $assetManager,
         private EntityManagerInterface $em,
+        private RenditionManager $renditionManager,
     ) {
     }
 
@@ -25,11 +28,31 @@ public function handle(RunContext $context): void
         $inputs = $context->getInputs();
         $fileId = $inputs['fileId'];
         $assetId = $inputs['assetId'];
+        $renditionId = $inputs['renditionId'];
 
         $file = DoctrineUtil::findStrict($this->em, File::class, $fileId);
         $asset = DoctrineUtil::findStrict($this->em, Asset::class, $assetId);
 
-        $this->assetManager->assignNewAssetSourceFile($asset, $file);
-        $this->em->flush();
+        if (null !== $renditionId) {
+            $renditionDefinition = DoctrineUtil::findStrict($this->em, RenditionDefinition::class, $renditionId);
+            if ($renditionDefinition->getWorkspaceId() !== $asset->getWorkspaceId()) {
+                throw new \InvalidArgumentException(sprintf('Rendition "%s" does not belong to the same workspace as the asset "%s"', $renditionDefinition->getId(), $asset->getId()));
+            }
+
+            $this->renditionManager->createOrReplaceRenditionFile(
+                $asset,
+                $renditionDefinition,
+                $file,
+                buildHash: null,
+                moduleHashes: [],
+                substituted: true,
+                force: true,
+                projection: false,
+            );
+            $this->em->flush();
+        } else {
+            $this->assetManager->assignNewAssetSourceFile($asset, $file);
+            $this->em->flush();
+        }
     }
 }

databox/client/src/api/discussion.ts

@@ -11,6 +11,10 @@ export async function getThreadMessages(
     return getHydraCollection(res.data);
 }
 
+export async function getMessage(id: string): Promise<ThreadMessage> {
+    return (await apiClient.get(`/messages/${id}`)).data;
+}
+
 export async function postThreadMessage(data: {
     threadKey: string;
     threadId?: string;

databox/client/src/api/uploader/file.ts

@@ -25,28 +25,51 @@ type FormData = Record<string, any> | undefined;
 
 type UploadedFile = {
     data?: Record<string, any>;
-    file: File;
-};
+} & FileOrUrl;
+
+export type FileOrUrl =
+    | {
+          file: File;
+          url?: never;
+      }
+    | {
+          file?: never;
+          url: string;
+      };
+
 export async function UploadFiles(
     files: UploadedFile[],
     formData?: FormData
 ): Promise<void> {
     const targetSlug = config.uploaderTargetSlug;
-    const assets = await promiseConcurrency(
-        files.map(f => () => UploadFile(targetSlug, f)),
-        2
-    );
+    const assets = (
+        await promiseConcurrency(
+            files.map(f => () => UploadFile(targetSlug, f)),
+            2
+        )
+    ).filter(a => a) as string[];
 
-    await CommitUpload(targetSlug, assets, formData);
+    if (assets.length > 0) {
+        await CommitUpload(targetSlug, assets, formData);
+    }
 }
 
 export async function UploadFile(
     targetSlug: string,
     uploadedFile: UploadedFile
-): Promise<string> {
+): Promise<string | undefined> {
+    if (uploadedFile.url) {
+        await uploaderClient.post(`/downloads`, {
+            targetSlug,
+            url: uploadedFile.url,
+            data: uploadedFile.data,
+        });
+        return;
+    }
+
     const multipart = await multipartUpload(
         uploaderClient,
-        uploadedFile.file,
+        uploadedFile.file!,
         {}
     );