MAGETWO-36045: Default weight SPIKE

MAGETWO-38817: Document default field weights

- Update after code review

Author: igrybkov

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php

@@ -64,11 +64,10 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function process(FilterInterface $filter, $isNegation, $query, QueryContainer $queryContainer)
     {
-        return $resultQuery = $this->processQueryWithField($filter, $isNegation, $query, $queryContainer);
+        return $this->processQueryWithField($filter, $isNegation, $query, $queryContainer);
     }
 
     /**

app/code/Magento/CatalogSearch/Setup/InstallData.php

@@ -7,40 +7,46 @@
 namespace Magento\CatalogSearch\Setup;
 
 
-use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 
-class InstallData implements \Magento\Framework\Setup\InstallDataInterface
+class InstallData implements InstallDataInterface
 {
+    /**
+     * @var ProductAttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
+    /**
+     * @param ProductAttributeRepositoryInterface $attributeRepository
+     */
+    public function __construct(ProductAttributeRepositoryInterface $attributeRepository)
+    {
+        $this->attributeRepository = $attributeRepository;
+    }
+
     /**
      * @param ModuleDataSetupInterface $setup
      * @param ModuleContextInterface $context
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
-        $connection = $setup->getConnection();
-        $this->setWeight('sku', 6, $connection);
-        $this->setWeight('name', 5, $connection);
+        $this->setWeight('sku', 6);
+        $this->setWeight('name', 5);
     }
 
-
     /**
      * @param string $attributeCode
      * @param int $weight
-     * @param AdapterInterface $connection
-     * @internal param $oldWeight
+     * @internal param AdapterInterface $connection
      */
-    private function setWeight($attributeCode, $weight, AdapterInterface $connection)
+    private function setWeight($attributeCode, $weight)
     {
-        $updateQuery = 'UPDATE catalog_eav_attribute SET search_weight = ?'
-            . ' WHERE attribute_id ='
-            . ' (SELECT eav_attribute.attribute_id FROM eav_attribute'
-            . ' LEFT JOIN eav_entity_type ON eav_attribute.entity_type_id = eav_entity_type.entity_type_id'
-            . ' WHERE eav_entity_type.entity_type_code = ?'
-            . ' AND eav_attribute.attribute_code = ?)';
-        $bindings = [$weight, 'catalog_product', $attributeCode];
-
-        $connection->query($updateQuery, $bindings);
+        $attribute = $this->attributeRepository->get($attributeCode);
+        $attribute->setSearchWeight($weight);
+        $this->attributeRepository->save($attribute);
     }
 }

lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/ScoreBuilderTest.php

@@ -45,10 +45,11 @@ public function testBuild()
 
         $result = $builder->build();
 
+        $weightExpression = 'POW(2, ' . ScoreBuilder::WEIGHT_FIELD . ')';
         $expected = '((someCondition1 * %1$s + (someCondition2 * %1$s + someCondition3 * %1$s + ' .
             '(someCondition4 * %1$s + someCondition5 * %1$s) * 10.1 + (someCondition6 * %1$s + ' .
             'someCondition7 * %1$s) * 10.2) * 10.3) * 10.4 + (0)) AS ' . $builder->getScoreAlias();
-        $expected = sprintf($expected, ScoreBuilder::WEIGHT_FIELD);
+        $expected = sprintf($expected, $weightExpression);
         $this->assertEquals($expected, $result);
     }
 }