Merge pull request #15 from flavioheleno/master

Added notNull and null filters
nilportugues · Mar 3, 2017 · 3b4d0d7 · 3b4d0d7
2 parents 49365bd + b46e856
commit 3b4d0d7
Show file tree

Hide file tree

Showing 7 changed files with 138 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ class MyInMemoryRepository extends InMemoryRepository
 }
 ```
 
-Implementation can be seen [here](https://github.com/nilportugues/php-repository/blob/master/src/Infrastructure/Model/Repository/InMemory/InMemoryRepository.php). 
+Implementation can be seen [here](https://github.com/nilportugues/php-repository/blob/master/src/Infrastructure/Model/Repository/InMemory/InMemoryRepository.php).
 
 The base InMemoryRepository implements the following interfaces:
 
@@ -62,12 +62,14 @@ Interaction with the repository requires the usage of the following classes or c
     - `public function mustNot()`
     - `public function should()`
     - `public function clear()`
-    
-- **NilPortugues\Foundation\Domain\Model\Repository\BaseFilter**   
+
+- **NilPortugues\Foundation\Domain\Model\Repository\BaseFilter**
     - `public function notStartsWith($filterName, $value)`
     - `public function notEndsWith($filterName, $value)`
     - `public function notEmpty($filterName)`
     - `public function empty($filterName)`
+    - `public function notNull($filterName)`
+    - `public function empty($filterName)`
     - `public function startsWith($filterName, $value)`
     - `public function endsWith($filterName, $value)`
     - `public function equal($filterName, $value)`
@@ -134,13 +136,13 @@ Interaction with the repository requires the usage of the following classes or c
     - `public function setOrderFor($propertyName, OrderInterface $order)`
     - `public function property($propertyName)`
 
-#### Interfaces 
+#### Interfaces
 
 - **NilPortugues\Foundation\Domain\Model\Repository\Contracts\Identity**
 
     - `public function id()`
     - `public function __toString()`
-    
+
 - **NilPortugues\Foundation\Domain\Model\Repository\Contracts\Repository**
 
     - `public function count(Filter $filter = null)`

diff --git a/src/Domain/Model/Repository/BaseFilter.php b/src/Domain/Model/Repository/BaseFilter.php
@@ -51,6 +51,18 @@ public function hasEmpty(string $filterName): BaseFilterInterface
         return $this;
     }
 
+    /**
+     * @param string $filterName
+     *
+     * @return BaseFilterInterface
+     */
+    public function notNull(string $filterName): BaseFilterInterface
+    {
+        $this->addFilter(self::NOT_NULL, $filterName, self::NOT_NULL);
+
+        return $this;
+    }
+
     /**
      * @param string $filterName
      * @param mixed  $value
@@ -313,4 +325,16 @@ public function empty(string $filterName): BaseFilterInterface
 
         return $this;
     }
+
+    /**
+     * @param string $filterName
+     *
+     * @return BaseFilterInterface
+     */
+    public function null(string $filterName): BaseFilterInterface
+    {
+        $this->addFilter(self::NULL_FILTER, $filterName, self::NULL_FILTER);
+
+        return $this;
+    }
 }
diff --git a/src/Domain/Model/Repository/Contracts/BaseFilter.php b/src/Domain/Model/Repository/Contracts/BaseFilter.php
@@ -27,7 +27,9 @@ interface BaseFilter
     const EQUALS = 'equals';
     const NOT_EQUAL = 'not_equals';
     const EMPTY_FILTER = 'empty';
+    const NULL_FILTER = 'null';
     const NOT_EMPTY = 'not_empty';
+    const NOT_NULL = 'not_null';
     const NOT_ENDS = 'not_ends';
     const NOT_STARTS = 'not_starts';
 
@@ -68,6 +70,20 @@ public function notEmpty(string $filterName): BaseFilter;
      */
     public function hasEmpty(string $filterName): BaseFilter;
 
+    /**
+     * @param string $filterName
+     *
+     * @return BaseFilter
+     */
+    public function null(string $filterName): BaseFilter;
+
+    /**
+     * @param string $filterName
+     *
+     * @return BaseFilter
+     */
+    public function notNull(string $filterName): BaseFilter;
+
     /**
      * @param string $filterName
      * @param $value

diff --git a/src/Infrastructure/Model/Repository/InMemory/Filter.php b/src/Infrastructure/Model/Repository/InMemory/Filter.php
@@ -148,6 +148,12 @@ protected static function must(array &$filteredResults, array $filters)
                     case BaseFilter::EMPTY_FILTER:
                         $filteredResults = array_filter($filteredResults, ComparisonFilter::empty($property));
                         break;
+                    case BaseFilter::NOT_NULL:
+                        $filteredResults = array_filter($filteredResults, ComparisonFilter::notNull($property));
+                        break;
+                    case BaseFilter::NULL_FILTER:
+                        $filteredResults = array_filter($filteredResults, ComparisonFilter::null($property));
+                        break;
                     case BaseFilter::NOT_STARTS:
                         $filteredResults = array_filter($filteredResults, StringFilter::notStartsWith($property, $v));
                         break;
@@ -233,6 +239,12 @@ protected static function mustNot(array &$filteredResults, array $filters)
                     case BaseFilter::EMPTY_FILTER:
                         $filteredResults = array_filter($filteredResults, ComparisonFilter::notEmpty($property));
                         break;
+                    case BaseFilter::NOT_NULL:
+                        $filteredResults = array_filter($filteredResults, ComparisonFilter::notNull($property));
+                        break;
+                    case BaseFilter::NULL_FILTER:
+                        $filteredResults = array_filter($filteredResults, ComparisonFilter::null($property));
+                        break;
                     case BaseFilter::NOT_STARTS:
                         $filteredResults = array_filter($filteredResults, StringFilter::startsWith($property, $v));
                         break;
@@ -365,7 +377,18 @@ protected static function should(array &$results, array &$filteredResults, array
                             array_filter($results, ComparisonFilter::empty($property))
                         );
                         break;
-
+                    case BaseFilter::NOT_NULL:
+                        $filteredResults = array_merge(
+                            $filteredResults,
+                            array_filter($results, ComparisonFilter::notNull($property))
+                        );
+                        break;
+                    case BaseFilter::NULL_FILTER:
+                        $filteredResults = array_merge(
+                            $filteredResults,
+                            array_filter($results, ComparisonFilter::null($property))
+                        );
+                        break;
                     case BaseFilter::NOT_STARTS:
                         $filteredResults = array_merge(
                             $filteredResults,

diff --git a/src/Infrastructure/Model/Repository/InMemory/Filters/ComparisonFilter.php b/src/Infrastructure/Model/Repository/InMemory/Filters/ComparisonFilter.php
@@ -29,6 +29,29 @@ public static function notEmpty(string $property): \Closure
             return PropertyValue::get($v, $property) !== null && PropertyValue::get($v, $property) !== '';
         };
     }
+    /**
+     * @param string $property
+     *
+     * @return \Closure
+     */
+    public static function null(string $property): \Closure
+    {
+        return function ($v) use ($property) {
+            return PropertyValue::get($v, $property) === null;
+        };
+    }
+
+    /**
+     * @param string $property
+     *
+     * @return \Closure
+     */
+    public static function notNull(string $property): \Closure
+    {
+        return function ($v) use ($property) {
+            return PropertyValue::get($v, $property) !== null;
+        };
+    }
 
     /**
      * @param string           $property

diff --git a/tests/Domain/Model/Repository/BaseFilterTest.php b/tests/Domain/Model/Repository/BaseFilterTest.php
@@ -86,6 +86,32 @@ public function testItShouldAddFilterForHasEmpty()
         $this->assertEquals($expected, $this->filter->get());
     }
 
+    public function testItShouldAddFilterForNull()
+    {
+        $this->filter->null('name');
+
+        $expected = [
+            'null' => [
+                'name' => ['null'],
+            ],
+        ];
+
+        $this->assertEquals($expected, $this->filter->get());
+    }
+
+    public function testItShouldAddFilterForNotNull()
+    {
+        $this->filter->notNull('name');
+
+        $expected = [
+            'not_null' => [
+                'name' => ['not_null'],
+            ],
+        ];
+
+        $this->assertEquals($expected, $this->filter->get());
+    }
+
     public function testItShouldAddFilterForStartsWith()
     {
         $this->filter->startsWith('name', 'N');

diff --git a/tests/Infrastructure/Model/Repository/InMemory/FilterTest.php b/tests/Infrastructure/Model/Repository/InMemory/FilterTest.php
@@ -450,6 +450,24 @@ public function testItMustBeEmpty()
         $this->assertEquals(0, count($results));
     }
 
+    public function testItMustNotBeNull()
+    {
+        $filter = new Filter();
+        $filter->must()->notNull('name');
+        $results = InMemoryFilter::filter($this->data, $filter);
+
+        $this->assertEquals(4, count($results));
+    }
+
+    public function testItMustBeNull()
+    {
+        $filter = new Filter();
+        $filter->must()->null('name');
+        $results = InMemoryFilter::filter($this->data, $filter);
+
+        $this->assertEquals(0, count($results));
+    }
+
     public function testItMustNotNotStartWithScalar()
     {
         $filter = new Filter();