From f453592b39158e41a2f46121253e0755de1b618c Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Thu, 8 Jun 2017 08:38:14 +0200
Subject: [PATCH] TASK: Add further tests and cast search input

* Map user input to string in any case.
* Add tests to check whether filter is added to query.
* Add test to check whether input is casted to string.
---
 Classes/Domain/Model/SearchRequest.php        |  4 +-
 Tests/Unit/Domain/Search/QueryFactoryTest.php | 43 +++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/Classes/Domain/Model/SearchRequest.php b/Classes/Domain/Model/SearchRequest.php
index b88c866..f1ad18e 100644
--- a/Classes/Domain/Model/SearchRequest.php
+++ b/Classes/Domain/Model/SearchRequest.php
@@ -44,7 +44,7 @@ class SearchRequest implements SearchRequestInterface
      */
     public function __construct($query)
     {
-        $this->query = $query;
+        $this->query = (string) $query;
     }
 
     /**
@@ -68,7 +68,7 @@ class SearchRequest implements SearchRequestInterface
      */
     public function setFilter(array $filter)
     {
-        $this->filter = $filter;
+        $this->filter = array_map('strval', $filter);
     }
 
     /**
diff --git a/Tests/Unit/Domain/Search/QueryFactoryTest.php b/Tests/Unit/Domain/Search/QueryFactoryTest.php
index 7fc6b15..83f031e 100644
--- a/Tests/Unit/Domain/Search/QueryFactoryTest.php
+++ b/Tests/Unit/Domain/Search/QueryFactoryTest.php
@@ -53,4 +53,47 @@ class QueryFactoryTest extends AbstractUnitTestCase
             'Factory did not create the expected instance.'
         );
     }
+
+    /**
+     * @test
+     */
+    public function filterIsAddedToQuery()
+    {
+        $connection = $this->getMockBuilder(Connection\Elasticsearch::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $searchRequest = new SearchRequest('SearchWord');
+        $searchRequest->setFilter(['field' => 'content']);
+
+        $query = $this->subject->create($connection, $searchRequest);
+        $this->assertSame(
+            ['field' => 'content'],
+            $query->toArray()['query']['bool']['filter']['term'],
+            'Filter was not added to query.'
+        );
+    }
+
+    /**
+     * @test
+     */
+    public function userInputIsAlwaysString()
+    {
+        $connection = $this->getMockBuilder(Connection\Elasticsearch::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $searchRequest = new SearchRequest(10);
+        $searchRequest->setFilter(['field' => 20]);
+
+        $query = $this->subject->create($connection, $searchRequest);
+        $this->assertSame(
+            '10',
+            $query->toArray()['query']['bool']['must'][0]['match']['_all'],
+            'Search word was not escaped as expected.'
+        );
+        $this->assertSame(
+            '20',
+            $query->toArray()['query']['bool']['filter']['term']['field'],
+            'Search word was not escaped as expected.'
+        );
+    }
 }