Removed EQUAL REGEX. Uses native implementation now

nilportugues · Apr 27, 2016 · 088eda9 · 088eda9
1 parent 36926ad
commit 088eda9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/Infrastructure/Model/Repository/MongoDB/MongoDBFilter.php b/src/Infrastructure/Model/Repository/MongoDB/MongoDBFilter.php
@@ -25,12 +25,10 @@ class MongoDBFilter
     const CONTAINS_PATTERN = '/%s/i.test(this.%s)';
     const STARTS_WITH_PATTERN = '/^%s/i.test(this.%s)';
     const ENDS_WITH_PATTERN = '/%s$/i.test(this.%s)';
-    const EQUALS_PATTERN = '/^%s$/i.test(this.%s)';
 
     const NOT_CONTAINS_PATTERN = '/^((?!%s.))/i.test(this.%s)';
     const NOT_STARTS_WITH_PATTERN = '/^(?!%s).+/i.test(this.%s)';
     const NOT_ENDS_WITH_PATTERN = '!(/%s$/i.test(this.%s))';
-    const NOT_EQUALS_PATTERN = '!(/^%s$/i.test(this.%s))';
     const NOT_RANGES_REGEX = '%s < this.%s && %s > this.%s ';
 
     /**
@@ -207,12 +205,18 @@ protected static function apply(array &$filterArray, array $filters, $conditiona
                         );
                         break;
                     case BaseFilter::EQUALS:
-                        $regex = ('$not' !== $conditional) ? self::EQUALS_PATTERN : self::NOT_EQUALS_PATTERN;
-                        $where[] = sprintf($regex, $value, $key);
+                        if ('$not' !== $conditional) {
+                            $filterArray[$key] = $value;
+                        } else {
+                            $filterArray[$key] = ['$ne' => $value];
+                        }
                         break;
                     case BaseFilter::NOT_EQUAL:
-                        $regex = ('$not' !== $conditional) ? self::NOT_EQUALS_PATTERN : self::EQUALS_PATTERN;
-                        $where[] = sprintf($regex, $value, $key);
+                        if ('$not' !== $conditional) {
+                            $filterArray[$key] = ['$ne' => $value];
+                        } else {
+                            $filterArray[$key] = $value;
+                        }
                         break;
                 }
             }

diff --git a/src/Infrastructure/Model/Repository/MongoDB/MongoDBRepository.php b/src/Infrastructure/Model/Repository/MongoDB/MongoDBRepository.php
@@ -276,7 +276,7 @@ public function addAll(array $values)
         foreach ($values as $value) {
             Assert::isInstanceOf($value, Identity::class);
             $value = MongoDBTransformer::create()->serialize($value);
-            
+
             if (self::MONGODB_OBJECT_ID === $this->primaryKey) {
                 $id = new ObjectID(
                     (!empty($value[self::MONGODB_OBJECT_ID])) ? $value[self::MONGODB_OBJECT_ID] : null
@@ -293,7 +293,7 @@ public function addAll(array $values)
                 $documents[][BulkWrite::UPDATE_ONE] = [[$this->primaryKey => $id], ['$set' => $value]];
             }
         }
-        
+
         if (empty($documents)) {
             return [];
         }

diff --git a/tests/Infrastructure/Model/Repository/MongoDB/MongoDBRepositoryTest.php b/tests/Infrastructure/Model/Repository/MongoDB/MongoDBRepositoryTest.php
@@ -390,7 +390,6 @@ public function testFindByWithMustNotEqualTest()
         $filter->must()->notEqual('name', 'Ken Sugimori');
 
         $fields = new Fields(['name']);
-
         $results = $this->repository->findBy($filter, null, $fields);
 
         $this->assertEquals(3, count($results));