Fix toArray + tests

utopia-php · Dec 14, 2023 · 8f2a52a · 8f2a52a
1 parent 966194a
commit 8f2a52a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/Database/Query.php b/src/Database/Query.php
@@ -277,10 +277,11 @@ public static function parseQueries(array $queries): array
      */
     public function toArray(): array
     {
-        $array = [
-            'method' => $this->method,
-            'attribute' => $this->attribute,
-        ];
+        $array = ['method' => $this->method];
+
+        if(!empty($this->attribute)){
+            $array['attribute'] = $this->attribute;
+        }
 
         if (\in_array($array['method'], self::LOGICAL_TYPES)) {
             foreach ($this->values as $index => $value) {

diff --git a/tests/unit/QueryTest.php b/tests/unit/QueryTest.php
@@ -211,7 +211,7 @@ public function testParse(): void
         $this->assertEquals(Query::TYPE_OR, $query->getMethod());
         $this->assertEquals(Query::TYPE_EQUAL, $queries[0]->getMethod());
         $this->assertEquals('actors', $queries[0]->getAttribute());
-        $this->assertEquals($json, '{"method":"or","attribute":"","values":[{"method":"equal","attribute":"actors","values":["Brad Pitt"]},{"method":"equal","attribute":"actors","values":["Johnny Depp"]}]}');
+        $this->assertEquals($json, '{"method":"or","values":[{"method":"equal","attribute":"actors","values":["Brad Pitt"]},{"method":"equal","attribute":"actors","values":["Johnny Depp"]}]}');
     }
 
     public function testisMethod(): void
@@ -235,6 +235,7 @@ public function testisMethod(): void
         $this->assertTrue(Query::isMethod('between'));
         $this->assertTrue(Query::isMethod('select'));
         $this->assertTrue(Query::isMethod('or'));
+        $this->assertTrue(Query::isMethod('and'));
 
         $this->assertTrue(Query::isMethod(Query::TYPE_EQUAL));
         $this->assertTrue(Query::isMethod(Query::TYPE_NOT_EQUAL));
@@ -255,6 +256,7 @@ public function testisMethod(): void
         $this->assertTrue(Query::isMethod(QUERY::TYPE_BETWEEN));
         $this->assertTrue(Query::isMethod(QUERY::TYPE_SELECT));
         $this->assertTrue(Query::isMethod(QUERY::TYPE_OR));
+        $this->assertTrue(Query::isMethod(QUERY::TYPE_AND));
 
         $this->assertFalse(Query::isMethod('invalid'));
         $this->assertFalse(Query::isMethod('lte '));

diff --git a/tests/unit/Validator/QueryTest.php b/tests/unit/Validator/QueryTest.php
@@ -317,6 +317,6 @@ public function testOrQuery(): void
                 )]
         ));
 
-        $this->assertEquals('Invalid query: Or queries requires only filters', $validator->getDescription());
+        $this->assertEquals('Invalid query: Or queries can only contain filter queries', $validator->getDescription());
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -317,6 +317,6 @@ public function testOrQuery(): void @@
                     )]
             ));
-            $this->assertEquals('Invalid query: Or queries requires only filters', $validator->getDescription());
+            $this->assertEquals('Invalid query: Or queries can only contain filter queries', $validator->getDescription());
         }
     }