Merge branch 'ACP2E-1499' of https://github.com/magento-l3/magento2ce into PR-L3-2023-01-31

Author: aplapana

app/code/Magento/CatalogSearch/Model/Search/Request/PartialSearchModifier.php

@@ -41,8 +41,12 @@ public function modify(array $requests): array
             if ($matches) {
                 foreach ($matches as $index => $match) {
                     $field = $match['field'] ?? null;
-                    if ($field && $field !== '*' && !isset($attributes[$field])) {
-                        unset($matches[$index]);
+                    if ($field && $field !== '*') {
+                        if (!isset($attributes[$field])) {
+                            unset($matches[$index]);
+                            continue;
+                        }
+                        $matches[$index]['boost'] = $attributes[$field]->getSearchWeight() ?: 1;
                     }
                 }
                 $requests[$code]['queries']['partial_search']['match'] = array_values($matches);

app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Request/PartialSearchModifierTest.php

@@ -55,10 +55,16 @@ protected function setUp(): void
     public function testModify(array $attributes, array $requests, array $expected): void
     {
         $items = [];
+        $searchWeight = 10;
         foreach ($attributes as $attribute) {
-            $item = $this->getMockForAbstractClass(\Magento\Eav\Api\Data\AttributeInterface::class);
+            $item = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
+                ->setMethods(['getAttributeCode', 'getSearchWeight'])
+                ->disableOriginalConstructor()
+                ->getMock();
             $item->method('getAttributeCode')
                 ->willReturn($attribute);
+            $item->method('getSearchWeight')
+                ->willReturn($searchWeight);
             $items[] = $item;
         }
         $reflectionProperty = new \ReflectionProperty($this->collection, '_items');
@@ -76,6 +82,7 @@ public function modifyDataProvider(): array
             [
                 [
                     'name',
+                    'sku',
                 ],
                 [
                     'search_1' => [
@@ -133,9 +140,15 @@ public function modifyDataProvider(): array
                                     [
                                         'field' => '*'
                                     ],
+                                    [
+                                        'field' => 'sku',
+                                        'matchCondition' => 'match_phrase_prefix',
+                                        'boost' => 10
+                                    ],
                                     [
                                         'field' => 'name',
                                         'matchCondition' => 'match_phrase_prefix',
+                                        'boost' => 10
                                     ],
                                 ]
                             ]