BUGIFX: Add indexname to query hash to prevent sharing query results of other indexes

Author: Peter Rauber

Classes/Eel/ElasticSearchQuery.php

@@ -53,7 +53,7 @@ public function __construct(ElasticSearchQueryBuilder $elasticSearchQueryBuilder
      */
     public function execute($cacheResult = false)
     {
-        $queryHash = md5(json_encode($this->queryBuilder->getRequest()));
+        $queryHash = md5($this->queryBuilder->getIndexName() . json_encode($this->queryBuilder->getRequest()));
         if ($cacheResult === true && isset(self::$runtimeQueryResultCache[$queryHash])) {
             return self::$runtimeQueryResultCache[$queryHash];
         }

Tests/Functional/Eel/ElasticSearchMultiDimensionQueryTest.php

@@ -0,0 +1,182 @@
+<?php
+declare(strict_types=1);
+
+namespace Flowpack\ElasticSearch\ContentRepositoryAdaptor\Tests\Functional\Eel;
+
+/*
+ * This file is part of the Flowpack.ElasticSearch.ContentRepositoryAdaptor package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+use DateTime;
+use DateTimeImmutable;
+use Exception;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Command\NodeIndexCommandController;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryBuilder;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexer;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Tests\Functional\Traits\ContentRepositoryMultiDimensionNodeCreationTrait;
+use Neos\ContentRepository\Domain\Model\NodeInterface;
+
+use Neos\Flow\Tests\FunctionalTestCase;
+
+class ElasticSearchMultiDimensionQueryTest extends FunctionalTestCase
+{
+    use ContentRepositoryMultiDimensionNodeCreationTrait;
+
+    const TESTING_INDEX_PREFIX = 'neoscr_testing';
+
+    /**
+     * @var ElasticSearchClient
+     */
+    protected $searchClient;
+
+    /**
+     * @var NodeIndexCommandController
+     */
+    protected $nodeIndexCommandController;
+
+    /**
+     * @var boolean
+     */
+    protected static $testablePersistenceEnabled = true;
+
+    /**
+     * @var NodeIndexer
+     */
+    protected $nodeIndexer;
+
+    /**
+     * @var NodeInterface
+     */
+    protected $siteNodeDefault;
+
+    /**
+     * @var NodeInterface
+     */
+    protected $siteNodeDe;
+
+    /**
+     * @var NodeInterface
+     */
+    protected $siteNodeDk;
+
+    /**
+     * @var boolean
+     */
+    protected static $indexInitialized = false;
+
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->nodeIndexer = $this->objectManager->get(NodeIndexer::class);
+        $this->searchClient = $this->objectManager->get(ElasticSearchClient::class);
+
+        if (self::$indexInitialized !== true) {
+            // clean up any existing indices
+            $this->searchClient->request('DELETE', '/' . self::TESTING_INDEX_PREFIX . '*');
+        }
+
+
+        $this->nodeIndexCommandController = $this->objectManager->get(NodeIndexCommandController::class);
+        $this->setupContentRepository();
+        $this->createNodesForNodeSearchTest();
+        $this->indexNodes();
+    }
+
+    public function tearDown(): void
+    {
+        parent::tearDown();
+        $this->inject($this->contextFactory, 'contextInstances', []);
+    }
+
+    /**
+     * @test
+     */
+    public function countDefaultDimensionNodesTest(): void
+    {
+        $resultDefault = $this->getQueryBuilder()
+            ->query($this->siteNodeDefault)
+            ->log($this->getLogMessagePrefix(__METHOD__))
+            ->nodeType('Flowpack.ElasticSearch.ContentRepositoryAdaptor:Document')
+            ->sortDesc('title')
+            ->execute();
+
+        // expecting: root, document1, untranslated = 3
+        static::assertCount(3, $resultDefault);
+    }
+
+    /**
+     * @test
+     */
+    public function countDeDimensionNodesTest(): void
+    {
+        $resultDe = $this->getQueryBuilder()
+            ->query($this->siteNodeDe)
+            ->log($this->getLogMessagePrefix(__METHOD__))
+            ->nodeType('Flowpack.ElasticSearch.ContentRepositoryAdaptor:Document')
+            ->sortDesc('title')
+            ->execute();
+
+        // expecting: root, document1, document2, document3, document4, untranslated (fallback from en_us) = 6
+        static::assertCount(6, $resultDe);
+    }
+
+    /**
+     * @test
+     */
+    public function countDkDimensionNodesTest(): void
+    {
+        $resultDk = $this->getQueryBuilder()
+            ->query($this->siteNodeDk)
+            ->log($this->getLogMessagePrefix(__METHOD__))
+            ->nodeType('Flowpack.ElasticSearch.ContentRepositoryAdaptor:Document')
+            ->sortDesc('title')
+            ->execute();
+
+        // expecting: root, document1, document2, document4 (fallback from de), untranslated (fallback from en_us) = 6
+        static::assertCount(5, $resultDk);
+    }
+
+
+    protected function indexNodes(): void
+    {
+        if (self::$indexInitialized === true) {
+            return;
+        }
+
+        $this->nodeIndexCommandController->buildCommand(null, false, 'live');
+        self::$indexInitialized = true;
+    }
+
+    /**
+     * @param string $method
+     * @return string
+     */
+    protected function getLogMessagePrefix(string $method): string
+    {
+        return substr(strrchr($method, '\\'), 1);
+    }
+
+    /**
+     * @return ElasticSearchQueryBuilder
+     */
+    protected function getQueryBuilder(): ElasticSearchQueryBuilder
+    {
+        try {
+            $elasticSearchQueryBuilder = $this->objectManager->get(ElasticSearchQueryBuilder::class);
+            $this->inject($elasticSearchQueryBuilder, 'now', new DateTimeImmutable('@1735685400')); // Dec. 31, 2024 23:50:00
+
+            return $elasticSearchQueryBuilder;
+        } catch (Exception $exception) {
+            static::fail('Setting up the QueryBuilder failed: ' . $exception->getMessage());
+        }
+    }
+}