Added new operators and unit tests

googleapis · Apr 2, 2022 · 80e284d · 80e284d
1 parent e9c7e49
commit 80e284d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/Datastore/src/Query/Query.php b/Datastore/src/Query/Query.php
@@ -83,6 +83,9 @@ class Query implements QueryInterface
     const OP_GREATER_THAN           = 'GREATER_THAN';
     const OP_GREATER_THAN_OR_EQUAL  = 'GREATER_THAN_OR_EQUAL';
     const OP_EQUALS                 = 'EQUAL';
+    const OP_NOT_EQUALS             = 'NOT_EQUAL';
+    const OP_IN                     = 'IN';
+    const OP_NOT_IN                 = 'NOT_IN';
     const OP_HAS_ANCESTOR           = 'HAS_ANCESTOR';
 
     const ORDER_DEFAULT             = self::ORDER_ASCENDING;
@@ -99,6 +102,9 @@ class Query implements QueryInterface
         self::OP_GREATER_THAN_OR_EQUAL,
         self::OP_EQUALS,
         self::OP_HAS_ANCESTOR,
+        self::OP_NOT_EQUALS,
+        self::OP_IN,
+        self::OP_NOT_IN,
     ];
 
     /**
@@ -109,7 +115,10 @@ class Query implements QueryInterface
         '<=' => self::OP_LESS_THAN_OR_EQUAL,
         '>'  => self::OP_GREATER_THAN,
         '>=' => self::OP_GREATER_THAN_OR_EQUAL,
-        '='  => self::OP_EQUALS
+        '='  => self::OP_EQUALS,
+        '!='  => self::OP_NOT_EQUALS,
+        'IN'  => self::OP_IN,
+        'NOT_IN'  => self::OP_NOT_IN,
     ];
 
     /**

diff --git a/Datastore/tests/Unit/Query/QueryTest.php b/Datastore/tests/Unit/Query/QueryTest.php
@@ -214,6 +214,33 @@ public function testOperatorConstantsEquals()
         $this->assertEquals('EQUAL', $filters[0]['propertyFilter']['op']);
     }
 
+    public function testOperatorConstantsNotEquals()
+    {
+        $this->query->filter('propName', Query::OP_NOT_EQUALS, 'val');
+        $res = $this->query->queryObject();
+
+        $filters = $res['filter']['compositeFilter']['filters'];
+        $this->assertEquals('NOT_EQUAL', $filters[0]['propertyFilter']['op']);
+    }
+
+    public function testOperatorConstantsIn()
+    {
+        $this->query->filter('propName', Query::OP_IN, 'val');
+        $res = $this->query->queryObject();
+
+        $filters = $res['filter']['compositeFilter']['filters'];
+        $this->assertEquals('IN', $filters[0]['propertyFilter']['op']);
+    }
+
+    public function testOperatorConstantsNotIn()
+    {
+        $this->query->filter('propName', Query::OP_NOT_IN, 'val');
+        $res = $this->query->queryObject();
+
+        $filters = $res['filter']['compositeFilter']['filters'];
+        $this->assertEquals('NOT_IN', $filters[0]['propertyFilter']['op']);
+    }
+
     public function testOperatorConstantsHasAncestor()
     {
         $this->query->filter('propName', Query::OP_HAS_ANCESTOR, 'val');