Handling the null/not null value (#3)

* Handling the null/not null value * Added tests for the null/not null filters * Fixed function names
alterphp · Nov 20, 2017 · 593b8c7 · 593b8c7
1 parent 4865335
commit 593b8c7
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 4 deletions.
diff --git a/src/EventListener/PostQueryBuilderSubscriber.php b/src/EventListener/PostQueryBuilderSubscriber.php
@@ -91,14 +91,20 @@ protected function filterQueryBuilder(QueryBuilder $queryBuilder, string $field,
         // For multiple value, use an IN clause, equality otherwise
         if (is_array($value)) {
             $filterDqlPart = $field.' IN (:'.$parameter.')';
+        } elseif ('_NULL' === $value) {
+            $parameter = null;
+            $filterDqlPart = $field.' IS NULL';
+        } elseif ('_NOT_NULL' === $value) {
+            $parameter = null;
+            $filterDqlPart = $field.' IS NOT NULL';
         } else {
             $filterDqlPart = $field.' = :'.$parameter;
         }
 
-        $queryBuilder
-            ->andWhere($filterDqlPart)
-            ->setParameter($parameter, $value)
-        ;
+        $queryBuilder->andWhere($filterDqlPart);
+        if (null !== $parameter) {
+            $queryBuilder->setParameter($parameter, $value);
+        }
     }
 
     /**

diff --git a/tests/Controller/RequestParametersTest.php b/tests/Controller/RequestParametersTest.php
@@ -90,4 +90,24 @@ public function testRequestFilterIsAppliedToSearchAction()
 
         $this->assertSame(10, $crawler->filter('#main tr[data-id]')->count());
     }
+
+    public function testRequestNullFilterIsApplied()
+    {
+        $crawler = $this->requestListView(
+            'Product', array('entity.phone' => '_NULL')
+        );
+
+        $this->assertSame(10, $crawler->filter('#main tr[data-id]')->count());
+    }
+
+    public function testRequestNotNullFilterIsApplied()
+    {
+        $crawler = $this->requestListView(
+            'Product', array('entity.phone' => '_NOT_NULL')
+        );
+        $this->assertContains(
+            '1 - 15 of 90',
+            $crawler->filter('#main .list-pagination')->text()
+        );
+    }
 }
diff --git a/tests/Fixtures/AppTestBundle/DataFixtures/ORM/LoadProducts.php b/tests/Fixtures/AppTestBundle/DataFixtures/ORM/LoadProducts.php
@@ -57,6 +57,7 @@ public function load(ObjectManager $manager)
             $product->setCategories($this->getRandomCategories());
             $product->setDescription($this->getRandomDescription());
             $product->setHtmlFeatures($this->getRandomHtmlFeatures());
+            $product->setPhone($i <= 10 ? null : '0123456789');
 
             $this->addReference('product-'.$i, $product);
             $manager->persist($product);

diff --git a/tests/Fixtures/AppTestBundle/Entity/FunctionalTests/Product.php b/tests/Fixtures/AppTestBundle/Entity/FunctionalTests/Product.php
@@ -145,6 +145,13 @@ class Product
      */
     protected $image;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    protected $phone;
+
     /**
      * Constructor of the Category class.
      * (Initialize some fields).
@@ -463,4 +470,20 @@ public function __toString()
     {
         return $this->getName();
     }
+
+    /**
+     * @param string $phone
+     */
+    public function setPhone($phone)
+    {
+        $this->phone = $phone;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPhone()
+    {
+        return $this->phone;
+    }
 }