MC-32378: Implement control over minimum_should_match for elasticsearch queries

Author: irenelagno

app/code/Magento/Elasticsearch7/etc/config.xml

@@ -14,7 +14,7 @@
                 <elasticsearch7_index_prefix>magento2</elasticsearch7_index_prefix>
                 <elasticsearch7_enable_auth>0</elasticsearch7_enable_auth>
                 <elasticsearch7_server_timeout>15</elasticsearch7_server_timeout>
-                <elasticsearch7_minimum_should_match></elasticsearch7_minimum_should_match>
+                <elasticsearch7_minimum_should_match/>
             </search>
         </catalog>
     </default>

dev/tests/integration/testsuite/Magento/Elasticsearch/_files/products_for_search.php

@@ -12,81 +12,81 @@
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Visibility;
 
+$categoryId = 333;
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$attributeSet = $objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class);
+$entityType = $objectManager->create(\Magento\Eav\Model\Entity\Type::class)->loadByCode('catalog_product');
+$defaultSetId = $objectManager->create(\Magento\Catalog\Model\Product::class)->getDefaultAttributeSetid();
+
 $products = [
     [
         'type' => 'simple',
-        'id' => 201,
         'name' => 'search product 1',
         'sku' => '24 MB06',
         'status' => Status::STATUS_ENABLED,
         'visibility' => Visibility::VISIBILITY_BOTH,
-        'attribute_set' => 4,
-        'website_ids' => [1],
+        'attribute_set' => $defaultSetId,
+        'website_ids' => [\Magento\Store\Model\Store::DISTRO_STORE_ID],
         'price' => 10,
-        'category_id' => 333,
+        'category_id' => $categoryId,
         'meta_title' => 'Key Title',
         'meta_keyword' => 'meta keyword',
         'meta_description' => 'meta description',
     ],
     [
         'type' => 'simple',
-        'id' => 202,
         'name' => 'search product 2',
         'sku' => '24 MB04',
         'status' => Status::STATUS_ENABLED,
         'visibility' => Visibility::VISIBILITY_BOTH,
-        'attribute_set' => 4,
-        'website_ids' => [1],
+        'attribute_set' => $defaultSetId,
+        'website_ids' => [\Magento\Store\Model\Store::DISTRO_STORE_ID],
         'price' => 10,
-        'category_id' => 333,
+        'category_id' => $categoryId,
         'meta_title' => 'Last Title',
         'meta_keyword' => 'meta keyword',
         'meta_description' => 'meta description',
     ],
     [
         'type' => 'simple',
-        'id' => 203,
         'name' => 'search product 3',
         'sku' => '24 MB02',
         'status' => Status::STATUS_ENABLED,
         'visibility' => Visibility::VISIBILITY_BOTH,
-        'attribute_set' => 4,
-        'website_ids' => [1],
+        'attribute_set' => $defaultSetId,
+        'website_ids' => [\Magento\Store\Model\Store::DISTRO_STORE_ID],
         'price' => 20,
-        'category_id' => 333,
+        'category_id' => $categoryId,
         'meta_title' => 'First Title',
         'meta_keyword' => 'meta keyword',
         'meta_description' => 'meta description',
     ],
     [
         'type' => 'simple',
-        'id' => 204,
         'name' => 'search product 4',
         'sku' => '24 MB01',
         'status' => Status::STATUS_ENABLED,
         'visibility' => Visibility::VISIBILITY_BOTH,
-        'attribute_set' => 4,
-        'website_ids' => [1],
+        'attribute_set' => $defaultSetId,
+        'website_ids' => [\Magento\Store\Model\Store::DISTRO_STORE_ID],
         'price' => 30,
-        'category_id' => 333,
+        'category_id' => $categoryId,
         'meta_title' => 'A title',
         'meta_keyword' => 'meta keyword',
         'meta_description' => 'meta description',
     ],
 ];
 
 /** @var CategoryLinkManagementInterface $categoryLinkManagement */
-$categoryLinkManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create(CategoryLinkManagementInterface::class);
+$categoryLinkManagement =  $objectManager->create(CategoryLinkManagementInterface::class);
 
 $categoriesToAssign = [];
 
 foreach ($products as $data) {
     /** @var $product Product */
-    $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Product::class);
+    $product = $objectManager->create(Product::class);
     $product
         ->setTypeId($data['type'])
-        ->setId($data['id'])
         ->setAttributeSetId($data['attribute_set'])
         ->setWebsiteIds($data['website_ids'])
         ->setName($data['name'])

dev/tests/integration/testsuite/Magento/Elasticsearch/_files/products_for_search_rollback.php

@@ -30,7 +30,7 @@
     }
 }
 
-include dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
+include __DIR__ . '/../../Catalog/_files/category_rollback.php';
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);