fix search in arrays

Author: floriansemm

Query/SolrQuery.php

@@ -174,15 +174,7 @@ public function getQuery()
         $termCount = 1;
         foreach ($this->searchTerms as $fieldName => $fieldValue) {
 
-
-            if ($this->useWildcards) {
-                $fieldValue = '*' . $fieldValue . '*';
-            }
-
-            $termParts = explode(' ', $fieldValue);
-            if (count($termParts) > 1) {
-                $fieldValue = '"'.$fieldValue.'"';
-            }
+            $fieldValue = $this->querifyFieldValue($fieldValue);
 
             $term .= $fieldName . ':' . $fieldValue;
 
@@ -198,4 +190,41 @@ public function getQuery()
         return $term;
     }
 
+    /**
+     * Transforms array to string representation and adds quotes
+     *
+     * @param string $fieldValue
+     *
+     * @return string
+     */
+    private function querifyFieldValue($fieldValue)
+    {
+        if (is_array($fieldValue) && count($fieldValue) > 1) {
+            sort($fieldValue);
+
+            $qutoed = array_map(function($value) {
+                return '"'. $value .'"';
+            }, $fieldValue);
+
+            $fieldValue = implode(' TO ', $qutoed);
+            $fieldValue = '['. $fieldValue . ']';
+
+            return $fieldValue;
+        }
+
+        if (is_array($fieldValue) && count($fieldValue) === 1) {
+            $fieldValue = array_pop($fieldValue);
+        }
+
+        if ($this->useWildcards) {
+            $fieldValue = '*' . $fieldValue . '*';
+        }
+
+        $termParts = explode(' ', $fieldValue);
+        if (count($termParts) > 1) {
+            $fieldValue = '"'.$fieldValue.'"';
+        }
+
+        return $fieldValue;
+    }
 }

Tests/Query/SolrQueryTest.php

@@ -189,4 +189,30 @@ public function testGetQuery_CustomQuery()
 
         $this->assertEquals($expected, $solrQuery->getQuery());
     }
+
+    /**
+     * @test
+     */
+    public function searchInSetMultipleValues()
+    {
+        $solrQuery = $this->createQueryWithFieldMapping();
+        $solrQuery->addSearchTerm('title', array('value2', 'value1'));
+
+        $expected = 'title_s:["value1" TO "value2"]';
+
+        $this->assertEquals($expected, $solrQuery->getQuery());
+    }
+
+    /**
+     * @test
+     */
+    public function searchInSetSingleValues()
+    {
+        $solrQuery = $this->createQueryWithFieldMapping();
+        $solrQuery->addSearchTerm('title', array('value #1'));
+
+        $expected = 'title_s:"value #1"';
+
+        $this->assertEquals($expected, $solrQuery->getQuery());
+    }
 }