some fix

Author: aynsix

api/config/packages/messenger.yaml

@@ -12,9 +12,9 @@ framework:
 
         routing:
             # Route your messages to the transports
-            'App\Consumer\Handler\BuildMessage': async
-            'App\Consumer\Handler\DeleteMessage': async
-            'App\Consumer\Handler\CleanMessage': async
+            'App\Consumer\Handler\BuildArchive': async
+            'App\Consumer\Handler\DeleteArchive': async
+            'App\Consumer\Handler\CleanOldArchives': async
 
 # when@test:
 #    framework:

api/config/services.yaml

@@ -53,7 +53,7 @@ services:
 
     GuzzleHttp\ClientInterface: '@GuzzleHttp\Client'
 
-    App\Api\Processor\ArchiveInputProcessor:
+    App\Api\Processor\ArchiveProcessor:
         arguments:
             $maxExpirationTime: '%env(int:MAX_EXPIRATION_TIME)%'
 

…/Api/Processor/ArchiveInputProcessor.php …i/src/Api/Processor/ArchiveProcessor.phpapi/src/Api/Processor/ArchiveInputProcessor.php renamed to api/src/Api/Processor/ArchiveProcessor.php api/src/Api/Processor/ArchiveInputProcessor.php renamed to api/src/Api/Processor/ArchiveProcessor.php

@@ -8,16 +8,16 @@
 use App\Entity\Archive;
 use ApiPlatform\Metadata\Operation;
 use App\Archive\IdentifierGenerator;
-use App\Consumer\Handler\BuildMessage;
 use Doctrine\ORM\EntityManagerInterface;
 use ApiPlatform\State\ProcessorInterface;
 use Symfony\Bundle\SecurityBundle\Security;
 use ApiPlatform\Validator\ValidatorInterface;
 use ApiPlatform\Serializer\AbstractItemNormalizer;
+use App\Consumer\Handler\BuildArchive;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
-class ArchiveInputProcessor implements ProcessorInterface
+class ArchiveProcessor implements ProcessorInterface
 {
     private ValidatorInterface $validator;
     private IdentifierGenerator $identifierGenerator;
@@ -97,7 +97,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
         $this->em->persist($object);
         $this->em->flush();
 
-        $this->bus->dispatch(new BuildMessage((['id' => $object->getId()])));
+        $this->bus->dispatch(new BuildArchive($object->getId()));
 
         return $object;
     }

api/src/Command/CleanOldArchivesCommand.php

@@ -4,7 +4,7 @@
 
 namespace App\Command;
 
-use App\Consumer\Handler\CleanMessage;
+use App\Consumer\Handler\CleanOldArchives;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -31,7 +31,7 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->bus->dispatch(new CleanMessage([]));
+        $this->bus->dispatch(new CleanOldArchives());
 
         $output->writeln('Clean triggered!');
 

api/src/Consumer/Handler/BuildArchive.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Consumer\Handler;
+
+class BuildArchive
+{
+    public function __construct(private string $id = '')
+    {
+    }
+    
+    public function getId(): string
+    {
+        return $this->id;
+    }
+}

api/src/Consumer/Handler/BuildArchiveHandler.php

@@ -8,7 +8,6 @@
 use App\Entity\Archive;
 use Doctrine\DBAL\LockMode;
 use App\Archive\ArchiveManager;
-use App\Consumer\Handler\BuildMessage;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -25,10 +24,9 @@ public function __construct(ArchiveManager $archiveManager, EntityManagerInterfa
         $this->em = $em;
     }
 
-    public function __invoke(BuildMessage $message): void
+    public function __invoke(BuildArchive $message): void
     {
-        $payload = $message->getPayload();
-        $id = $payload['id'];
+        $id = $message->getId();
 
         $archive = $this->em->transactional(function () use ($id): ?Archive {
             $archive = $this->em->find(Archive::class, $id, LockMode::PESSIMISTIC_WRITE);

api/src/Consumer/Handler/BuildMessage.php

@@ -4,7 +4,7 @@
 
 namespace App\Consumer\Handler;
 
-class DeleteMessage extends BuildMessage
+class CleanOldArchives extends BuildArchive
 {
 
-}
+}

…i/src/Consumer/Handler/DeleteMessage.php …rc/Consumer/Handler/CleanOldArchives.phpapi/src/Consumer/Handler/DeleteMessage.php renamed to api/src/Consumer/Handler/CleanOldArchives.php api/src/Consumer/Handler/DeleteMessage.php renamed to api/src/Consumer/Handler/CleanOldArchives.php

@@ -5,7 +5,6 @@
 namespace App\Consumer\Handler;
 
 use App\Entity\Archive;
-use App\Consumer\Handler\EventMessage;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
@@ -19,14 +18,12 @@ public function __construct(private MessageBusInterface $bus,
 
     }
 
-    public function __invoke(CleanMessage $message): void
+    public function __invoke(CleanOldArchives $message): void
     {
         $archives = $this->em->getRepository(Archive::class)->getExpired();
 
         foreach ($archives as $archive) {
-            $this->bus->dispatch(new DeleteMessage([
-                'id' => $archive->getId(),
-            ]));
+            $this->bus->dispatch(new DeleteArchive($archive->getId()));
         }
     }
 }

api/src/Consumer/Handler/CleanOldArchivesHandler.php

@@ -4,7 +4,7 @@
 
 namespace App\Consumer\Handler;
 
-class CleanMessage extends BuildMessage
+class DeleteArchive extends BuildArchive
 {
 
-}
+}