Merge branch 'sw-26336/5.7/fix-es-indexing' into '5.7'

SW-26336 - Fix ES indexing query skipping property groups

See merge request shopware/5/product/shopware!651

Author: DennisGarding

engine/Shopware/Bundle/ESIndexingBundle/LastIdQuery.php

@@ -69,7 +69,7 @@ public function fetchCount()
     }
 
     /**
-     * @deprecated in 5.6, will be removed in 5.7 without replacement
+     * @deprecated in 5.6, will be removed in 5.8 without replacement
      *
      * @return QueryBuilder
      */

engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyQueryFactory.php

@@ -60,6 +60,7 @@ private function createOptionQuery($limit = null)
         $query->select(['propertyGroups.id', 'propertyGroups.id'])
             ->from('s_filter_options', 'propertyGroups')
             ->where('propertyGroups.id > :lastId')
+            ->orderBy('propertyGroups.id', 'ASC')
             ->setParameter(':lastId', 0);
 
         if ($limit !== null) {

tests/Functional/Bundle/ESIndexingBundle/Property/PropertyQueryFactoryTest.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our dual licensing model, this program can be used either
+ * under the terms of the GNU Affero General Public License, version 3,
+ * or under a proprietary license.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission and of our proprietary license can be found at and
+ * in the LICENSE file you have received along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore any rights, title and interest in
+ * our trademarks remain entirely with us.
+ */
+
+namespace Shopware\Tests\Functional\Bundle\ESIndexingBundle\Property;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Query\QueryBuilder;
+use PHPUnit\Framework\TestCase;
+use Shopware\Bundle\ESIndexingBundle\Property\PropertyQueryFactory;
+use Shopware\Tests\Functional\Traits\ContainerTrait;
+
+class PropertyQueryFactoryTest extends TestCase
+{
+    use ContainerTrait;
+
+    public function testCreateQueryShouldContainOrderByPropertyGroups(): void
+    {
+        $queryBuilderMock = $this->getMockBuilder(QueryBuilder::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['orderBy'])
+            ->getMock();
+
+        $queryBuilderMock
+            ->expects(static::once())
+            ->method('orderBy')
+            ->with('propertyGroups.id', 'ASC')
+            ->willReturn($queryBuilderMock);
+
+        $connection = $this->createConfiguredMock(Connection::class, ['createQueryBuilder' => $queryBuilderMock]);
+
+        $propertyFactory = new PropertyQueryFactory($connection);
+
+        $propertyFactory->createQuery(20);
+    }
+}