fixes after refactoring

Author: limenet

phpunit.xml

@@ -22,5 +22,6 @@
   </source>
   <php>
     <server name="DB_CONNECTION" value="testing"/>
+    <server name="ELASTICSEARCH_QUEUE_CONNECTION" value="sync"/>
   </php>
 </phpunit>

src/Events/EventHandler.php

@@ -29,7 +29,8 @@ function ($event, $models): void {
                         $name,
                         $model::class,
                         $model->getKeyName(),
-                        $model->getKey()
+                        $model->getKey(),
+                        $model->getElasticsearchId()
                     ));
             });
     }

src/Jobs/ModelEvent.php

@@ -53,7 +53,8 @@ public function __construct(
         private readonly string $event,
         private readonly string $modelClass,
         private readonly string $keyName,
-        private readonly mixed $keyValue
+        private readonly mixed $keyValue,
+        private readonly string $elasticsearchId,
     ) {
         $this->onConnection(config('elastica-bridge.connection'));
     }
@@ -63,10 +64,18 @@ public function handle(): void
         $model = $this->modelClass::query()->where($this->keyName, $this->keyValue)->first();
 
         if (! $model instanceof ElasticsearchableInterface || ! $model instanceof Model) {
+            foreach ($this->matchingIndicesForElement() as $index) {
+                if (! $index->getElasticaIndex()->exists()) {
+                    continue;
+                }
+
+                $this->ensureModelMissingFromIndex($index);
+            }
+
             return;
         }
 
-        foreach ($this->matchingIndicesForElement($model) as $index) {
+        foreach ($this->matchingIndicesForElement() as $index) {
             if (! $index->getElasticaIndex()->exists()) {
                 continue;
             }
@@ -79,7 +88,7 @@ public function handle(): void
 
             $shouldBePresent
                 ? $this->ensureModelPresentInIndex($index, $model)
-                : $this->ensureModelMissingFromIndex($index, $model);
+                : $this->ensureModelMissingFromIndex($index);
         }
     }
 
@@ -89,23 +98,22 @@ private function ensureModelPresentInIndex(IndexInterface $index, Model $model):
         $index->getElasticaIndex()->addDocument($model->toElasticaDocument($index));
     }
 
-    /** @param  ElasticsearchableInterface&Model  $model */
-    private function ensureModelMissingFromIndex(IndexInterface $index, Model $model): void
+    private function ensureModelMissingFromIndex(IndexInterface $index): void
     {
         try {
-            $index->getElasticaIndex()->deleteById($model->getElasticsearchId());
+            $index->getElasticaIndex()->deleteById($this->elasticsearchId);
         } catch (ClientResponseException) {
         }
     }
 
     /**
      * @return IndexInterface[]
      */
-    public function matchingIndicesForElement(Model $model): array
+    public function matchingIndicesForElement(): array
     {
         return array_filter(
             app(IndexRepository::class)->all(),
-            fn (IndexInterface $index): bool => in_array($model::class, $index->getAllowedDocuments(), true)
+            fn (IndexInterface $index): bool => in_array($this->modelClass, $index->getAllowedDocuments(), true)
         );
     }
 }

tests/Feature/EventTest.php

@@ -44,7 +44,7 @@ public function test_event_update_disabled_listener(): void
         LaravelElasticaBridgeFacade::disableEventListener();
         $product = Product::all()->random();
         $oldName = $product->name;
-        $newName = \Carbon\Carbon::now()->getTimestamp();
+        $newName = now()->getTimestamp();
         $product->name = $newName;
         $this->assertSame($oldName, $this->productIndex->getDocumentInstance($product)->get('name'));
         $this->assertNotSame($oldName, $newName);
@@ -59,7 +59,7 @@ public function test_event_update_enabled_listener(): void
         LaravelElasticaBridgeFacade::enableEventListener();
         $product = Product::all()->random();
         $oldName = $product->name;
-        $newName = \Carbon\Carbon::now()->getTimestamp();
+        $newName = 'doc-'.now()->getTimestamp();
         $product->name = $newName;
         $this->assertSame($oldName, $this->productIndex->getDocumentInstance($product)->get('name'));
         $this->assertNotSame($oldName, $newName);

tests/Unit/ClientTest.php

@@ -24,8 +24,8 @@ public function test_configured_client(): void
     {
         $client = $this->elasticaClient->getClient();
 
-        $this->assertSame('localhost', $client->getConfig('host'));
-        $this->assertEquals(9200, $client->getConfig('port'));
+        $this->assertSame('localhost', $client->getTransport()->getNodePool()->nextNode()->getUri()->getHost());
+        $this->assertSame(9200, $client->getTransport()->getNodePool()->nextNode()->getUri()->getPort());
 
     }