Field level boosting is added.

Author: nqxcode

src/Nqxcode/LuceneSearch/Model/Config.php

@@ -144,8 +144,22 @@ public function classUidPair(Model $model)
      */
     public function fields(Model $model)
     {
+        $fields = [];
         $c = $this->config($model);
-        return $c['fields'];
+
+        foreach ($c['fields'] as $key => $value) {
+            $boost = 1;
+            $field = $value;
+
+            if (is_array($value)) {
+                $boost = array_get($value, "boost");
+                $field = $key;
+            }
+
+            $fields[$field] = ['boost' => $boost];
+        }
+
+        return $fields;
     }
 
     /**
@@ -181,6 +195,17 @@ function ($i) use ($field) {
             }
         }
 
+        $attributes = array_map(function ($value) {
+            $boost = 1;
+
+            if (is_array($value)) {
+                $boost = array_get($value, "boost");
+                $value = array_get($value, "value");
+            }
+
+            return ['boost' => $boost, 'value' => $value];
+        }, $attributes);
+
         return $attributes;
     }
 

src/Nqxcode/LuceneSearch/Search.php

@@ -118,15 +118,25 @@ public function update(Model $model)
         $fields = $this->config->fields($model);
 
         // Add fields to document to be indexed (but not stored).
-        foreach ($fields as $field) {
-            $doc->addField(Field::unStored(trim($field), strip_tags(trim($model->{trim($field)}))));
+        foreach ($fields as $fieldName => $options) {
+            $fieldValue = $model->{trim($fieldName)};
+
+            $field = Field::unStored(trim($fieldName), strip_tags(trim($fieldValue)));
+            $field->boost = array_get($options, 'boost');
+
+            $doc->addField($field);
         }
 
         $optionalAttributes = $this->config->optionalAttributes($model);
 
         // Add optional attributes to document to be indexed (but not stored).
-        foreach ($optionalAttributes as $fieldName => $fieldValue) {
-            $doc->addField(Field::unStored(trim($fieldName), strip_tags(trim($fieldValue))));
+        foreach ($optionalAttributes as $fieldName => $options) {
+            $fieldValue = array_get($options, "value");
+
+            $field = Field::unStored(trim($fieldName), strip_tags(trim($fieldValue)));
+            $field->boost = array_get($options, "boost");
+
+            $doc->addField($field);
         }
 
         // Add document to index.

tests/functional/BaseTestCase.php

@@ -24,8 +24,8 @@ protected function configure()
             [
                 'tests\models\Product' => [
                     'fields' => [
-                        'name',
-                        'description'
+                        'name' => ['boost' => 1],
+                        'description' => ['boost' => 0.2],
                     ],
                     'optional_attributes' => true
                 ]

tests/unit/ConfigTest.php

@@ -78,10 +78,10 @@ public function testModelWithIncorrectClassUid()
     public function testFields()
     {
         $fields = $this->config->fields($this->productRepoMock);
-        $this->assertEquals(['name', 'description'], $fields);
+        $this->assertEquals(['name' => ['boost' => 1], 'description' => ['boost' => 1]], $fields);
 
         $fields = $this->config->fields($this->dummyRepoMock);
-        $this->assertEquals(['first_field', 'second_field'], $fields);
+        $this->assertEquals(['first_field' => ['boost' => 1], 'second_field' => ['boost' => 1]], $fields);
     }
 
     public function testClassUid()

tests/unit/SearchTest.php

@@ -38,10 +38,10 @@ public function setUp()
             ->andReturn(['class_uid', '12345']);
         $this->config->shouldReceive('fields')
             ->with($this->model)
-            ->andReturn(['name']);
+            ->andReturn(['name' => ['boost' => 1]]);
 
         $this->config->shouldReceive('optionalAttributes')
-            ->andReturn(['optional_attribute1' => 'optional value']);
+            ->andReturn(['optional_attribute1' => ['boost' => 1, 'value' => 'optional value']]);
 
     }
 
@@ -52,8 +52,14 @@ public function testUpdate()
             $doc = new Document();
             $doc->addField(Field::keyword('private_key', 1));
             $doc->addField(Field::Keyword('class_uid', '12345'));
-            $doc->addField(Field::unStored('name', 'test name'));
-            $doc->addField(Field::unStored('optional_attribute1', 'optional value'));
+
+            $field = Field::unStored('name', 'test name');
+            $field->boost = 1;
+            $doc->addField($field);
+
+            $field = Field::unStored('optional_attribute1', 'optional value');
+            $field->boost = 1;
+            $doc->addField($field);
 
             $this->assertEquals($doc, $arg);
             return true;
@@ -67,10 +73,10 @@ public function testUpdate()
             $this->assertEquals($term, $arg);
             return true;
         }))->andReturnUsing(function () {
-                $hitMock = m::mock();
-                $hitMock->id = 10;
-                return [$hitMock];
-            })->once();
+            $hitMock = m::mock();
+            $hitMock->id = 10;
+            return [$hitMock];
+        })->once();
 
         $luceneIndex->shouldReceive('delete')->with(10)->once();
 
@@ -91,10 +97,10 @@ public function testDelete()
             $this->assertEquals($term, $arg);
             return true;
         }))->andReturnUsing(function () {
-                $hitMock = m::mock();
-                $hitMock->id = 10;
-                return [$hitMock];
-            });
+            $hitMock = m::mock();
+            $hitMock->id = 10;
+            return [$hitMock];
+        });
 
         $luceneIndex->shouldReceive('delete')->with(10)->once();