[Magento Community Engineering] Community Contributions - 2.4-develop

magento-engcom-team · web-flow · commit 3beb5e8cc4ec · 2020-06-05T14:33:37.000-05:00
- merged latest code from mainline branch
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -572,11 +572,11 @@ public function prepareProductIndex($indexData, $productData, $storeId)
         foreach ($indexData as $entityId => $attributeData) {
             foreach ($attributeData as $attributeId => $attributeValues) {
                 $value = $this->getAttributeValue($attributeId, $attributeValues, $storeId);
-                if (!empty($value)) {
+                if ($value !== null && $value !== false && $value != '') {
                     if (!isset($index[$attributeId])) {
                         $index[$attributeId] = [];
                     }
-                        $index[$attributeId][$entityId] = $value;
+                    $index[$attributeId][$entityId] = $value;
                 }
             }
         }
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
@@ -209,7 +209,7 @@ private function convertAttribute(Attribute $attribute, array $attributeValues,
         $productAttributes = [];
 
         $retrievedValue = $this->retrieveFieldValue($attributeValues);
-        if ($retrievedValue) {
+        if ($retrievedValue !== null) {
             $productAttributes[$attribute->getAttributeCode()] = $retrievedValue;
 
             if ($attribute->getIsSearchable()) {
@@ -354,7 +354,7 @@ private function getAttributeOptions(Attribute $attribute, int $storeId): array
      */
     private function retrieveFieldValue(array $values)
     {
-        $values = \array_filter(\array_unique($values));
+        $values = \array_unique($values);
 
         return count($values) === 1 ? \array_shift($values) : \array_values($values);
     }
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Term.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Term.php
@@ -68,7 +68,7 @@ public function buildFilter(RequestFilterInterface $filter)
             $fieldName .= '.' . $suffix;
         }
 
-        if ($filter->getValue()) {
+        if ($filter->getValue() !== false) {
             $operator = is_array($filter->getValue()) ? 'terms' : 'term';
             $filterQuery []= [
                 $operator => [
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_boolean_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_boolean_attribute.php
@@ -9,6 +9,7 @@
 use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Eav\Model\Entity\Attribute\Source\Boolean;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
@@ -19,32 +20,36 @@
 /** @var $installer CategorySetup */
 $installer = $objectManager->create(CategorySetup::class);
 
-$attribute->setData(
-    [
-        'attribute_code'                => 'boolean_attribute',
-        'entity_type_id'                => CategorySetup::CATALOG_PRODUCT_ENTITY_TYPE_ID,
-        'is_global'                     => 0,
-        'is_user_defined'               => 1,
-        'frontend_input'                => 'boolean',
-        'is_unique'                     => 0,
-        'is_required'                   => 0,
-        'is_searchable'                 => 1,
-        'is_visible_in_advanced_search' => 1,
-        'is_comparable'                 => 0,
-        'is_filterable'                 => 1,
-        'is_filterable_in_search'       => 1,
-        'is_used_for_promo_rules'       => 0,
-        'is_html_allowed_on_front'      => 1,
-        'is_visible_on_front'           => 1,
-        'used_in_product_listing'       => 1,
-        'used_for_sort_by'              => 0,
-        'frontend_label'                => ['Boolean Attribute'],
-        'backend_type'                  => 'int',
-        'source_model'                  => Boolean::class
-    ]
-);
+try {
+    $attributeRepository->get(CategorySetup::CATALOG_PRODUCT_ENTITY_TYPE_ID, 'boolean_attribute');
+} catch (NoSuchEntityException $e) {
+    $attribute->setData(
+        [
+            'attribute_code'                => 'boolean_attribute',
+            'entity_type_id'                => CategorySetup::CATALOG_PRODUCT_ENTITY_TYPE_ID,
+            'is_global'                     => 0,
+            'is_user_defined'               => 1,
+            'frontend_input'                => 'boolean',
+            'is_unique'                     => 0,
+            'is_required'                   => 0,
+            'is_searchable'                 => 1,
+            'is_visible_in_advanced_search' => 1,
+            'is_comparable'                 => 0,
+            'is_filterable'                 => 1,
+            'is_filterable_in_search'       => 1,
+            'is_used_for_promo_rules'       => 0,
+            'is_html_allowed_on_front'      => 1,
+            'is_visible_on_front'           => 1,
+            'used_in_product_listing'       => 1,
+            'used_for_sort_by'              => 0,
+            'frontend_label'                => ['Boolean Attribute'],
+            'backend_type'                  => 'int',
+            'source_model'                  => Boolean::class
+        ]
+    );
 
-$attributeRepository->save($attribute);
+    $attributeRepository->save($attribute);
 
-/* Assign attribute to attribute set */
-$installer->addAttributeToGroup('catalog_product', 'Default', 'Attributes', $attribute->getId());
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup('catalog_product', 'Default', 'Attributes', $attribute->getId());
+}
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
@@ -19,6 +19,7 @@
 use Magento\Indexer\Model\Indexer;
 use Magento\Framework\Search\EngineResolverInterface;
 use Magento\TestModuleCatalogSearch\Model\ElasticsearchVersionChecker;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Important: Please make sure that each integration test file works with unique elastic search index. In order to
@@ -29,7 +30,7 @@
  * @magentoDataFixture Magento/Elasticsearch/_files/indexer.php
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class IndexHandlerTest extends \PHPUnit\Framework\TestCase
+class IndexHandlerTest extends TestCase
 {
     /**
      * @var string
@@ -116,6 +117,9 @@ public function testReindexAll(): void
 
             $products = $this->searchByName('Simple Product', $storeId);
             $this->assertCount(5, $products);
+
+            $this->assertCount(2, $this->searchByBoolAttribute(0, $storeId));
+            $this->assertCount(3, $this->searchByBoolAttribute(1, $storeId));
         }
     }
 
@@ -266,6 +270,32 @@ private function searchByName(string $text, int $storeId): array
         return $products;
     }
 
+    /**
+     * Search docs in Elasticsearch by boolean attribute.
+     *
+     * @param int $value
+     * @param int $storeId
+     * @return array
+     */
+    private function searchByBoolAttribute(int $value, int $storeId): array
+    {
+        $index = $this->searchIndexNameResolver->getIndexName($storeId, $this->indexer->getId());
+        $searchQuery = [
+            'index' => $index,
+            'type' => $this->entityType,
+            'body' => [
+                'query' => [
+                    'query_string' => [
+                        'query' => $value,
+                        'default_field' => 'boolean_attribute',
+                    ],
+                ],
+            ],
+        ];
+        $queryResult = $this->client->query($searchQuery);
+        return isset($queryResult['hits']['hits']) ? $queryResult['hits']['hits'] : [];
+    }
+
     /**
      * Returns installed on server search service
      *
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer.php

Original file line number	Diff line number	Diff line change
`@@ -572,11 +572,11 @@ public function prepareProductIndex($indexData, $productData, $storeId)`
`572`	`572`	`foreach ($indexData as $entityId => $attributeData) {`
`573`	`573`	`foreach ($attributeData as $attributeId => $attributeValues) {`
`574`	`574`	`$value = $this->getAttributeValue($attributeId, $attributeValues, $storeId);`
`575`		`- if (!empty($value)) {`
	`575`	`+ if ($value !== null && $value !== false && $value != '') {`
`576`	`576`	`if (!isset($index[$attributeId])) {`
`577`	`577`	`$index[$attributeId] = [];`
`578`	`578`	`}`
`579`		`- $index[$attributeId][$entityId] = $value;`
	`579`	`+ $index[$attributeId][$entityId] = $value;`
`580`	`580`	`}`
`581`	`581`	`}`
`582`	`582`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ private function convertAttribute(Attribute $attribute, array $attributeValues,`
`209`	`209`	`$productAttributes = [];`
`210`	`210`
`211`	`211`	`$retrievedValue = $this->retrieveFieldValue($attributeValues);`
`212`		`- if ($retrievedValue) {`
	`212`	`+ if ($retrievedValue !== null) {`
`213`	`213`	`$productAttributes[$attribute->getAttributeCode()] = $retrievedValue;`
`214`	`214`
`215`	`215`	`if ($attribute->getIsSearchable()) {`
`@@ -354,7 +354,7 @@ private function getAttributeOptions(Attribute $attribute, int $storeId): array`
`354`	`354`	`*/`
`355`	`355`	`private function retrieveFieldValue(array $values)`
`356`	`356`	`{`
`357`		`- $values = \array_filter(\array_unique($values));`
	`357`	`+ $values = \array_unique($values);`
`358`	`358`
`359`	`359`	`return count($values) === 1 ? \array_shift($values) : \array_values($values);`
`360`	`360`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function buildFilter(RequestFilterInterface $filter)`
`68`	`68`	`$fieldName .= '.' . $suffix;`
`69`	`69`	`}`
`70`	`70`
`71`		`- if ($filter->getValue()) {`
	`71`	`+ if ($filter->getValue() !== false) {`
`72`	`72`	`$operator = is_array($filter->getValue()) ? 'terms' : 'term';`
`73`	`73`	`$filterQuery []= [`
`74`	`74`	`$operator => [`