Removing the IndexResource command

src/DependencyInjection/Configuration.php

@@ -36,6 +36,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                                 ->cannotBeEmpty()
                                 ->defaultValue('setono_sylius_meilisearch.indexer.default')
                             ->end()
+                            // todo change this to entities instead
                             ->arrayNode('resources')
                                 ->info('The Sylius resources that make up this index. Examples could be "sylius.product", "sylius.taxon", etc.')
                                 ->scalarPrototype()->end()

src/EventSubscriber/Doctrine/EntityChangeSubscriber.php

@@ -29,12 +29,12 @@ public function getSubscribedEvents(): array
 
     public function update(LifecycleEventArgs $eventArgs): void
     {
-        $this->dispatch($eventArgs, static fn (IndexableInterface $entity) => new IndexEntity($entity));
+        $this->dispatch($eventArgs, static fn (IndexableInterface $entity) => IndexEntity::new($entity));
     }
 
     public function remove(LifecycleEventArgs $eventArgs): void
     {
-        $this->dispatch($eventArgs, static fn (IndexableInterface $entity) => new RemoveEntity($entity));
+        $this->dispatch($eventArgs, static fn (IndexableInterface $entity) => RemoveEntity::new($entity));
     }
 
     /**

src/Indexer/DefaultIndexer.php

@@ -17,7 +17,6 @@
 use Setono\SyliusMeilisearchPlugin\Filter\Object\FilterInterface as ObjectFilterInterface;
 use Setono\SyliusMeilisearchPlugin\IndexScope\IndexScope;
 use Setono\SyliusMeilisearchPlugin\Message\Command\IndexEntities;
-use Setono\SyliusMeilisearchPlugin\Message\Command\IndexResource;
 use Setono\SyliusMeilisearchPlugin\Model\IndexableInterface;
 use Setono\SyliusMeilisearchPlugin\Provider\IndexScope\IndexScopeProviderInterface;
 use Setono\SyliusMeilisearchPlugin\Provider\IndexSettings\IndexSettingsProviderInterface;
@@ -62,20 +61,7 @@ public function index(Index|string $index): void
         }
 
         foreach ($index->resources as $resource) {
-            $this->commandBus->dispatch(new IndexResource($index, $resource));
-        }
-    }
-
-    public function indexResource(Index|string $index, string $resource): void
-    {
-        if (is_string($index)) {
-            $index = $this->indexRegistry->get($index);
-        }
-
-        $indexableResource = $index->getResource($resource);
-
-        foreach ($this->getIdBatches($indexableResource) as $ids) {
-            $this->commandBus->dispatch(new IndexEntities($indexableResource, $ids));
+            $this->indexResource($index, $resource);
         }
     }
 
@@ -126,6 +112,19 @@ public function removeEntitiesWithIds(array $ids, string $type): void
         }
     }
 
+    protected function indexResource(Index|string $index, IndexableResource|string $resource): void
+    {
+        if (is_string($index)) {
+            $index = $this->indexRegistry->get($index);
+        }
+
+        $indexableResource = $index->getResource($resource);
+
+        foreach ($this->getIdBatches($indexableResource) as $ids) {
+            $this->commandBus->dispatch(new IndexEntities($indexableResource, $ids));
+        }
+    }
+
     /**
      * @return \Generator<int, non-empty-list<mixed>>
      */

src/Indexer/IndexerInterface.php

@@ -6,7 +6,6 @@
 
 use Setono\SyliusMeilisearchPlugin\Config\Index;
 use Setono\SyliusMeilisearchPlugin\Exception\NonExistingIndexException;
-use Setono\SyliusMeilisearchPlugin\Exception\NonExistingResourceException;
 use Setono\SyliusMeilisearchPlugin\Model\IndexableInterface;
 
 interface IndexerInterface
@@ -18,14 +17,6 @@ interface IndexerInterface
      */
     public function index(Index|string $index): void;
 
-    /**
-     * This method will index all entities for a given indexable resource on the given index
-     *
-     * @throws NonExistingIndexException if the $index is a string and the index doesn't exist
-     * @throws NonExistingResourceException if the $resource doesn't exist on the given $index
-     */
-    public function indexResource(Index|string $index, string $resource): void;
-
     /**
      * Will index a single entity
      */

src/Message/Command/EntityAwareCommand.php

@@ -8,15 +8,16 @@
 
 abstract class EntityAwareCommand implements CommandInterface
 {
-    /** @var class-string<IndexableInterface> */
-    public string $entityClass;
-
-    /** @var mixed */
-    public $entityId;
+    final public function __construct(
+        /** @var class-string<IndexableInterface> $class */
+        public readonly string $class,
+        /** @var mixed $id */
+        public readonly mixed $id,
+    ) {
+    }
 
-    public function __construct(IndexableInterface $resource)
+    public static function new(IndexableInterface $object): static
     {
-        $this->entityClass = $resource::class;
-        $this->entityId = $resource->getId();
+        return new static($object::class, $object->getId());
     }
 }

src/Message/Handler/IndexEntityHandler.php

@@ -4,23 +4,23 @@
 
 namespace Setono\SyliusMeilisearchPlugin\Message\Handler;
 
-use Setono\SyliusMeilisearchPlugin\Config\IndexRegistry;
+use Setono\SyliusMeilisearchPlugin\Config\IndexRegistryInterface;
 use Setono\SyliusMeilisearchPlugin\Message\Command\IndexEntity;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 
 final class IndexEntityHandler
 {
-    public function __construct(private readonly IndexRegistry $indexRegistry)
+    public function __construct(private readonly IndexRegistryInterface $indexRegistry)
     {
     }
 
     public function __invoke(IndexEntity $message): void
     {
         try {
             $this->indexRegistry
-                ->getByResource($message->entityClass)
+                ->getByResource($message->class)
                 ->indexer
-                ->indexEntityWithId($message->entityId, $message->entityClass)
+                ->indexEntityWithId($message->id, $message->class)
             ;
         } catch (\InvalidArgumentException $e) {
             // todo create better exception

src/Resolver/SortBy/SortByResolver.php

@@ -15,8 +15,7 @@ public function __construct(
         private readonly IndexNameResolverInterface $indexNameResolver,
         private readonly TranslatorInterface $translator,
         private readonly LocaleContextInterface $localeContext,
-    )
-    {
+    ) {
     }
 
     public function resolveFromIndexableResource(Index $index, string $locale = null): array