BUGFIX: Do not specify a type when deleting nodes

Author: daniellienert

Classes/Driver/Version6/DocumentDriver.php

@@ -37,7 +37,6 @@ public function delete(NodeInterface $node, string $identifier): array
         return [
             [
                 'delete' => [
-                    '_type' => $node->getNodeType()->getName(),
                     '_id' => $identifier
                 ]
             ]

Tests/Functional/Indexer/NodeIndexerTest.php

@@ -13,18 +13,33 @@
  * source code.
  */
 
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\NodeTypeMappingBuilderInterface;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\QueryInterface;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version6\Mapping\NodeTypeMappingBuilder;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version6\Query\FilteredQuery;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\ConfigurationException;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexer;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\DimensionsService;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Tests\Functional\TRaits\ContentRepositoryNodeCreationTrait;
+use Flowpack\ElasticSearch\Domain\Model\Mapping;
 use Flowpack\ElasticSearch\Exception;
 use Flowpack\ElasticSearch\Transfer\Exception\ApiException;
+use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\Flow\Tests\FunctionalTestCase;
+use Neos\Utility\Arrays;
 
 class NodeIndexerTest extends FunctionalTestCase
 {
+    use ContentRepositoryNodeCreationTrait;
+
     const TESTING_INDEX_PREFIX = 'neoscr_testing';
 
+    /**
+     * @var boolean
+     */
+    protected static $testablePersistenceEnabled = true;
+
     /**
      * @var NodeIndexer
      */
@@ -40,12 +55,18 @@ class NodeIndexerTest extends FunctionalTestCase
      */
     protected $searchClient;
 
+    /**
+     * @var NodeTypeMappingBuilder
+     */
+    protected $nodeTypeMappingBuilder;
+
     public function setUp(): void
     {
         parent::setUp();
         $this->searchClient = $this->objectManager->get(ElasticSearchClient::class);
         $this->nodeIndexer = $this->objectManager->get(NodeIndexer::class);
         $this->dimensionService = $this->objectManager->get(DimensionsService::class);
+        $this->nodeTypeMappingBuilder = $this->objectManager->get(NodeTypeMappingBuilderInterface::class);
     }
 
     protected function tearDown(): void
@@ -61,7 +82,7 @@ public function getIndexWithoutDimensionConfigured(): void
     {
         $this->nodeIndexer->setDimensions([]);
         $index = $this->nodeIndexer->getIndex();
-        static::assertEquals(self::TESTING_INDEX_PREFIX . '-default-functionaltest', $index->getName());
+        static::assertEquals(self::TESTING_INDEX_PREFIX . '-default', $index->getName());
     }
 
     /**
@@ -78,7 +99,7 @@ public function getIndexForDimensionConfiguration(): void
         $index = $this->nodeIndexer->getIndex();
         $dimesionHash = $this->dimensionService->hash($dimensionValues);
 
-        static::assertEquals(self::TESTING_INDEX_PREFIX . '-' . $dimesionHash . '-functionaltest', $index->getName());
+        static::assertEquals(self::TESTING_INDEX_PREFIX . '-' . $dimesionHash, $index->getName());
     }
 
     /**
@@ -97,6 +118,36 @@ public function updateIndexAlias(): void
         $this->assertAliasesEquals(self::TESTING_INDEX_PREFIX, [$this->nodeIndexer->getIndexName()]);
     }
 
+    /**
+     * @test
+     */
+    public function indexAndDeleteNode(): void
+    {
+        $this->setupContentRepository();
+        $this->createNodesForNodeSearchTest();
+        /** @var NodeInterface $testNode */
+        $testNode = current($this->siteNode->getChildNodes('Neos.NodeTypes:Page', 1));
+
+        $dimensionValues = ['language' => ['en_US']];
+        $this->nodeIndexer->setDimensions($dimensionValues);
+        $this->nodeIndexer->getIndex()->create();
+
+        $nodeTypeMappingCollection = $this->nodeTypeMappingBuilder->buildMappingInformation($this->nodeIndexer->getIndex());
+        foreach ($nodeTypeMappingCollection as $mapping) {
+            /** @var Mapping $mapping */
+            $mapping->apply();
+        }
+
+        $this->nodeIndexer->indexNode($testNode);
+        $this->nodeIndexer->flush();
+        $this->assertTrue($this->nodeExistsInIndex($testNode), 'Node was not successfully indexed.');
+
+        $this->nodeIndexer->removeNode($testNode);
+        $this->nodeIndexer->flush();
+        usleep(500000);
+        $this->assertFalse($this->nodeExistsInIndex($testNode), 'Node still exists after delete');
+    }
+
 
     /**
      * @param string $indexName
@@ -115,4 +166,24 @@ protected function assertAliasesEquals(string $aliasPrefix, array $expectdAliase
         $content = $this->searchClient->request('GET', '/_alias/' . $aliasPrefix . '*')->getTreatedContent();
         static::assertEquals($expectdAliases, array_keys($content));
     }
+
+    /**
+     * @param NodeInterface $testNode
+     * @return bool
+     * @throws ConfigurationException
+     * @throws Exception
+     * @throws \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception
+     * @throws \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\QueryBuildingException
+     * @throws \Neos\Flow\Http\Exception
+     */
+    private function nodeExistsInIndex(NodeInterface $testNode): bool
+    {
+        $this->searchClient->setContextNode($this->siteNode);
+        /** @var FilteredQuery $query */
+        $query = $this->objectManager->get(QueryInterface::class);
+        $query->queryFilter('term', ['neos_node_identifier' => $testNode->getIdentifier()]);
+
+        $result = $this->nodeIndexer->getIndex()->request('GET', '/_search', [], $query->toArray())->getTreatedContent();
+        return count(Arrays::getValueByPath($result, 'hits.hits')) === 1;
+    }
 }