Fix Both IndexEntity & RemoveEntity messages are handled

src/Message/Handler/AbstractEntityHandler.php

@@ -13,7 +13,7 @@
 use Setono\SyliusMeilisearchPlugin\Model\IndexableInterface;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 
 abstract class AbstractEntityHandler
 {
     use ORMTrait;
 
@@ -22,17 +22,18 @@
         $this->managerRegistry = $managerRegistry;
     }
 
-    public function __invoke(RemoveEntity|IndexEntity $message): void
+    /**
+     * @param callable(IndexableInterface $entity, Index $index):void $action
+     */
+    protected function handle(RemoveEntity|IndexEntity $message, callable $action): void
     {
         $entity = $this->getManager($message->class)->find($message->class, $message->id);
         if (null === $entity) {
             throw new UnrecoverableMessageHandlingException(sprintf('Entity (%s) with id %s not found', $message->class, (string) $message->id));
         }
 
         foreach ($this->indexRegistry->getByEntity($message->class) as $index) {
-            $this->execute($entity, $index);
+            $action($entity, $index);
         }
     }
-
-    abstract protected function execute(IndexableInterface $entity, Index $index): void;
 }

src/Message/Handler/IndexEntityHandler.php

@@ -5,12 +5,13 @@
 namespace Setono\SyliusMeilisearchPlugin\Message\Handler;
 
 use Setono\SyliusMeilisearchPlugin\Config\Index;
+use Setono\SyliusMeilisearchPlugin\Message\Command\IndexEntity;
 use Setono\SyliusMeilisearchPlugin\Model\IndexableInterface;
 
 final class IndexEntityHandler extends AbstractEntityHandler
 {
-    protected function execute(IndexableInterface $entity, Index $index): void
+    public function __invoke(IndexEntity $message): void
     {
-        $index->indexer()->indexEntity($entity);
+        $this->handle($message, static fn (IndexableInterface $entity, Index $index) => $index->indexer()->indexEntity($entity));
     }
 }

src/Message/Handler/RemoveEntityHandler.php

@@ -5,12 +5,13 @@
 namespace Setono\SyliusMeilisearchPlugin\Message\Handler;
 
 use Setono\SyliusMeilisearchPlugin\Config\Index;
+use Setono\SyliusMeilisearchPlugin\Message\Command\RemoveEntity;
 use Setono\SyliusMeilisearchPlugin\Model\IndexableInterface;
 
 final class RemoveEntityHandler extends AbstractEntityHandler
 {
-    protected function execute(IndexableInterface $entity, Index $index): void
+    public function __invoke(RemoveEntity $message): void
     {
-        $index->indexer()->removeEntity($entity);
+        $this->handle($message, static fn (IndexableInterface $entity, Index $index) => $index->indexer()->removeEntity($entity));
     }
 }