Implemented empty, notEmpty, notEndsWith, notStartsWith filters

Author: nilportugues

src/Infrastructure/Model/Repository/Sql/SqlFilter.php

@@ -171,15 +171,6 @@ protected static function apply(
                         }
                         self::likeQuery($placeholders, $query, $operator, $nextPlaceholder, $key, $op, $value);
                         break;
-                    case BaseFilter::STARTS_WITH:
-                    case BaseFilter::ENDS_WITH:
-                        $op = (!$isNot) ? 'LIKE' : 'NOT LIKE';
-                        $newValue = $value.'%';
-                        if ($filterName === BaseFilter::ENDS_WITH) {
-                            $newValue = '%'.$value;
-                        }
-                        self::likeQuery($placeholders, $query, $operator, $nextPlaceholder, $key, $op, $newValue);
-                        break;
                     case BaseFilter::EQUALS:
                     case BaseFilter::NOT_EQUAL:
                         $op = (!$isNot) ? 'eq' : 'neq';
@@ -188,6 +179,30 @@ protected static function apply(
                         }
                         self::query($placeholders, $query, $operator, $nextPlaceholder, $key, $op, $value);
                         break;
+
+                    case BaseFilter::EMPTY_FILTER:
+                        $op = (!$isNot) ? 'eq' : 'neq';
+                        self::query($placeholders, $query, $operator, $nextPlaceholder, $key, $op, '');
+                        break;
+
+                    case BaseFilter::NOT_EMPTY:
+                        $op = (!$isNot) ? 'neq' : 'eq';
+                        self::query($placeholders, $query, $operator, $nextPlaceholder, $key, $op, '');
+                        break;
+
+                    case BaseFilter::ENDS_WITH:
+                    case BaseFilter::NOT_ENDS:
+                        $op = (!$isNot) ? 'LIKE' : 'NOT LIKE';
+                        $newValue = '%'.$value;
+                        self::likeQuery($placeholders, $query, $operator, $nextPlaceholder, $key, $op, $newValue);
+                        break;
+
+                    case BaseFilter::STARTS_WITH:
+                    case BaseFilter::NOT_STARTS:
+                        $op = (!$isNot) ? 'LIKE' : 'NOT LIKE';
+                        $newValue = $value.'%';
+                        self::likeQuery($placeholders, $query, $operator, $nextPlaceholder, $key, $op, $newValue);
+                        break;
                 }
             }
         }

tests/Infrastructure/Model/Repository/Sql/SqlRepositoryTest.php

@@ -346,6 +346,29 @@ public function testFindByMustIncludeGroup()
         $this->assertEquals(3, count($results));
     }
 
+    public function testFindByWithMustBeEmpty()
+    {
+        $filter = new Filter();
+        $filter->must()->empty('totalOrders');
+
+        $fields = new Fields(['name']);
+        $results = $this->repository->findBy($filter, null, $fields);
+
+        $this->assertEquals(0, count($results));
+    }
+
+    public function testFindByWithMustBeNotEmpty()
+    {
+        $filter = new Filter();
+        $filter->must()->notEmpty('totalOrders');
+
+        $fields = new Fields(['name']);
+
+        $results = $this->repository->findBy($filter, null, $fields);
+
+        $this->assertEquals(4, count($results));
+    }
+
     //--------------------------------------------------------------------------------
     // MUST NOT FILTER TESTS
     //--------------------------------------------------------------------------------
@@ -513,6 +536,28 @@ public function testFindByMustNotNotRangeTest()
         $this->assertEquals(3, count($results));
     }
 
+    public function testFindByWithMustNotBeEmpty()
+    {
+        $filter = new Filter();
+        $filter->mustNot()->empty('totalOrders');
+
+        $fields = new Fields(['name']);
+        $results = $this->repository->findBy($filter, null, $fields);
+
+        $this->assertEquals(4, count($results));
+    }
+
+    public function testFindByWithMustNotBeNotEmpty()
+    {
+        $filter = new Filter();
+        $filter->mustNot()->notEmpty('totalOrders');
+
+        $fields = new Fields(['name']);
+
+        $results = $this->repository->findBy($filter, null, $fields);
+
+        $this->assertEquals(0, count($results));
+    }
     //--------------------------------------------------------------------------------
     // SHOULD FILTER TESTS
     //--------------------------------------------------------------------------------