Merge pull request #55 from UrosPurtic/master

improve search for esv24 when search terms containg empty space,hyphe…

Author: ppavlovic

src/Common/Selection/Operator.php

@@ -15,6 +15,7 @@ class Operator
     const IN                   = 'IN';
     const LIKE                 = 'LIKE';
     const LIKE_CI              = 'LIKE_CI';
+    const MULTI_LIKE_CI        = 'MULTI_LIKE_CI';
     const LESS_THAN            = 'LESS_THAN';
     const LESS_THAN_OR_EQUAL   = 'LESS_THAN_OR_EQUAL';
     const NOT_EQUAL            = 'NOT_EQUAL';
@@ -65,6 +66,7 @@ private function isValid()
             self::EXISTS,
             self::QUERY_STRING,
             self::CONSISTENT_RANDOM_KEY,
+            self::MULTI_LIKE_CI,
         ];
 
         if (!in_array($this->symbol, $validSymbols)) {

src/Engine/Elasticsearch/ElasticsearchComparisonFormatter.php

@@ -75,6 +75,9 @@ public function format($name, Operator $operator, ValueInterface $value)
             case Operator::LIKE_CI:
                 $query = $this->getOperatorBasedOnEsVersion('LikeCIOperator', $name, $value);
                 break;
+            case Operator::MULTI_LIKE_CI:
+                $query = $this->getOperatorBasedOnEsVersion('MultiLikeCIOperator', $name, $value);
+                break;
             case Operator::MISSING:
                 $query = new MissingOperator($name, $value);
                 break;

src/Engine/Elasticsearch/ElasticsearchIdentity.php

@@ -209,4 +209,11 @@ public function queryString($value)
         $this->operator(Operator::QUERY_STRING, new SingleValue($value));
         return $this;
     }
+
+    public function multiLikeCI($value)
+    {
+        $this->arrayException($value);
+        $this->operator(Operator::MULTI_LIKE_CI, new SingleValue($value));
+        return $this;
+    }
 }

src/Engine/Elasticsearch/Operators/LikeCIOperator.php

@@ -29,7 +29,7 @@ public function format()
     {
         return [
             QueryConnector::NAME_QUERY_STRING => [
-                QueryConnector::NAME_QUERY_STRING_QUERY => $this->name . ":" . QueryConnector::WILDCARD . $this->value . QueryConnector::WILDCARD
+                QueryConnector::NAME_QUERY_STRING_QUERY => $this->name . ":" . QueryConnector::ROUND_BRACKET_OPEN . QueryConnector::WILDCARD . $this->value . QueryConnector::WILDCARD . QueryConnector::ROUND_BRACKET_CLOSE
             ]
         ];
     }

src/Engine/Elasticsearch/Operators/MultiLikeCIOperator.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace G4\DataMapper\Engine\Elasticsearch\Operators;
+
+use G4\DataMapper\Common\QueryOperatorInterface;
+use G4\DataMapper\Common\QueryConnector;
+use G4\DataMapper\Common\SingleValue;
+
+/**
+ * Class MultiLikeCIOperator
+ *
+ * @package G4\DataMapper\Engine\Elasticsearch\Operators
+ */
+class MultiLikeCIOperator extends LikeCIOperator implements QueryOperatorInterface
+{
+
+    public function __construct($name, SingleValue $value)
+    {
+        parent::__construct($name, $this->formatValue($value));
+    }
+
+    public function format()
+    {
+        return parent::format(); // TODO: Change the autogenerated stub
+    }
+
+    private function formatValue(SingleValue $value)
+    {
+        return new SingleValue(str_replace(["-","_"," "], "* *", $value));
+    }
+}

src/Engine/Elasticsearch/Version7/Operators/MultipleLikeCIOperator.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace G4\DataMapper\Engine\Elasticsearch\Version7\Operators;
+
+use G4\DataMapper\Common\QueryOperatorInterface;
+use G4\DataMapper\Common\SingleValue;
+
+/**
+ * Class MultipleLikeCIOperator
+ * dummy class to prevent multiplelikeoperator falling to default/version 2.4 es operator
+ * @package G4\DataMapper\Engine\Elasticsearch\Operators
+ */
+class MultipleLikeCIOperator extends LikeCIOperator implements QueryOperatorInterface
+{
+    public function __construct($name, SingleValue $value)
+    {
+        parent::__construct($name, $value);
+    }
+
+    public function format()
+    {
+        return parent::format();
+    }
+}

tests/unit/src/Engine/Elasticsearch/ElasticsearchComparisonFormatterTest.php

@@ -179,7 +179,16 @@ public function testLikeCI()
             ->method('getSymbol')
             ->willReturn(Operator::LIKE_CI);
 
-        $this->assertEquals(['query_string' => ['query' => 'name:*lada*']], $this->comparisonFormatter->format('name', $this->operatorMock, new SingleValue('lada')));
+        $this->assertEquals(['query_string' => ['query' => 'name:(*lada*)']], $this->comparisonFormatter->format('name', $this->operatorMock, new SingleValue('lada')));
+    }
+
+    public function testMultiLikeCI()
+    {
+        $this->operatorMock->expects($this->any())
+            ->method('getSymbol')
+            ->willReturn(Operator::MULTI_LIKE_CI);
+
+        $this->assertEquals(['query_string' => ['query' => 'username:(*my** **name* *is** **rio*)']], $this->comparisonFormatter->format('username', $this->operatorMock, new SingleValue('my_name is-rio')));
     }
 
     public function testLikeCIVersion7()
@@ -191,8 +200,8 @@ public function testLikeCIVersion7()
             ->willReturn(Operator::LIKE_CI);
 
         $this->assertEquals(
-            ['query_string' => ['query' => 'name:*lada*']],
-            $comparisonFormatter->format('name', $this->operatorMock, new SingleValue('LADA'))
+            ['query_string' => ['query' => 'name:*dacia*']],
+            $comparisonFormatter->format('name', $this->operatorMock, new SingleValue('DACIA'))
         );
     }
 
@@ -234,4 +243,5 @@ public function testQueryStringVersion7()
             $comparisonFormatter->format('', $this->operatorMock, new SingleValue('username: *test* OR email: *test*'))
         );
     }
+
 }