Feature/Add IS NULL and IS NOT NULL filters (#35)

Co-authored-by: Dmytro Zasiadko <dmytro@2amigos.us>
othercodes · Sep 27, 2021 · 3c8058c · 3c8058c
1 parent 3260731
commit 3c8058c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/Application/CriteriaBuilder.php b/src/Application/CriteriaBuilder.php
@@ -159,6 +159,28 @@ public function filterLike(string $field, $value): self
         return $this;
     }
 
+    /**
+     * Adds new filter for IS NULL operator
+     * @param  string  $field
+     * @return $this
+     */
+    public function filterIsNull(string $field): self
+    {
+        $this->filter($field, Filter::IS_NULL, null);
+        return $this;
+    }
+
+    /**
+     * Adds new filter for IS NOT NULL operator
+     * @param  string  $field
+     * @return $this
+     */
+    public function filterIsNotNull(string $field): self
+    {
+        $this->filter($field, Filter::IS_NOT_NULL, null);
+        return $this;
+    }
+
     /**
      * Sets the order by field parameter.
      *

diff --git a/src/Domain/Criteria/Filter.php b/src/Domain/Criteria/Filter.php
@@ -27,6 +27,8 @@ final class Filter implements ValueObject
     public const IN = 'in';
     public const NOT_IN = 'notIn';
     public const LIKE = 'like';
+    public const IS_NULL = 'isNull';
+    public const IS_NOT_NULL = 'isNotNull';
 
     /**
      * The filter field name.

diff --git a/tests/Application/CriteriaBuilderTest.php b/tests/Application/CriteriaBuilderTest.php
@@ -34,9 +34,11 @@ public function testShouldAddFiltersToCriteria(): void
             ->filterIn('address.state', ['FL', 'NY'])
             ->filterNotIn('address.zip', [10, 11, 12, 13])
             ->filterLike('job.title', '%Gangster%')
+            ->filterIsNull('lastActivityDate')
+            ->filterIsNotNull('lastLoginDate')
             ->build();
 
-        $this->assertCount(9, $criteria->filters());
+        $this->assertCount(11, $criteria->filters());
     }
 
     public function testShouldSetOrderByAndOrderType(): void
@@ -60,4 +62,4 @@ public function testShouldSetPageLimitAndPageOffset(): void
         $this->assertEquals(50, $criteria->pageLimit());
         $this->assertEquals(100, $criteria->pageOffset());
     }
-}
+}