From b1eb1be14c564b86e219bc46a15e63fe739650f3 Mon Sep 17 00:00:00 2001
From: "a.shamavov" <a.shamavov@iqdev.digital>
Date: Wed, 5 Mar 2025 10:59:44 +0500
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80?=
 =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Filter/Date.php        | 8 ++++----
 src/Filter/Like.php        | 8 ++++----
 src/Filter/Where.php       | 8 ++++----
 tests/FilterByLikeTest.php | 2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Filter/Date.php b/src/Filter/Date.php
index 5221336..5221fc8 100644
--- a/src/Filter/Date.php
+++ b/src/Filter/Date.php
@@ -11,10 +11,6 @@ final class Date extends HttpFilter
 {
     public function addToQuery(QueryBuilder $queryBuilder): QueryBuilder
     {
-        $queryBuilder->where(
-            'SUBSTRING(' . $this->getColumn() . ', 0, 11) = :' . $this->getParameterKey(),
-        );
-
         if (is_null($this->getHttpValue())) {
             return $queryBuilder;
         }
@@ -23,6 +19,10 @@ final class Date extends HttpFilter
             return $queryBuilder;
         }
 
+        $queryBuilder->where(
+            'SUBSTRING(' . $this->getColumn() . ', 0, 11) = :' . $this->getParameterKey(),
+        );
+
         $queryBuilder->setParameter($this->getParameterKey(), $this->getHttpValue());
 
         return $queryBuilder;
diff --git a/src/Filter/Like.php b/src/Filter/Like.php
index f3054bd..30dd2ce 100644
--- a/src/Filter/Like.php
+++ b/src/Filter/Like.php
@@ -11,14 +11,14 @@ final class Like extends HttpFilter
 {
     public function addToQuery(QueryBuilder $queryBuilder): QueryBuilder
     {
-        $queryBuilder->where(
-            $this->getColumn() . ' LIKE :' . $this->getParameterKey(),
-        );
-
         if ($this->getHttpValue() === null) {
             return $queryBuilder;
         }
 
+        $queryBuilder->where(
+            $this->getColumn() . ' LIKE :' . $this->getParameterKey(),
+        );
+
         $queryBuilder->setParameter($this->getParameterKey(), '%' . $this->getHttpValue() . '%');
 
         return $queryBuilder;
diff --git a/src/Filter/Where.php b/src/Filter/Where.php
index 012e4b6..8a6a807 100644
--- a/src/Filter/Where.php
+++ b/src/Filter/Where.php
@@ -11,14 +11,14 @@ final class Where extends HttpFilter
 {
     public function addToQuery(QueryBuilder $queryBuilder): QueryBuilder
     {
-        $queryBuilder->where(
-            $this->getColumn() . ' = :' . $this->getParameterKey(),
-        );
-
         if ($this->getHttpValue() === null) {
             return $queryBuilder;
         }
 
+        $queryBuilder->where(
+            $this->getColumn() . ' = :' . $this->getParameterKey(),
+        );
+
         $queryBuilder->setParameter($this->getParameterKey(), $this->getHttpValue());
 
         return $queryBuilder;
diff --git a/tests/FilterByLikeTest.php b/tests/FilterByLikeTest.php
index c030e7a..240be39 100644
--- a/tests/FilterByLikeTest.php
+++ b/tests/FilterByLikeTest.php
@@ -143,7 +143,7 @@ class FilterByLikeTest extends TestCase
         $this->assertCount($countPosts, $result);
     }
 
-    public function testFilterDateWithDifferentKey(): void
+    public function testFilterLikeWithDifferentKey(): void
     {
         /** @var PostRepository $postRepository */
         $postRepository = $this->em->getRepository(Post::class);
-- 
GitLab