From 753aebccab238bcb9004b69e41ecf05f0b4dedc0 Mon Sep 17 00:00:00 2001
From: Steven <stnguyen90@users.noreply.github.com>
Date: Mon, 15 Aug 2022 19:31:14 +0000
Subject: [PATCH 01/28] Create Appwrite Query Validator

The Appwrite Query Validator checks if the cursor value is a valid UID.
This is different than the cursor value in utopia-php/database because
the value in the database layer is expected to be a document.
---
 .../Utopia/Database/Validator/Query.php       | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Query.php

diff --git a/src/Appwrite/Utopia/Database/Validator/Query.php b/src/Appwrite/Utopia/Database/Validator/Query.php
new file mode 100644
index 0000000000..eeb5b51a76
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Query.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator;
+
+use Utopia\Database\Validator\UID;
+use Utopia\Database\Validator\Query as QueryValidator;
+
+class Query extends QueryValidator
+{
+    protected function isValidCursor($cursor): bool
+    {
+        $validator = new UID();
+
+        if ($validator->isValid($cursor)) {
+            return true;
+        }
+
+        $this->message = 'Invalid cursor: ' . $validator->getDescription();
+        return false;
+    }
+}

From f0d66985f7765c1a9c6cdb04be7be600d42e56cd Mon Sep 17 00:00:00 2001
From: Steven <stnguyen90@users.noreply.github.com>
Date: Mon, 15 Aug 2022 19:35:50 +0000
Subject: [PATCH 02/28] Consolidate List Users API params

Replace search, limit, offset, cursor, cursorDirection, and orderType
params with a single queries param since the Queries V2 change now
allows for different types of queries.
---
 app/controllers/api/users.php                 |  36 ++--
 .../Database/Validator/Queries/Collection.php |  58 ++++++
 .../Database/Validator/Queries/Users.php      |  28 +++
 .../Account/AccountCustomClientTest.php       |   9 +-
 tests/e2e/Services/Users/UsersBase.php        | 171 ++++++++++++++++--
 5 files changed, 263 insertions(+), 39 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Users.php

diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index bbd0146c8b..71e6feb224 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -10,6 +10,7 @@ use Appwrite\Event\Audit as EventAudit;
 use Appwrite\Network\Validator\Email;
 use Appwrite\Stats\Stats;
 use Appwrite\Utopia\Database\Validator\CustomId;
+use Appwrite\Utopia\Database\Validator\Queries\Users;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Audit\Audit;
@@ -107,43 +108,44 @@ App::get('/v1/users')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER_LIST)
+    ->param('queries', [], new Users(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Users::ALLOWED_ATTRIBUTES), true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
-    ->param('limit', 25, new Range(0, 100), 'Maximum number of users to return in response. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
-    ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Offset value. The default value is 0. Use this param to manage pagination. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
-    ->param('cursor', '', new UID(), 'ID of the user used as the starting point for the query, excluding the user itself. Should be used for efficient pagination when working with large sets of data. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
-    ->param('cursorDirection', Database::CURSOR_AFTER, new WhiteList([Database::CURSOR_AFTER, Database::CURSOR_BEFORE]), 'Direction of the cursor, can be either \'before\' or \'after\'.', true)
-    ->param('orderType', Database::ORDER_ASC, new WhiteList([Database::ORDER_ASC, Database::ORDER_DESC], true), 'Order result by ASC or DESC order.', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('usage')
-    ->action(function (string $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject, Stats $usage) {
+    ->action(function (array $queries, string $search, Response $response, Database $dbForProject, Stats $usage) {
 
-        $filterQueries = [];
+        $queries = Query::parseQueries($queries);
 
         if (!empty($search)) {
-            $filterQueries[] = Query::search('search', $search);
+            $queries[] = Query::search('search', $search);
         }
 
-        $queries = [];
-        $queries[] = Query::limit($limit);
-        $queries[] = Query::offset($offset);
-        $queries[] = $orderType === Database::ORDER_ASC ? Query::orderAsc('') : Query::orderDesc('');
-        if (!empty($cursor)) {
-            $cursorDocument = $dbForProject->getDocument('users', $cursor);
+        // Set default limit
+        $queries[] = Query::limit(25);
+
+        // Get cursor document if there was a cursor query
+        $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null;
+        if ($cursor !== null) {
+            /** @var Query $cursor */
+            $userId = $cursor->getValue();
+            $cursorDocument = $dbForProject->getDocument('users', $userId);
 
             if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "User '{$cursor}' for the 'cursor' value not found.");
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "User '{$userId}' for the 'cursor' value not found.");
             }
 
-            $queries[] = $cursorDirection === Database::CURSOR_AFTER ? Query::cursorAfter($cursorDocument) : Query::cursorBefore($cursorDocument);
+            $cursor->setValue($cursorDocument);
         }
 
+        $filterQueries = Query::groupByType($queries)['filters'];
+
         $usage
             ->setParam('users.read', 1)
         ;
 
         $response->dynamic(new Document([
-            'users' => $dbForProject->find('users', \array_merge($filterQueries, $queries)),
+            'users' => $dbForProject->find('users', $queries),
             'total' => $dbForProject->count('users', $filterQueries, APP_LIMIT_COUNT),
         ]), Response::MODEL_USER_LIST);
     });
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php b/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
new file mode 100644
index 0000000000..0404f299af
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Utopia\Config\Config;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Validator\Queries as QueriesValidator;
+use Utopia\Database\Validator\Query as QueryValidator;
+
+class Collection extends QueriesValidator
+{
+    /**
+     * Expression constructor
+     *
+     * @param string $collection
+     * @param string[] $allowedAttributes
+     */
+    public function __construct(string $collection, array $allowedAttributes)
+    {
+        $collection = Config::getParam('collections', [])[$collection];
+        // array for constant lookup time
+        $allowedAttributesLookup = [];
+        foreach ($allowedAttributes as $attribute) {
+            $allowedAttributesLookup[$attribute] = true;
+        }
+
+        $attributes = [];
+        foreach ($collection['attributes'] as $attribute) {
+            $key = $attribute['$id'];
+            if (!isset($allowedAttributesLookup[$key])) {
+                continue;
+            }
+
+            $attributes[] = new Document([
+                'key' => $key,
+                'type' => $attribute['type'],
+                'array' => $attribute['array'],
+            ]);
+        }
+
+        $indexes = [];
+        foreach ($allowedAttributes as $attribute) {
+            $indexes[] = new Document([
+                'status' => 'available',
+                'type' => Database::INDEX_KEY,
+                'attributes' => [$attribute]
+            ]);
+        }
+        $indexes[] = new Document([
+            'status' => 'available',
+            'type' => Database::INDEX_FULLTEXT,
+            'attributes' => ['search']
+        ]);
+
+        parent::__construct(new QueryValidator($attributes), $attributes, $indexes, true);
+    }
+}
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
new file mode 100644
index 0000000000..fcef3f9928
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Collection;
+
+class Users extends Collection
+{
+    public const ALLOWED_ATTRIBUTES = [
+        'name',
+        'email',
+        'phone',
+        'status',
+        'passwordUpdate',
+        'registration',
+        'emailVerification',
+        'phoneVerification',
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('users', self::ALLOWED_ATTRIBUTES);
+    }
+}
diff --git a/tests/e2e/Services/Account/AccountCustomClientTest.php b/tests/e2e/Services/Account/AccountCustomClientTest.php
index 5b878acca4..649289db1d 100644
--- a/tests/e2e/Services/Account/AccountCustomClientTest.php
+++ b/tests/e2e/Services/Account/AccountCustomClientTest.php
@@ -614,7 +614,7 @@ class AccountCustomClientTest extends Scope
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
         ], [
-            'search' => $newName
+            'search' => $newName,
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -628,7 +628,7 @@ class AccountCustomClientTest extends Scope
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
         ], [
-            'search' => $id
+            'search' => $id,
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -654,7 +654,8 @@ class AccountCustomClientTest extends Scope
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
         ], [
-            'search' => '"' . $email . '"'
+            'search' => '"' . $email . '"',
+
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -668,7 +669,7 @@ class AccountCustomClientTest extends Scope
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
         ], [
-            'search' => $id
+            'search' => $id,
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
diff --git a/tests/e2e/Services/Users/UsersBase.php b/tests/e2e/Services/Users/UsersBase.php
index 8cad10f37c..1d3f7412a0 100644
--- a/tests/e2e/Services/Users/UsersBase.php
+++ b/tests/e2e/Services/Users/UsersBase.php
@@ -80,11 +80,145 @@ trait UsersBase
         $this->assertEquals($response['body']['users'][0]['$id'], $data['userId']);
         $this->assertEquals($response['body']['users'][1]['$id'], 'user1');
 
+        $user1 = $response['body']['users'][1];
+
         $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $response['body']['users'][0]['$id']
+            'queries' => ['equal("name", "' . $user1['name'] . '")']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['name'], $user1['name']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['equal("email", "' . $user1['email'] . '")']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['email'], $user1['email']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['equal("status", true)']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(2, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['$id'], $data['userId']);
+        $this->assertEquals($response['body']['users'][0]['status'], $user1['status']);
+        $this->assertEquals($response['body']['users'][1]['$id'], $user1['$id']);
+        $this->assertEquals($response['body']['users'][1]['status'], $user1['status']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['equal("status", false)']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertEmpty($response['body']['users']);
+        $this->assertCount(0, $response['body']['users']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['equal("passwordUpdate", "' . $user1['passwordUpdate'] . '")']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['passwordUpdate'], $user1['passwordUpdate']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['equal("registration", "' . $user1['registration'] . '")']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['registration'], $user1['registration']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['equal("emailVerification", false)']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(2, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['$id'], $data['userId']);
+        $this->assertEquals($response['body']['users'][0]['status'], $user1['status']);
+        $this->assertEquals($response['body']['users'][1]['$id'], $user1['$id']);
+        $this->assertEquals($response['body']['users'][1]['status'], $user1['status']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['equal("emailVerification", true)']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertEmpty($response['body']['users']);
+        $this->assertCount(0, $response['body']['users']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['equal("phoneVerification", false)']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertEmpty($response['body']['users']);
+        $this->assertCount(0, $response['body']['users']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['equal("phoneVerification", true)']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertEmpty($response['body']['users']);
+        $this->assertCount(0, $response['body']['users']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['cursorAfter("' . $data['userId'] . '")']
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -97,8 +231,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => 'user1',
-            'cursorDirection' => Database::CURSOR_BEFORE
+            'queries' => ['cursorBefore("user1")']
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -114,7 +247,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'search' => 'Ronaldo'
+            'search' => "Ronaldo",
         ]);
         $this->assertEquals($response['headers']['status-code'], 200);
         $this->assertNotEmpty($response['body']);
@@ -126,7 +259,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'search' => 'cristiano.ronaldo@manchester-united.co.uk'
+            'search' => "cristiano.ronaldo@manchester-united.co.uk",
         ]);
         $this->assertEquals($response['headers']['status-code'], 200);
         $this->assertNotEmpty($response['body']);
@@ -138,7 +271,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'search' => 'cristiano.ronaldo'
+            'search' => "cristiano.ronaldo",
         ]);
         $this->assertEquals($response['headers']['status-code'], 200);
         $this->assertNotEmpty($response['body']);
@@ -150,7 +283,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'search' => 'manchester'
+            'search' => "manchester",
         ]);
         $this->assertEquals($response['headers']['status-code'], 200);
         $this->assertNotEmpty($response['body']);
@@ -162,7 +295,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'search' => 'united.co.uk'
+            'search' => "united.co.uk",
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -176,7 +309,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'search' => 'man'
+            'search' => "man",
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -190,7 +323,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'search' => $data['userId']
+            'search' => $data['userId'],
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -206,7 +339,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => 'unknown'
+            'queries' => ['cursorAfter("unknown")']
         ]);
 
         $this->assertEquals(400, $response['headers']['status-code']);
@@ -297,7 +430,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'search' => $newName
+            'search' => $newName,
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -310,7 +443,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'search' => $id
+            'search' => $id,
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -364,7 +497,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'search' => $newEmail
+            'search' => $newEmail,
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -377,7 +510,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'search' => $id
+            'search' => $id,
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -565,7 +698,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'offset' => 1
+            'queries' => ['offset(1)']
         ]);
 
         $this->assertEquals($logs['headers']['status-code'], 200);
@@ -576,8 +709,10 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'offset' => 1,
-            'limit' => 1
+            'queries' => [
+                'offset(1)',
+                'limit(1)',
+            ]
         ]);
 
         $this->assertEquals($logs['headers']['status-code'], 200);

From 27f69e3c09176ea7216ef4fbf01c6001dac0a59a Mon Sep 17 00:00:00 2001
From: Steven <stnguyen90@users.noreply.github.com>
Date: Fri, 19 Aug 2022 00:09:34 +0000
Subject: [PATCH 03/28] Consolidate List User Logs API params

Replace limit and offset params with a single queries param since the
Queries V2 change now allows for different types of queries.
---
 app/controllers/api/users.php                 |  13 ++-
 composer.json                                 |   5 +-
 composer.lock                                 |  20 ++--
 .../Validator/Queries/LimitOffsetQuery.php    |  58 +++++++++
 tests/e2e/Services/Users/UsersBase.php        | 110 +++++++++++++++---
 .../Queries/LimitOffsetQueryTest.php          |  63 ++++++++++
 6 files changed, 244 insertions(+), 25 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetQuery.php
 create mode 100644 tests/unit/Utopia/Database/Validator/Queries/LimitOffsetQueryTest.php

diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 71e6feb224..a708fe0e45 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -10,7 +10,9 @@ use Appwrite\Event\Audit as EventAudit;
 use Appwrite\Network\Validator\Email;
 use Appwrite\Stats\Stats;
 use Appwrite\Utopia\Database\Validator\CustomId;
+use Appwrite\Utopia\Database\Validator\Queries;
 use Appwrite\Utopia\Database\Validator\Queries\Users;
+use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetQuery;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Audit\Audit;
@@ -30,7 +32,6 @@ use Utopia\Database\Validator\Authorization;
 use Utopia\Validator\Assoc;
 use Utopia\Validator\WhiteList;
 use Utopia\Validator\Text;
-use Utopia\Validator\Range;
 use Utopia\Validator\Boolean;
 use MaxMind\Db\Reader;
 
@@ -306,14 +307,13 @@ App::get('/v1/users/:userId/logs')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_LOG_LIST)
     ->param('userId', '', new UID(), 'User ID.')
-    ->param('limit', 25, new Range(0, 100), 'Maximum number of logs to return in response. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
-    ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Offset value. The default value is 0. Use this value to manage pagination. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('queries', [], new Queries(new LimitOffsetQuery(), strict: false), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Only supported methods are limit and offset', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('locale')
     ->inject('geodb')
     ->inject('usage')
-    ->action(function (string $userId, int $limit, int $offset, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Stats $usage) {
+    ->action(function (string $userId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Stats $usage) {
 
         $user = $dbForProject->getDocument('users', $userId);
 
@@ -321,6 +321,11 @@ App::get('/v1/users/:userId/logs')
             throw new Exception(Exception::USER_NOT_FOUND);
         }
 
+        $queries = Query::parseQueries($queries);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+
         $audit = new Audit($dbForProject);
 
         $logs = $audit->getLogsByUser($user->getId(), $limit, $offset);
diff --git a/composer.json b/composer.json
index fee2f93c96..0aa9f510f2 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,7 @@
         "utopia-php/cache": "0.6.*",
         "utopia-php/cli": "0.13.*",
         "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.22.*",
+        "utopia-php/database": "0.23.0 as 0.22.0",
         "utopia-php/locale": "0.4.*",
         "utopia-php/registry": "0.5.*",
         "utopia-php/preloader": "0.2.*",
@@ -88,6 +88,9 @@
         "ext-phpiredis": "*"
     },
     "config": {
+        "optimize-autoloader": true,
+        "allow-plugins": false,
+        "preferred-install": "dist",
         "platform": {
             "php": "8.0"
         }
diff --git a/composer.lock b/composer.lock
index 2ce4203494..c4b157f5ec 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "175fe4abafd8bde4053b91eea905c328",
+    "content-hash": "1858c544a5b5ae59bc6ff146a375a683",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -2052,16 +2052,16 @@
         },
         {
             "name": "utopia-php/database",
-            "version": "0.22.0",
+            "version": "0.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/database.git",
-                "reference": "22c45ae83612e907203b7571cd8e3115ae3ae4c5"
+                "reference": "e4a23f8e26a3d96f292e549cebe0ff6937ec5d71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/22c45ae83612e907203b7571cd8e3115ae3ae4c5",
-                "reference": "22c45ae83612e907203b7571cd8e3115ae3ae4c5",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/e4a23f8e26a3d96f292e549cebe0ff6937ec5d71",
+                "reference": "e4a23f8e26a3d96f292e549cebe0ff6937ec5d71",
                 "shasum": ""
             },
             "require": {
@@ -2110,9 +2110,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/0.22.0"
+                "source": "https://github.com/utopia-php/database/tree/0.23.0"
             },
-            "time": "2022-08-17T12:55:37+00:00"
+            "time": "2022-08-18T19:08:33+00:00"
         },
         {
             "name": "utopia-php/domains",
@@ -5354,6 +5354,12 @@
             "version": "9999999-dev",
             "alias": "0.19.5",
             "alias_normalized": "0.19.5.0"
+        },
+        {
+            "package": "utopia-php/database",
+            "version": "0.23.0.0",
+            "alias": "0.22.0",
+            "alias_normalized": "0.22.0.0"
         }
     ],
     "minimum-stability": "stable",
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetQuery.php b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetQuery.php
new file mode 100644
index 0000000000..d22c610542
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetQuery.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Query as QueryValidator;
+
+class LimitOffsetQuery extends QueryValidator
+{
+    /**
+     * @var string
+     */
+    protected $message = 'Invalid query';
+
+    protected int $maxLimit;
+    protected int $maxOffset;
+
+    /**
+     * Query constructor
+     *
+     * @param int $maxLimit
+     * @param int $maxOffset
+     * @param int $maxValuesCount
+     */
+    public function __construct(int $maxLimit = 100, int $maxOffset = 5000)
+    {
+        $this->maxLimit = $maxLimit;
+        $this->maxOffset = $maxOffset;
+    }
+
+    /**
+     * Is valid.
+     *
+     * Returns true if method is limit or offset and values are within range.
+     * 
+     * @param Query $value
+     *
+     * @return bool
+     */
+    public function isValid($query): bool
+    {
+        // Validate method
+        $method = $query->getMethod();
+        switch ($method) {
+            case Query::TYPE_LIMIT:
+                $limit = $query->getValue();
+                return $this->isValidLimit($limit);
+
+            case Query::TYPE_OFFSET:
+                $offset = $query->getValue();
+                return $this->isValidOffset($offset);
+
+            default:
+                $this->message = 'Query method invalid: ' . $method;
+                return false;
+        }
+    }
+}
diff --git a/tests/e2e/Services/Users/UsersBase.php b/tests/e2e/Services/Users/UsersBase.php
index 1d3f7412a0..321f4f8e42 100644
--- a/tests/e2e/Services/Users/UsersBase.php
+++ b/tests/e2e/Services/Users/UsersBase.php
@@ -3,7 +3,6 @@
 namespace Tests\E2E\Services\Users;
 
 use Tests\E2E\Client;
-use Utopia\Database\Database;
 use Utopia\Database\ID;
 
 trait UsersBase
@@ -673,26 +672,44 @@ trait UsersBase
         /**
          * Test for SUCCESS
          */
-        $logs = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()));
+        $i = 0;
+        do {
+            $logs = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
+                'content-type' => 'application/json',
+                'x-appwrite-project' => $this->getProject()['$id'],
+            ], $this->getHeaders()));
+   
+            $i++;
+        } while ($logs['body']['total'] === 0 && $i < 1000);
 
         $this->assertEquals($logs['headers']['status-code'], 200);
-        $this->assertIsArray($logs['body']['logs']);
-        $this->assertIsNumeric($logs['body']['total']);
+        $this->assertCount(1, $logs['body']['logs']);
+        $this->assertEquals(1, $logs['body']['total']);
+        $this->assertIsArray($logs['body']['logs'][0]);
 
         $logs = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'limit' => 1
+            'queries' => ['limit(1)']
         ]);
 
         $this->assertEquals($logs['headers']['status-code'], 200);
         $this->assertIsArray($logs['body']['logs']);
-        $this->assertLessThanOrEqual(1, count($logs['body']['logs']));
-        $this->assertIsNumeric($logs['body']['total']);
+        $this->assertCount(1, $logs['body']['logs']);
+        $this->assertEquals(1, $logs['body']['total']);
+
+        $logs = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['limit(0)']
+        ]);
+
+        $this->assertEquals($logs['headers']['status-code'], 200);
+        $this->assertIsArray($logs['body']['logs']);
+        $this->assertCount(0, $logs['body']['logs']);
+        $this->assertEquals(1, $logs['body']['total']);
 
         $logs = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
             'content-type' => 'application/json',
@@ -703,7 +720,8 @@ trait UsersBase
 
         $this->assertEquals($logs['headers']['status-code'], 200);
         $this->assertIsArray($logs['body']['logs']);
-        $this->assertIsNumeric($logs['body']['total']);
+        $this->assertCount(0, $logs['body']['logs']);
+        $this->assertEquals(1, $logs['body']['total']);
 
         $logs = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
             'content-type' => 'application/json',
@@ -717,8 +735,74 @@ trait UsersBase
 
         $this->assertEquals($logs['headers']['status-code'], 200);
         $this->assertIsArray($logs['body']['logs']);
-        $this->assertLessThanOrEqual(1, count($logs['body']['logs']));
-        $this->assertIsNumeric($logs['body']['total']);
+        $this->assertCount(0, $logs['body']['logs']);
+        $this->assertEquals(1, $logs['body']['total']);
+
+        /**
+         * Test for FAILURE
+         */
+        $response = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['limit(-1)']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 400);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['limit(101)']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 400);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['offset(-1)']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 400);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['offset(5001)']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 400);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['equal("$id", "asdf")']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 400);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['orderAsc("$id")']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 400);
+
+        $response = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => ['cursorAsc("$id")']
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 400);
     }
 
     /**
diff --git a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetQueryTest.php b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetQueryTest.php
new file mode 100644
index 0000000000..d749dc7292
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetQueryTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries;
+use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetQuery;
+use Utopia\Database\Query;
+use PHPUnit\Framework\TestCase;
+
+class LimitOffsetQueryTest extends TestCase
+{
+    /**
+     * @var Key
+     */
+    protected $validator = null;
+
+    public function setUp(): void
+    {
+        $this->validator = new LimitOffsetQuery();
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testValue(): void
+    {
+        // Test for Success
+        $this->assertEquals($this->validator->isValid(Query::limit(1)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(0)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(100)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(1)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(0)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5000)), true, $this->validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($this->validator->isValid(Query::limit(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
+    }
+
+    public function testValues(): void
+    {
+
+        $validator = new Queries($this->validator, strict: false);
+    
+        // Test for Success
+        $this->assertEquals($validator->isValid(['limit(1)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(0)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(100)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(1)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(0)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(5000)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(25)', 'offset(25)']), true, $validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($validator->isValid(['limit(-1)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(101)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(-1)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(5001)']), false, $validator->getDescription());
+    }
+}

From 896f07fdd48d21c04aeb915ff6f4dcbdb7a27b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Fri, 19 Aug 2022 13:37:24 +0000
Subject: [PATCH 04/28] Upgrade versios to resolve missing methods

---
 composer.json |  6 +++---
 composer.lock | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/composer.json b/composer.json
index fee2f93c96..bb6a623e28 100644
--- a/composer.json
+++ b/composer.json
@@ -45,13 +45,13 @@
         "appwrite/php-runtimes": "0.10.*",
         "utopia-php/framework": "0.20.*",
         "utopia-php/logger": "0.3.*",
-        "utopia-php/abuse": "0.10.*",
+        "utopia-php/abuse": "0.11.*",
         "utopia-php/analytics": "0.2.*",
-        "utopia-php/audit": "0.11.*",
+        "utopia-php/audit": "0.12.*",
         "utopia-php/cache": "0.6.*",
         "utopia-php/cli": "0.13.*",
         "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.22.*",
+        "utopia-php/database": "0.23.*",
         "utopia-php/locale": "0.4.*",
         "utopia-php/registry": "0.5.*",
         "utopia-php/preloader": "0.2.*",
diff --git a/composer.lock b/composer.lock
index 2ce4203494..a3e6ac783a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "175fe4abafd8bde4053b91eea905c328",
+    "content-hash": "5d5b72c7940a8376e187cce1b33d327a",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -1733,23 +1733,23 @@
         },
         {
             "name": "utopia-php/abuse",
-            "version": "0.10.0",
+            "version": "0.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/abuse.git",
-                "reference": "b5beadce6581291e4385b0cc86f1be2a79bb2ef0"
+                "reference": "f1096b92a8c47b19b0c55096775c186cab0b0a97"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/b5beadce6581291e4385b0cc86f1be2a79bb2ef0",
-                "reference": "b5beadce6581291e4385b0cc86f1be2a79bb2ef0",
+                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/f1096b92a8c47b19b0c55096775c186cab0b0a97",
+                "reference": "f1096b92a8c47b19b0c55096775c186cab0b0a97",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "ext-pdo": "*",
                 "php": ">=8.0",
-                "utopia-php/database": "0.22.0"
+                "utopia-php/database": "0.23.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.4",
@@ -1781,9 +1781,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/abuse/issues",
-                "source": "https://github.com/utopia-php/abuse/tree/0.10.0"
+                "source": "https://github.com/utopia-php/abuse/tree/0.11.0"
             },
-            "time": "2022-08-17T14:31:54+00:00"
+            "time": "2022-08-19T08:47:17+00:00"
         },
         {
             "name": "utopia-php/analytics",
@@ -1842,22 +1842,22 @@
         },
         {
             "name": "utopia-php/audit",
-            "version": "0.11.0",
+            "version": "0.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/audit.git",
-                "reference": "a06f784f8e8b69bcae4f1a5bca58d41bda76c250"
+                "reference": "fe5d2372d9c7f0e1abcf85eaf59ebeaa6f572168"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/audit/zipball/a06f784f8e8b69bcae4f1a5bca58d41bda76c250",
-                "reference": "a06f784f8e8b69bcae4f1a5bca58d41bda76c250",
+                "url": "https://api.github.com/repos/utopia-php/audit/zipball/fe5d2372d9c7f0e1abcf85eaf59ebeaa6f572168",
+                "reference": "fe5d2372d9c7f0e1abcf85eaf59ebeaa6f572168",
                 "shasum": ""
             },
             "require": {
                 "ext-pdo": "*",
                 "php": ">=8.0",
-                "utopia-php/database": "0.22.0"
+                "utopia-php/database": "0.23.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.3",
@@ -1889,9 +1889,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/audit/issues",
-                "source": "https://github.com/utopia-php/audit/tree/0.11.0"
+                "source": "https://github.com/utopia-php/audit/tree/0.12.0"
             },
-            "time": "2022-08-17T15:08:58+00:00"
+            "time": "2022-08-19T08:47:16+00:00"
         },
         {
             "name": "utopia-php/cache",
@@ -2052,16 +2052,16 @@
         },
         {
             "name": "utopia-php/database",
-            "version": "0.22.0",
+            "version": "0.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/database.git",
-                "reference": "22c45ae83612e907203b7571cd8e3115ae3ae4c5"
+                "reference": "e4a23f8e26a3d96f292e549cebe0ff6937ec5d71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/22c45ae83612e907203b7571cd8e3115ae3ae4c5",
-                "reference": "22c45ae83612e907203b7571cd8e3115ae3ae4c5",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/e4a23f8e26a3d96f292e549cebe0ff6937ec5d71",
+                "reference": "e4a23f8e26a3d96f292e549cebe0ff6937ec5d71",
                 "shasum": ""
             },
             "require": {
@@ -2110,9 +2110,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/0.22.0"
+                "source": "https://github.com/utopia-php/database/tree/0.23.0"
             },
-            "time": "2022-08-17T12:55:37+00:00"
+            "time": "2022-08-18T19:08:33+00:00"
         },
         {
             "name": "utopia-php/domains",
@@ -2833,12 +2833,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "987f2933b97bd04f702ea08685f2be28a08a841c"
+                "reference": "1a67d9dcd2884a6a708176955f83e319ac53059e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/987f2933b97bd04f702ea08685f2be28a08a841c",
-                "reference": "987f2933b97bd04f702ea08685f2be28a08a841c",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/1a67d9dcd2884a6a708176955f83e319ac53059e",
+                "reference": "1a67d9dcd2884a6a708176955f83e319ac53059e",
                 "shasum": ""
             },
             "require": {
@@ -2876,7 +2876,7 @@
                 "issues": "https://github.com/appwrite/sdk-generator/issues",
                 "source": "https://github.com/appwrite/sdk-generator/tree/master"
             },
-            "time": "2022-08-17T12:50:44+00:00"
+            "time": "2022-08-19T10:03:22+00:00"
         },
         {
             "name": "doctrine/instantiator",

From f03510ef6baf273282202015daa4ad276fd1b714 Mon Sep 17 00:00:00 2001
From: Steven <stnguyen90@users.noreply.github.com>
Date: Fri, 19 Aug 2022 21:09:50 +0000
Subject: [PATCH 05/28] Fix test after merge

---
 tests/e2e/Services/Users/UsersBase.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/e2e/Services/Users/UsersBase.php b/tests/e2e/Services/Users/UsersBase.php
index 31519e2692..cc486c9656 100644
--- a/tests/e2e/Services/Users/UsersBase.php
+++ b/tests/e2e/Services/Users/UsersBase.php
@@ -417,7 +417,7 @@ trait UsersBase
         $this->assertEquals($response['headers']['status-code'], 200);
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['users']);
-        $this->assertCount(2, $response['body']['users']);
+        $this->assertCount($totalUsers, $response['body']['users']);
         $this->assertEquals($response['body']['users'][0]['$id'], $data['userId']);
         $this->assertEquals($response['body']['users'][0]['status'], $user1['status']);
         $this->assertEquals($response['body']['users'][1]['$id'], $user1['$id']);
@@ -471,7 +471,7 @@ trait UsersBase
         $this->assertEquals($response['headers']['status-code'], 200);
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['users']);
-        $this->assertCount(2, $response['body']['users']);
+        $this->assertCount($totalUsers, $response['body']['users']);
         $this->assertEquals($response['body']['users'][0]['$id'], $data['userId']);
         $this->assertEquals($response['body']['users'][0]['status'], $user1['status']);
         $this->assertEquals($response['body']['users'][1]['$id'], $user1['$id']);
@@ -498,8 +498,8 @@ trait UsersBase
 
         $this->assertEquals($response['headers']['status-code'], 200);
         $this->assertNotEmpty($response['body']);
-        $this->assertEmpty($response['body']['users']);
-        $this->assertCount(0, $response['body']['users']);
+        $this->assertIsArray($response['body']['users']);
+        $this->assertCount($totalUsers, $response['body']['users']);
 
         $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
             'content-type' => 'application/json',

From fe0b778facc0b8e610725058af78a99dd9fbf70f Mon Sep 17 00:00:00 2001
From: Steven <stnguyen90@users.noreply.github.com>
Date: Fri, 19 Aug 2022 21:10:15 +0000
Subject: [PATCH 06/28] Add indexes to users collection

---
 app/config/collections.php | 42 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/app/config/collections.php b/app/config/collections.php
index 5e71a3bf52..6f284000ac 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -1297,6 +1297,13 @@ $collections = [
             ]
         ],
         'indexes' => [
+            [
+                '$id' => ID::custom('_key_name'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['name'],
+                'lengths' => [256],
+                'orders' => [Database::ORDER_ASC],
+            ],
             [
                 '$id' => ID::custom('_key_email'),
                 'type' => Database::INDEX_UNIQUE,
@@ -1311,6 +1318,41 @@ $collections = [
                 'lengths' => [16],
                 'orders' => [Database::ORDER_ASC],
             ],
+            [
+                '$id' => ID::custom('_key_status'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['status'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_passwordUpdate'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['passwordUpdate'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_registration'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['registration'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_emailVerification'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['emailVerification'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_phoneVerification'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['phoneVerification'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
             [
                 '$id' => ID::custom('_key_search'),
                 'type' => Database::INDEX_FULLTEXT,

From 3890dea35b0fffd2097a5c2e7d85692943cbd825 Mon Sep 17 00:00:00 2001
From: Steven <stnguyen90@users.noreply.github.com>
Date: Fri, 19 Aug 2022 23:20:22 +0000
Subject: [PATCH 07/28] Add additional Validators for Queries

---
 app/controllers/api/users.php                 |   2 +-
 composer.json                                 |   3 -
 composer.lock                                 |  10 +-
 .../Database/Validator/IndexedQueries.php     | 151 ++++++++++++++++++
 .../Utopia/Database/Validator/Queries.php     | 103 ++++++++++--
 .../LimitOffsetCursorFilterOrderQuery.php     |  67 ++++++++
 .../Queries/LimitOffsetCursorFilterQuery.php  | 137 ++++++++++++++++
 .../Queries/LimitOffsetCursorQuery.php        |  64 ++++++++
 .../Validator/Queries/LimitOffsetQuery.php    |  65 +++++++-
 .../Database/Validator/Queries/Users.php      |   3 +
 .../LimitOffsetCursorFilterOrderQueryTest.php |  94 +++++++++++
 .../LimitOffsetCursorFilterQueryTest.php      |  88 ++++++++++
 .../Queries/LimitOffsetCursorQueryTest.php    |  74 +++++++++
 .../Queries/LimitOffsetQueryTest.php          |  17 +-
 14 files changed, 846 insertions(+), 32 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/IndexedQueries.php
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQuery.php
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQuery.php
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php
 create mode 100644 tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQueryTest.php
 create mode 100644 tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQueryTest.php
 create mode 100644 tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorQueryTest.php

diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 10526c835d..87a8959f91 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -574,7 +574,7 @@ App::get('/v1/users/:userId/logs')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_LOG_LIST)
     ->param('userId', '', new UID(), 'User ID.')
-    ->param('queries', [], new Queries(new LimitOffsetQuery(), strict: false), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries(new LimitOffsetQuery()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Only supported methods are limit and offset', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('locale')
diff --git a/composer.json b/composer.json
index 6b121ccea6..e90bca3182 100644
--- a/composer.json
+++ b/composer.json
@@ -88,9 +88,6 @@
         "ext-phpiredis": "*"
     },
     "config": {
-        "optimize-autoloader": true,
-        "allow-plugins": false,
-        "preferred-install": "dist",
         "platform": {
             "php": "8.0"
         }
diff --git a/composer.lock b/composer.lock
index 3c03182760..eb5849095e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5d5b72c7940a8376e187cce1b33d327a",
+    "content-hash": "0e850206a924d2a48861ecd290f59bc0",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -5354,12 +5354,6 @@
             "version": "9999999-dev",
             "alias": "0.19.5",
             "alias_normalized": "0.19.5.0"
-        },
-        {
-            "package": "utopia-php/database",
-            "version": "0.23.0.0",
-            "alias": "0.22.0",
-            "alias_normalized": "0.22.0.0"
         }
     ],
     "minimum-stability": "stable",
@@ -5389,5 +5383,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/src/Appwrite/Utopia/Database/Validator/IndexedQueries.php b/src/Appwrite/Utopia/Database/Validator/IndexedQueries.php
new file mode 100644
index 0000000000..2f9543aab7
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/IndexedQueries.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator;
+
+use Appwrite\Utopia\Database\Validator\Queries;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Query as QueryValidator;
+
+class IndexedQueries extends Queries
+{
+    /**
+     * @var Document[]
+     */
+    protected $attributes = [];
+
+    /**
+     * @var Document[]
+     */
+    protected $indexes = [];
+
+    /**
+     * Expression constructor
+     *
+     * This Queries Validator filters indexes for only available indexes
+     *
+     * @param QueryValidator $validator
+     * @param Document[] $attributes
+     * @param Document[] $indexes
+     * @param bool $strict
+     */
+    public function __construct($validator, $attributes = [], $indexes = [])
+    {
+        // Remove failed/stuck/processing indexes
+        $availableIndexes = \array_filter($indexes, function ($index) {
+            return $index->getAttribute('status') === 'available';
+        });
+
+        $this->attributes = $attributes;
+
+        $this->indexes[] = new Document([
+            'type' => Database::INDEX_UNIQUE,
+            'attributes' => ['$id']
+        ]);
+
+        $this->indexes[] = new Document([
+            'type' => Database::INDEX_KEY,
+            'attributes' => ['$createdAt']
+        ]);
+
+        $this->indexes[] = new Document([
+            'type' => Database::INDEX_KEY,
+            'attributes' => ['$updatedAt']
+        ]);
+
+        foreach ($indexes ?? [] as $index) {
+            $this->indexes[] = $index;
+        }
+
+        parent::__construct($validator);
+    }
+
+    /**
+     * Check if indexed array $indexes matches $queries
+     *
+     * @param array $indexes
+     * @param array $queries
+     *
+     * @return bool
+     */
+    protected function arrayMatch(array $indexes, array $queries): bool
+    {
+        // Check the count of indexes first for performance
+        if (count($queries) !== count($indexes)) {
+            return false;
+        }
+
+        // Sort them for comparison, the order is not important here anymore.
+        sort($indexes, SORT_STRING);
+        sort($queries, SORT_STRING);
+
+        // Only matching arrays will have equal diffs in both directions
+        if (array_diff_assoc($indexes, $queries) !== array_diff_assoc($queries, $indexes)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Is valid.
+     *
+     * Returns false if:
+     * 1. any query in $value is invalid based on $validator
+     * 2. there is no index with an exact match of the filters
+     * 3. there is no index with an exact match of the order attributes
+     *
+     * Otherwise, returns true.
+     *
+     * @param mixed $value
+     * @return bool
+     */
+    public function isValid($value): bool
+    {
+        if (!$this->isValid($value)) {
+            return false;
+        }
+
+        $queries = Query::parseQueries($value);
+        $grouped = Query::groupByType($queries);
+        /** @var Query[] */ $filters = $grouped['filters'];
+        /** @var string[] */ $orderAttributes = $grouped['orderAttributes'];
+
+        // Check filter queries for exact index match
+        if (count($filters) > 0) {
+            $filtersByAttribute = [];
+            foreach ($filters as $filter) {
+                $filtersByAttribute[$filter->getAttribute()] = $filter->getMethod();
+            }
+
+            $found = null;
+
+            foreach ($this->indexes as $index) {
+                if ($this->arrayMatch($index->getAttribute('attributes'), array_keys($filtersByAttribute))) {
+                    $found = $index;
+                }
+            }
+
+            if (!$found) {
+                $this->message = 'Index not found: ' . implode(",", array_keys($filtersByAttribute));
+                return false;
+            }
+
+            // search method requires fulltext index
+            if (in_array(Query::TYPE_SEARCH, array_values($filtersByAttribute)) && $found['type'] !== Database::INDEX_FULLTEXT) {
+                $this->message = 'Search method requires fulltext index: ' . implode(",", array_keys($filtersByAttribute));
+                return false;
+            }
+        }
+
+        // Check order attributes for exact index match
+        $validator = new OrderAttributes($this->attributes, $this->indexes, true);
+        if (count($orderAttributes) > 0 && !$validator->isValid($orderAttributes)) {
+            $this->message = $validator->getDescription();
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries.php b/src/Appwrite/Utopia/Database/Validator/Queries.php
index 8ea70231d5..cc675429e4 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries.php
@@ -2,28 +2,103 @@
 
 namespace Appwrite\Utopia\Database\Validator;
 
+use Utopia\Validator;
 use Utopia\Database\Document;
-use Utopia\Database\Validator\Queries as ValidatorQueries;
+use Utopia\Database\Validator\Query as QueryValidator;
+use Utopia\Database\Query;
 
-class Queries extends ValidatorQueries
+class Queries extends Validator
 {
     /**
-     * Expression constructor
+     * @var string
+     */
+    protected $message = 'Invalid queries';
+
+    /**
+     * @var QueryValidator
+     */
+    protected $validator;
+
+    /**
+     * Queries constructor
      *
-     * This Queries Validator that filters indexes for only available indexes
-     *
-     * @param QueryValidator $validator
-     * @param Document[] $attributes
-     * @param Document[] $indexes
+     * @param Validator $validator used to validate each query
+     * @param Document[] $attributes allowed attributes to be queried
+     * @param Document[] $indexes available for strict query matching
      * @param bool $strict
      */
-    public function __construct($validator, $attributes = [], $indexes = [], $strict = true)
+    public function __construct(Validator $validator)
     {
-        // Remove failed/stuck/processing indexes
-        $availableIndexes = \array_filter($indexes, function ($index) {
-            return $index->getAttribute('status') === 'available';
-        });
+        $this->validator = $validator;
+    }
 
-        parent::__construct($validator, $attributes, $availableIndexes, $strict);
+    /**
+     * Get Description.
+     *
+     * Returns validator description
+     *
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        return $this->message;
+    }
+
+    /**
+     * Is valid.
+     *
+     * Returns false if:
+     * 1. any query in $value is invalid based on $validator
+     *
+     * Otherwise, returns true.
+     *
+     * @param mixed $value
+     * @return bool
+     */
+    public function isValid($value): bool
+    {
+        $queries = [];
+        foreach ($value as $query) {
+            if (!$query instanceof Query) {
+                try {
+                    $query = Query::parse($query);
+                } catch (\Throwable $th) {
+                    $this->message = 'Invalid query: ${query}';
+                    return false;
+                }
+            }
+
+            if (!$this->validator->isValid($query)) {
+                $this->message = 'Query not valid: ' . $this->validator->getDescription();
+                return false;
+            }
+
+            $queries[] = $query;
+        }
+
+        return true;
+    }
+    /**
+     * Is array
+     *
+     * Function will return true if object is array.
+     *
+     * @return bool
+     */
+    public function isArray(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get Type
+     *
+     * Returns validator type.
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return self::TYPE_OBJECT;
     }
 }
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQuery.php b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQuery.php
new file mode 100644
index 0000000000..3a8459fa47
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQuery.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetCursorFilterQuery;
+use Utopia\Database\Query;
+
+class LimitOffsetCursorFilterOrderQuery extends LimitOffsetCursorFilterQuery
+{
+    /**
+     * @var string
+     */
+    protected $message = 'Invalid query';
+
+    /**
+     * @var array
+     */
+    protected $schema = [];
+
+    /**
+     * Query constructor
+     *
+     * @param int $maxLimit
+     * @param int $maxOffset
+     * @param int $maxValuesCount
+     */
+    public function __construct(int $maxLimit = 100, int $maxOffset = 5000, array $attributes = [], int $maxValuesCount = 100)
+    {
+        foreach ($attributes as $attribute) {
+            $this->schema[$attribute->getAttribute('key')] = $attribute->getArrayCopy();
+        }
+
+        $this->maxValuesCount = $maxValuesCount;
+
+        parent::__construct($maxLimit, $maxOffset);
+    }
+
+    /**
+     * Is valid.
+     *
+     * Returns true if:
+     * 1. method is limit or offset and values are within range
+     * 2. method is cursorBefore or cursorAfter and value is not null
+     * 3. method is a filter method, attribute exists, and value matches attribute type
+     * 4. method is orderAsc or orderDesc and attribute exists or is empty string
+     *
+     * Otherwise, returns false
+     *
+     * @param Query $value
+     *
+     * @return bool
+     */
+    public function isValid($query): bool
+    {
+        $method = $query->getMethod();
+        $attribute = $query->getAttribute();
+
+        if ($method === Query::TYPE_ORDERASC || $method === Query::TYPE_ORDERDESC) {
+            if ($attribute === '') {
+                return true;
+            }
+            return $this->isValidAttribute($attribute);
+        }
+
+        return parent::isValid($query);
+    }
+}
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQuery.php b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQuery.php
new file mode 100644
index 0000000000..71da608709
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQuery.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetCursorQuery;
+use Utopia\Database\Database;
+use Utopia\Database\Query;
+
+class LimitOffsetCursorFilterQuery extends LimitOffsetCursorQuery
+{
+    /**
+     * @var string
+     */
+    protected $message = 'Invalid query';
+
+    /**
+     * @var array
+     */
+    protected $schema = [];
+
+    /**
+     * Query constructor
+     *
+     * @param int $maxLimit
+     * @param int $maxOffset
+     * @param int $maxValuesCount
+     */
+    public function __construct(int $maxLimit = 100, int $maxOffset = 5000, array $attributes = [], int $maxValuesCount = 100)
+    {
+        foreach ($attributes as $attribute) {
+            $this->schema[$attribute->getAttribute('key')] = $attribute->getArrayCopy();
+        }
+
+        $this->maxValuesCount = $maxValuesCount;
+
+        parent::__construct($maxLimit, $maxOffset);
+    }
+
+    protected function isValidAttribute($attribute): bool
+    {
+        // Search for attribute in schema
+        if (!isset($this->schema[$attribute])) {
+            $this->message = 'Attribute not found in schema: ' . $attribute;
+            return false;
+        }
+
+        return true;
+    }
+
+    protected function isValidAttributeAndValues(string $attribute, array $values): bool
+    {
+        if (!$this->isValidAttribute($attribute)) {
+            return false;
+        }
+
+        $attributeSchema = $this->schema[$attribute];
+
+        if (count($values) > $this->maxValuesCount) {
+            $this->message = 'Query on attribute has greater than ' . $this->maxValuesCount . ' values: ' . $attribute;
+            return false;
+        }
+
+        // Extract the type of desired attribute from collection $schema
+        $attributeType = $attributeSchema['type'];
+
+        foreach ($values as $value) {
+            $condition = match ($attributeType) {
+                Database::VAR_DATETIME => gettype($value) === Database::VAR_STRING,
+                default => gettype($value) === $attributeType
+            };
+
+            if (!$condition) {
+                $this->message = 'Query type does not match expected: ' . $attributeType;
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    protected function isValidContains(string $attribute, array $values): bool
+    {
+        if (!$this->isValidAttributeAndValues($attribute, $values)) {
+            return false;
+        }
+
+        $attributeSchema = $this->schema[$attribute];
+
+        // Contains method only supports array attributes
+        if (!$attributeSchema['array']) {
+            $this->message = 'Query method only supported on array attributes: ' . Query::TYPE_CONTAINS;
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Is valid.
+     *
+     * Returns true if:
+     * 1. method is limit or offset and values are within range
+     * 2. method is cursorBefore or cursorAfter and value is not null
+     * 3. method is a filter method, attribute exists, and value matches attribute type
+     *
+     * Otherwise, returns false
+     *
+     * @param Query $value
+     *
+     * @return bool
+     */
+    public function isValid($query): bool
+    {
+        // Validate method
+        $method = $query->getMethod();
+        $attribute = $query->getAttribute();
+
+        switch ($method) {
+            case Query::TYPE_CONTAINS:
+                $values = $query->getValues();
+                return $this->isValidContains($attribute, $values);
+
+            case Query::TYPE_EQUAL:
+            case Query::TYPE_NOTEQUAL:
+            case Query::TYPE_LESSER:
+            case Query::TYPE_LESSEREQUAL:
+            case Query::TYPE_GREATER:
+            case Query::TYPE_GREATEREQUAL:
+            case Query::TYPE_SEARCH:
+                $values = $query->getValues();
+                return $this->isValidAttributeAndValues($attribute, $values);
+
+            default:
+                return parent::isValid($query);
+        }
+    }
+}
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php
new file mode 100644
index 0000000000..fb45aaf2e1
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Utopia\Database\Query;
+use Utopia\Database\Validator\UID;
+
+class LimitOffsetCursorQuery extends LimitOffsetQuery
+{
+    /**
+     * @var string
+     */
+    protected $message = 'Invalid query';
+
+    /**
+     * Query constructor
+     *
+     * @param int $maxLimit
+     * @param int $maxOffset
+     * @param int $maxValuesCount
+     */
+    public function __construct(int $maxLimit = 100, int $maxOffset = 5000)
+    {
+        parent::__construct($maxLimit, $maxOffset);
+    }
+
+    protected function isValidCursor($cursor): bool
+    {
+        $validator = new UID();
+
+        if ($validator->isValid($cursor)) {
+            return true;
+        }
+
+        $this->message = 'Invalid cursor: ' . $validator->getDescription();
+        return false;
+    }
+
+    /**
+     * Is valid.
+     *
+     * Returns true if:
+     * 1. method is limit or offset and values are within range
+     * 2. method is cursorBefore or cursorAfter and value is not null.
+     *
+     * Otherwise, returns false
+     * 
+     * @param Query $value
+     *
+     * @return bool
+     */
+    public function isValid($query): bool
+    {
+        // Validate method
+        $method = $query->getMethod();
+
+        if ($method === Query::TYPE_CURSORAFTER || $method === Query::TYPE_CURSORBEFORE) {
+            $cursor = $query->getValue();
+            return $this->isValidCursor($cursor);
+        }
+
+        return parent::isValid($query);
+    }
+}
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetQuery.php b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetQuery.php
index d22c610542..e11590757e 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetQuery.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetQuery.php
@@ -3,9 +3,10 @@
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
 use Utopia\Database\Query;
-use Utopia\Database\Validator\Query as QueryValidator;
+use Utopia\Validator\Range;
+use Utopia\Validator;
 
-class LimitOffsetQuery extends QueryValidator
+class LimitOffsetQuery extends Validator
 {
     /**
      * @var string
@@ -28,11 +29,45 @@ class LimitOffsetQuery extends QueryValidator
         $this->maxOffset = $maxOffset;
     }
 
+    /**
+     * Get Description.
+     *
+     * Returns validator description
+     *
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        return $this->message;
+    }
+
+    protected function isValidLimit($limit): bool
+    {
+        $validator = new Range(0, $this->maxLimit);
+        if ($validator->isValid($limit)) {
+            return true;
+        }
+
+        $this->message = 'Invalid limit: ' . $validator->getDescription();
+        return false;
+    }
+
+    protected function isValidOffset($offset): bool
+    {
+        $validator = new Range(0, $this->maxOffset);
+        if ($validator->isValid($offset)) {
+            return true;
+        }
+
+        $this->message = 'Invalid offset: ' . $validator->getDescription();
+        return false;
+    }
+
     /**
      * Is valid.
      *
      * Returns true if method is limit or offset and values are within range.
-     * 
+     *
      * @param Query $value
      *
      * @return bool
@@ -55,4 +90,28 @@ class LimitOffsetQuery extends QueryValidator
                 return false;
         }
     }
+
+    /**
+     * Is array
+     *
+     * Function will return true if object is array.
+     *
+     * @return bool
+     */
+    public function isArray(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Get Type
+     *
+     * Returns validator type.
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return self::TYPE_OBJECT;
+    }
 }
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
index fcef3f9928..59373c2cab 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
@@ -7,6 +7,9 @@ use Appwrite\Utopia\Database\Validator\Queries\Collection;
 class Users extends Collection
 {
     public const ALLOWED_ATTRIBUTES = [
+        '$id',
+        '$createdAt',
+        '$updatedAt',
         'name',
         'email',
         'phone',
diff --git a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQueryTest.php b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQueryTest.php
new file mode 100644
index 0000000000..c46911b30e
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQueryTest.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries;
+use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetCursorFilterOrderQuery;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
+use Utopia\Validator;
+use PHPUnit\Framework\TestCase;
+
+class LimitOffsetCursorFilterOrderQueryTest extends TestCase
+{
+    /**
+     * @var Validator
+     */
+    protected $validator = null;
+
+    public function setUp(): void
+    {
+        $this->validator = new LimitOffsetCursorFilterOrderQuery(
+            attributes: [
+                new Document([
+                    'key' => 'attr',
+                    'type' => Database::VAR_STRING,
+                    'array' => false,
+                ]),
+            ],
+        );
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testValue(): void
+    {
+        // Test for Success
+        $this->assertEquals($this->validator->isValid(Query::limit(1)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(0)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(100)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(1)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(0)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5000)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORAFTER, values: ['asdf'])), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: ['asdf'])), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('attr', ['v'])), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderAsc('attr')), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderAsc('')), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderDesc('attr')), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderDesc('')), true, $this->validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($this->validator->isValid(Query::limit(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('dne', ['v'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('', ['v'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderDesc('dne')), false, $this->validator->getDescription());
+    }
+
+    public function testValues(): void
+    {
+
+        $validator = new Queries($this->validator);
+
+        // Test for Success
+        $this->assertEquals($validator->isValid(['limit(1)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(0)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(100)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(1)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(0)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(5000)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(25)', 'offset(25)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['cursorAfter("asdf")']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['cursorBefore("asdf")']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['equal("attr", "v")']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['orderAsc("attr")']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['orderAsc("")']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['orderDesc("attr")']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['orderDesc("")']), true, $validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($validator->isValid(['limit(-1)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(101)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(-1)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(5001)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['equal("dne", "v")']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['equal("", "v")']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['orderDesc("dne")']), false, $validator->getDescription());
+    }
+}
diff --git a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQueryTest.php b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQueryTest.php
new file mode 100644
index 0000000000..1ae43ae37f
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQueryTest.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries;
+use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetCursorFilterQuery;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
+use Utopia\Validator;
+use PHPUnit\Framework\TestCase;
+
+class LimitOffsetCursorFilterQueryTest extends TestCase
+{
+    /**
+     * @var Validator
+     */
+    protected $validator = null;
+
+    public function setUp(): void
+    {
+        $this->validator = new LimitOffsetCursorFilterQuery(
+            attributes: [
+                new Document([
+                    'key' => 'attr',
+                    'type' => Database::VAR_STRING,
+                    'array' => false,
+                ]),
+            ],
+        );
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testValue(): void
+    {
+        // Test for Success
+        $this->assertEquals($this->validator->isValid(Query::limit(1)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(0)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(100)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(1)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(0)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5000)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORAFTER, values: ['asdf'])), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: ['asdf'])), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('attr', ['v'])), true, $this->validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($this->validator->isValid(Query::limit(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderAsc('attr')), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderDesc('attr')), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('dne', ['v'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('', ['v'])), false, $this->validator->getDescription());
+    }
+
+    public function testValues(): void
+    {
+
+        $validator = new Queries($this->validator);
+
+        // Test for Success
+        $this->assertEquals($validator->isValid(['limit(1)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(0)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(100)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(1)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(0)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(5000)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(25)', 'offset(25)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['cursorAfter("asdf")']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['cursorBefore("asdf")']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['equal("attr", "v")']), true, $validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($validator->isValid(['limit(-1)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(101)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(-1)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(5001)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['orderAsc("attr")']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['orderDesc("attr")']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['equal("dne", "v")']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['equal("", "v")']), false, $validator->getDescription());
+    }
+}
diff --git a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorQueryTest.php b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorQueryTest.php
new file mode 100644
index 0000000000..77e6a1e257
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorQueryTest.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries;
+use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetCursorQuery;
+use Utopia\Database\Query;
+use Utopia\Validator;
+use PHPUnit\Framework\TestCase;
+
+class LimitOffsetCursorQueryTest extends TestCase
+{
+    /**
+     * @var Validator
+     */
+    protected $validator = null;
+
+    public function setUp(): void
+    {
+        $this->validator = new LimitOffsetCursorQuery();
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testValue(): void
+    {
+        // Test for Success
+        $this->assertEquals($this->validator->isValid(Query::limit(1)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(0)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(100)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(1)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(0)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5000)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORAFTER, values: ['asdf'])), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: ['asdf'])), true, $this->validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($this->validator->isValid(Query::limit(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('attr', ['v'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderAsc('attr')), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderDesc('attr')), false, $this->validator->getDescription());
+    }
+
+    public function testValues(): void
+    {
+
+        $validator = new Queries($this->validator);
+
+        // Test for Success
+        $this->assertEquals($validator->isValid(['limit(1)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(0)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(100)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(1)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(0)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(5000)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(25)', 'offset(25)']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['cursorAfter("asdf")']), true, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['cursorBefore("asdf")']), true, $validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($validator->isValid(['limit(-1)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['limit(101)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(-1)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['offset(5001)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['equal("attr", "v")']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['orderAsc("attr")']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['orderDesc("attr")']), false, $validator->getDescription());
+    }
+}
diff --git a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetQueryTest.php b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetQueryTest.php
index d749dc7292..724a1e5939 100644
--- a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetQueryTest.php
+++ b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetQueryTest.php
@@ -5,12 +5,13 @@ namespace Tests\Unit\Utopia\Database\Validator\Queries;
 use Appwrite\Utopia\Database\Validator\Queries;
 use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetQuery;
 use Utopia\Database\Query;
+use Utopia\Validator;
 use PHPUnit\Framework\TestCase;
 
 class LimitOffsetQueryTest extends TestCase
 {
     /**
-     * @var Key
+     * @var Validator
      */
     protected $validator = null;
 
@@ -38,13 +39,18 @@ class LimitOffsetQueryTest extends TestCase
         $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
         $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
         $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORAFTER, values: ['asdf'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: ['asdf'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('attr', ['v'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderAsc('attr')), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderDesc('attr')), false, $this->validator->getDescription());
     }
 
     public function testValues(): void
     {
 
-        $validator = new Queries($this->validator, strict: false);
-    
+        $validator = new Queries($this->validator);
+
         // Test for Success
         $this->assertEquals($validator->isValid(['limit(1)']), true, $validator->getDescription());
         $this->assertEquals($validator->isValid(['limit(0)']), true, $validator->getDescription());
@@ -59,5 +65,10 @@ class LimitOffsetQueryTest extends TestCase
         $this->assertEquals($validator->isValid(['limit(101)']), false, $validator->getDescription());
         $this->assertEquals($validator->isValid(['offset(-1)']), false, $validator->getDescription());
         $this->assertEquals($validator->isValid(['offset(5001)']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['cursorAfter("asdf")']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['cursorBefore("asdf")']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['equal("attr", "v")']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['orderAsc("attr")']), false, $validator->getDescription());
+        $this->assertEquals($validator->isValid(['orderDesc("attr")']), false, $validator->getDescription());
     }
 }

From 146cb6a0d8694ae8ff7b9ecdd776425642fd0cba Mon Sep 17 00:00:00 2001
From: Steven <stnguyen90@users.noreply.github.com>
Date: Fri, 19 Aug 2022 23:31:02 +0000
Subject: [PATCH 08/28] Fix list user logs tests

---
 .../Queries/LimitOffsetCursorQuery.php        |  2 +-
 tests/e2e/Services/Users/UsersBase.php        | 51 ++++++-------------
 2 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php
index fb45aaf2e1..57f7370a54 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php
@@ -41,7 +41,7 @@ class LimitOffsetCursorQuery extends LimitOffsetQuery
      *
      * Returns true if:
      * 1. method is limit or offset and values are within range
-     * 2. method is cursorBefore or cursorAfter and value is not null.
+     * 2. method is cursorBefore or cursorAfter and value is not null
      *
      * Otherwise, returns false
      * 
diff --git a/tests/e2e/Services/Users/UsersBase.php b/tests/e2e/Services/Users/UsersBase.php
index dcbeb389ca..f2e498366b 100644
--- a/tests/e2e/Services/Users/UsersBase.php
+++ b/tests/e2e/Services/Users/UsersBase.php
@@ -971,71 +971,50 @@ trait UsersBase
         /**
          * Test for SUCCESS
          */
-        $i = 0;
-        do {
-            $logs = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
-                'content-type' => 'application/json',
-                'x-appwrite-project' => $this->getProject()['$id'],
-            ], $this->getHeaders()));
-   
-            $i++;
-        } while ($logs['body']['total'] === 0 && $i < 1000);
+        $logs = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()));
 
         $this->assertEquals($logs['headers']['status-code'], 200);
-        $this->assertCount(1, $logs['body']['logs']);
-        $this->assertEquals(1, $logs['body']['total']);
-        $this->assertIsArray($logs['body']['logs'][0]);
+        $this->assertIsArray($logs['body']['logs']);
+        $this->assertIsNumeric($logs['body']['total']);
 
         $logs = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => ['limit(1)']
+            'limit' => 1
         ]);
 
         $this->assertEquals($logs['headers']['status-code'], 200);
         $this->assertIsArray($logs['body']['logs']);
-        $this->assertCount(1, $logs['body']['logs']);
-        $this->assertEquals(1, $logs['body']['total']);
+        $this->assertLessThanOrEqual(1, count($logs['body']['logs']));
+        $this->assertIsNumeric($logs['body']['total']);
 
         $logs = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => ['limit(0)']
+            'offset' => 1
         ]);
 
         $this->assertEquals($logs['headers']['status-code'], 200);
         $this->assertIsArray($logs['body']['logs']);
-        $this->assertCount(0, $logs['body']['logs']);
-        $this->assertEquals(1, $logs['body']['total']);
+        $this->assertIsNumeric($logs['body']['total']);
 
         $logs = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => ['offset(1)']
+            'offset' => 1,
+            'limit' => 1
         ]);
 
         $this->assertEquals($logs['headers']['status-code'], 200);
         $this->assertIsArray($logs['body']['logs']);
-        $this->assertCount(0, $logs['body']['logs']);
-        $this->assertEquals(1, $logs['body']['total']);
-
-        $logs = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'] . '/logs', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'queries' => [
-                'offset(1)',
-                'limit(1)',
-            ]
-        ]);
-
-        $this->assertEquals($logs['headers']['status-code'], 200);
-        $this->assertIsArray($logs['body']['logs']);
-        $this->assertCount(0, $logs['body']['logs']);
-        $this->assertEquals(1, $logs['body']['total']);
+        $this->assertLessThanOrEqual(1, count($logs['body']['logs']));
+        $this->assertIsNumeric($logs['body']['total']);
 
         /**
          * Test for FAILURE

From 2bde7aa02b0ee2c3e9aeb4add65c619edf1223ee Mon Sep 17 00:00:00 2001
From: Steven <stnguyen90@users.noreply.github.com>
Date: Sat, 20 Aug 2022 00:15:18 +0000
Subject: [PATCH 09/28] Fix databases tests

---
 app/controllers/api/databases.php                    |  7 +++----
 .../Utopia/Database/Validator/IndexedQueries.php     | 12 ++++++++++--
 .../Validator/Queries/LimitOffsetCursorQuery.php     |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index f1f3356ff1..48246646b1 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -25,7 +25,6 @@ use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Key;
 use Utopia\Database\Validator\Permissions;
-use Utopia\Database\Validator\Query as QueryValidator;
 use Utopia\Database\Validator\Structure;
 use Utopia\Database\Validator\UID;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
@@ -38,8 +37,8 @@ use Appwrite\Network\Validator\Email;
 use Appwrite\Network\Validator\IP;
 use Appwrite\Network\Validator\URL;
 use Appwrite\Utopia\Database\Validator\CustomId;
-use Appwrite\Utopia\Database\Validator\Queries as QueriesValidator;
-use Appwrite\Utopia\Database\Validator\OrderAttributes;
+use Appwrite\Utopia\Database\Validator\IndexedQueries;
+use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetCursorFilterOrderQuery;
 use Appwrite\Utopia\Response;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Database as EventDatabase;
@@ -2062,7 +2061,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
 
         if (!empty($allQueries)) {
             $attributes = $collection->getAttribute('attributes', []);
-            $validator = new QueriesValidator(new QueryValidator($attributes), $attributes, $collection->getAttribute('indexes', []), true);
+            $validator = new IndexedQueries(new LimitOffsetCursorFilterOrderQuery(attributes: $attributes), $attributes, $collection->getAttribute('indexes', []));
             if (!$validator->isValid($allQueries)) {
                 throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
             }
diff --git a/src/Appwrite/Utopia/Database/Validator/IndexedQueries.php b/src/Appwrite/Utopia/Database/Validator/IndexedQueries.php
index 2f9543aab7..f1f3e62eb9 100644
--- a/src/Appwrite/Utopia/Database/Validator/IndexedQueries.php
+++ b/src/Appwrite/Utopia/Database/Validator/IndexedQueries.php
@@ -103,11 +103,19 @@ class IndexedQueries extends Queries
      */
     public function isValid($value): bool
     {
-        if (!$this->isValid($value)) {
+        if (!parent::isValid($value)) {
             return false;
         }
 
-        $queries = Query::parseQueries($value);
+        $queries = [];
+        foreach ($value as $query) {
+            if (!$query instanceof Query) {
+                $query = Query::parse($query);
+            }
+
+            $queries[] = $query;
+        }
+
         $grouped = Query::groupByType($queries);
         /** @var Query[] */ $filters = $grouped['filters'];
         /** @var string[] */ $orderAttributes = $grouped['orderAttributes'];
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php
index 57f7370a54..f74d41474c 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php
@@ -44,7 +44,7 @@ class LimitOffsetCursorQuery extends LimitOffsetQuery
      * 2. method is cursorBefore or cursorAfter and value is not null
      *
      * Otherwise, returns false
-     * 
+     *
      * @param Query $value
      *
      * @return bool

From e70eb61717412cdb17f6da00ba48dac8957cb6a7 Mon Sep 17 00:00:00 2001
From: Steven <stnguyen90@users.noreply.github.com>
Date: Sat, 20 Aug 2022 00:47:10 +0000
Subject: [PATCH 10/28] Fix bug with list documents and new queries

---
 app/controllers/api/databases.php | 41 ++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 48246646b1..7efd9fac8e 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -2027,15 +2027,34 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
             throw new Exception(Exception::USER_UNAUTHORIZED);
         }
 
-        $filterQueries = \array_map(function ($query) {
-            $query = Query::parse($query);
-
-            if (\count($query->getValues()) > 100) {
-                throw new Exception(Exception::GENERAL_QUERY_LIMIT_EXCEEDED, "You cannot use more than 100 query values on attribute '{$query->getAttribute()}'");
+        if (!empty($queries)) {
+            $attributes = array_merge(
+                $collection->getAttribute('attributes', []),
+                [
+                    new Document([
+                        'key' => '$id',
+                        'type' => Database::VAR_STRING,
+                        'array' => false,
+                    ]),
+                    new Document([
+                        'key' => '$createdAt',
+                        'type' => Database::VAR_DATETIME,
+                        'array' => false,
+                    ]),
+                    new Document([
+                        'key' => '$updatedAt',
+                        'type' => Database::VAR_DATETIME,
+                        'array' => false,
+                    ]),
+                ]
+            );
+            $validator = new IndexedQueries(new LimitOffsetCursorFilterOrderQuery(attributes: $attributes), $attributes, $collection->getAttribute('indexes', []));
+            if (!$validator->isValid($queries)) {
+                throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
             }
+        }
 
-            return $query;
-        }, $queries);
+        $filterQueries = Query::parseQueries($queries);
 
         $otherQueries = [];
         $otherQueries[] = Query::limit($limit);
@@ -2059,14 +2078,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
 
         $allQueries = \array_merge($filterQueries, $otherQueries);
 
-        if (!empty($allQueries)) {
-            $attributes = $collection->getAttribute('attributes', []);
-            $validator = new IndexedQueries(new LimitOffsetCursorFilterOrderQuery(attributes: $attributes), $attributes, $collection->getAttribute('indexes', []));
-            if (!$validator->isValid($allQueries)) {
-                throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
-            }
-        }
-
         if ($documentSecurity) {
             $documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $allQueries);
             $total = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $filterQueries, APP_LIMIT_COUNT);

From b2b714f71315bc877285f8f7b89182e5c33914b8 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Mon, 22 Aug 2022 13:48:35 +0000
Subject: [PATCH 11/28] feat: update naming convention and folder structure

---
 composer.lock                                 | 16 +--
 .../Validator/{Queries => }/Collection.php    |  0
 .../Queries/LimitOffsetCursorQuery.php        | 64 ------------
 .../Utopia/Database/Validator/Query.php       | 21 ----
 .../Database/Validator/Query/Cursor.php       | 44 +++++++++
 .../Filter.php}                               | 43 ++------
 .../Utopia/Database/Validator/Query/Limit.php | 97 +++++++++++++++++++
 .../LimitOffsetQuery.php => Query/Offset.php} | 42 +++-----
 .../Order.php}                                | 28 +++---
 .../Validator/{Queries => }/Users.php         |  0
 10 files changed, 184 insertions(+), 171 deletions(-)
 rename src/Appwrite/Utopia/Database/Validator/{Queries => }/Collection.php (100%)
 delete mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php
 delete mode 100644 src/Appwrite/Utopia/Database/Validator/Query.php
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Query/Cursor.php
 rename src/Appwrite/Utopia/Database/Validator/{Queries/LimitOffsetCursorFilterQuery.php => Query/Filter.php} (65%)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Query/Limit.php
 rename src/Appwrite/Utopia/Database/Validator/{Queries/LimitOffsetQuery.php => Query/Offset.php} (56%)
 rename src/Appwrite/Utopia/Database/Validator/{Queries/LimitOffsetCursorFilterOrderQuery.php => Query/Order.php} (52%)
 rename src/Appwrite/Utopia/Database/Validator/{Queries => }/Users.php (100%)

diff --git a/composer.lock b/composer.lock
index eb5849095e..b9176fe53e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3526,23 +3526,23 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.15",
+            "version": "9.2.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
+                "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2593003befdcc10db5e213f9f28814f5aa8ac073",
+                "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.13.0",
+                "nikic/php-parser": "^4.14",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -3591,7 +3591,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.16"
             },
             "funding": [
                 {
@@ -3599,7 +3599,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-07T09:28:20+00:00"
+            "time": "2022-08-20T05:26:47+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -5383,5 +5383,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php b/src/Appwrite/Utopia/Database/Validator/Collection.php
similarity index 100%
rename from src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
rename to src/Appwrite/Utopia/Database/Validator/Collection.php
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php b/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php
deleted file mode 100644
index f74d41474c..0000000000
--- a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorQuery.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Appwrite\Utopia\Database\Validator\Queries;
-
-use Utopia\Database\Query;
-use Utopia\Database\Validator\UID;
-
-class LimitOffsetCursorQuery extends LimitOffsetQuery
-{
-    /**
-     * @var string
-     */
-    protected $message = 'Invalid query';
-
-    /**
-     * Query constructor
-     *
-     * @param int $maxLimit
-     * @param int $maxOffset
-     * @param int $maxValuesCount
-     */
-    public function __construct(int $maxLimit = 100, int $maxOffset = 5000)
-    {
-        parent::__construct($maxLimit, $maxOffset);
-    }
-
-    protected function isValidCursor($cursor): bool
-    {
-        $validator = new UID();
-
-        if ($validator->isValid($cursor)) {
-            return true;
-        }
-
-        $this->message = 'Invalid cursor: ' . $validator->getDescription();
-        return false;
-    }
-
-    /**
-     * Is valid.
-     *
-     * Returns true if:
-     * 1. method is limit or offset and values are within range
-     * 2. method is cursorBefore or cursorAfter and value is not null
-     *
-     * Otherwise, returns false
-     *
-     * @param Query $value
-     *
-     * @return bool
-     */
-    public function isValid($query): bool
-    {
-        // Validate method
-        $method = $query->getMethod();
-
-        if ($method === Query::TYPE_CURSORAFTER || $method === Query::TYPE_CURSORBEFORE) {
-            $cursor = $query->getValue();
-            return $this->isValidCursor($cursor);
-        }
-
-        return parent::isValid($query);
-    }
-}
diff --git a/src/Appwrite/Utopia/Database/Validator/Query.php b/src/Appwrite/Utopia/Database/Validator/Query.php
deleted file mode 100644
index eeb5b51a76..0000000000
--- a/src/Appwrite/Utopia/Database/Validator/Query.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Appwrite\Utopia\Database\Validator;
-
-use Utopia\Database\Validator\UID;
-use Utopia\Database\Validator\Query as QueryValidator;
-
-class Query extends QueryValidator
-{
-    protected function isValidCursor($cursor): bool
-    {
-        $validator = new UID();
-
-        if ($validator->isValid($cursor)) {
-            return true;
-        }
-
-        $this->message = 'Invalid cursor: ' . $validator->getDescription();
-        return false;
-    }
-}
diff --git a/src/Appwrite/Utopia/Database/Validator/Query/Cursor.php b/src/Appwrite/Utopia/Database/Validator/Query/Cursor.php
new file mode 100644
index 0000000000..0fb77ee0b6
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Cursor.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Query;
+
+use Utopia\Validator;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\UID;
+
+class Cursor extends Validator
+{
+    /**
+     * @var string
+     */
+    protected $message = 'Invalid query';
+
+    /**
+     * Is valid.
+     *
+     * Returns true if method is cursorBefore or cursorAfter and value is not null
+     *
+     * Otherwise, returns false
+     *
+     * @param Query $value
+     *
+     * @return bool
+     */
+    public function isValid($query): bool
+    {
+        // Validate method
+        $method = $query->getMethod();
+
+        if ($method === Query::TYPE_CURSORAFTER || $method === Query::TYPE_CURSORBEFORE) {
+            $cursor = $query->getValue();
+            $validator = new UID();
+            if ($validator->isValid($cursor)) {
+                return true;
+            }
+            $this->message = 'Invalid cursor: ' . $validator->getDescription();
+            return false;
+        }
+
+        return false;
+    }
+}
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQuery.php b/src/Appwrite/Utopia/Database/Validator/Query/Filter.php
similarity index 65%
rename from src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQuery.php
rename to src/Appwrite/Utopia/Database/Validator/Query/Filter.php
index 71da608709..e32b3aab66 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQuery.php
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Filter.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Appwrite\Utopia\Database\Validator\Queries;
+namespace Appwrite\Utopia\Database\Validator\Query;
 
-use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetCursorQuery;
+use Utopia\Validator;
 use Utopia\Database\Database;
 use Utopia\Database\Query;
 
-class LimitOffsetCursorFilterQuery extends LimitOffsetCursorQuery
+class Filter extends Validator
 {
     /**
      * @var string
@@ -21,19 +21,15 @@ class LimitOffsetCursorFilterQuery extends LimitOffsetCursorQuery
     /**
      * Query constructor
      *
-     * @param int $maxLimit
-     * @param int $maxOffset
      * @param int $maxValuesCount
      */
-    public function __construct(int $maxLimit = 100, int $maxOffset = 5000, array $attributes = [], int $maxValuesCount = 100)
+    public function __construct(array $attributes = [], int $maxValuesCount = 100)
     {
         foreach ($attributes as $attribute) {
             $this->schema[$attribute->getAttribute('key')] = $attribute->getArrayCopy();
         }
 
         $this->maxValuesCount = $maxValuesCount;
-
-        parent::__construct($maxLimit, $maxOffset);
     }
 
     protected function isValidAttribute($attribute): bool
@@ -78,30 +74,10 @@ class LimitOffsetCursorFilterQuery extends LimitOffsetCursorQuery
         return true;
     }
 
-    protected function isValidContains(string $attribute, array $values): bool
-    {
-        if (!$this->isValidAttributeAndValues($attribute, $values)) {
-            return false;
-        }
-
-        $attributeSchema = $this->schema[$attribute];
-
-        // Contains method only supports array attributes
-        if (!$attributeSchema['array']) {
-            $this->message = 'Query method only supported on array attributes: ' . Query::TYPE_CONTAINS;
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * Is valid.
      *
-     * Returns true if:
-     * 1. method is limit or offset and values are within range
-     * 2. method is cursorBefore or cursorAfter and value is not null
-     * 3. method is a filter method, attribute exists, and value matches attribute type
+     * Returns true if method is a filter method, attribute exists, and value matches attribute type
      *
      * Otherwise, returns false
      *
@@ -116,9 +92,10 @@ class LimitOffsetCursorFilterQuery extends LimitOffsetCursorQuery
         $attribute = $query->getAttribute();
 
         switch ($method) {
-            case Query::TYPE_CONTAINS:
-                $values = $query->getValues();
-                return $this->isValidContains($attribute, $values);
+            // Do we support contains ? 
+            // case Query::TYPE_CONTAINS:
+            //     $values = $query->getValues();
+            //     return $this->isValidContains($attribute, $values);
 
             case Query::TYPE_EQUAL:
             case Query::TYPE_NOTEQUAL:
@@ -131,7 +108,7 @@ class LimitOffsetCursorFilterQuery extends LimitOffsetCursorQuery
                 return $this->isValidAttributeAndValues($attribute, $values);
 
             default:
-                return parent::isValid($query);
+                return false;
         }
     }
 }
diff --git a/src/Appwrite/Utopia/Database/Validator/Query/Limit.php b/src/Appwrite/Utopia/Database/Validator/Query/Limit.php
new file mode 100644
index 0000000000..63f681f7d9
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Limit.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Query;
+
+use Utopia\Database\Query;
+use Utopia\Validator\Range;
+use Utopia\Validator;
+
+class Limit extends Validator
+{
+    /**
+     * @var string
+     */
+    protected $message = 'Invalid query';
+
+    protected int $maxLimit;
+
+    /**
+     * Query constructor
+     *
+     * @param int $maxLimit
+     */
+    public function __construct(int $maxLimit = 100)
+    {
+        $this->maxLimit = $maxLimit;
+    }
+
+    /**
+     * Get Description.
+     *
+     * Returns validator description
+     *
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        return $this->message;
+    }
+
+    protected function isValidLimit($limit): bool
+    {
+        $validator = new Range(0, $this->maxLimit);
+        if ($validator->isValid($limit)) {
+            return true;
+        }
+
+        $this->message = 'Invalid limit: ' . $validator->getDescription();
+        return false;
+    }
+
+    /**
+     * Is valid.
+     *
+     * Returns true if method is limit values are within range.
+     *
+     * @param Query $value
+     *
+     * @return bool
+     */
+    public function isValid($query): bool
+    {
+        // Validate method
+        $method = $query->getMethod();
+
+        if ($method !== Query::LIMIT) {
+            $this->message = 'Query method invalid: ' . $method;
+            return false;
+        }
+
+        $limit = $query->getValue();
+        return $this->isValidLimit($limit);
+    }
+
+    /**
+     * Is array
+     *
+     * Function will return true if object is array.
+     *
+     * @return bool
+     */
+    public function isArray(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Get Type
+     *
+     * Returns validator type.
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return self::TYPE_OBJECT;
+    }
+}
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetQuery.php b/src/Appwrite/Utopia/Database/Validator/Query/Offset.php
similarity index 56%
rename from src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetQuery.php
rename to src/Appwrite/Utopia/Database/Validator/Query/Offset.php
index e11590757e..a319c91502 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetQuery.php
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Offset.php
@@ -1,31 +1,27 @@
 <?php
 
-namespace Appwrite\Utopia\Database\Validator\Queries;
+namespace Appwrite\Utopia\Database\Validator\Query;
 
 use Utopia\Database\Query;
 use Utopia\Validator\Range;
 use Utopia\Validator;
 
-class LimitOffsetQuery extends Validator
+class Offset extends Validator
 {
     /**
      * @var string
      */
     protected $message = 'Invalid query';
 
-    protected int $maxLimit;
     protected int $maxOffset;
 
     /**
      * Query constructor
      *
-     * @param int $maxLimit
      * @param int $maxOffset
-     * @param int $maxValuesCount
      */
-    public function __construct(int $maxLimit = 100, int $maxOffset = 5000)
+    public function __construct(int $maxOffset = 5000)
     {
-        $this->maxLimit = $maxLimit;
         $this->maxOffset = $maxOffset;
     }
 
@@ -41,17 +37,6 @@ class LimitOffsetQuery extends Validator
         return $this->message;
     }
 
-    protected function isValidLimit($limit): bool
-    {
-        $validator = new Range(0, $this->maxLimit);
-        if ($validator->isValid($limit)) {
-            return true;
-        }
-
-        $this->message = 'Invalid limit: ' . $validator->getDescription();
-        return false;
-    }
-
     protected function isValidOffset($offset): bool
     {
         $validator = new Range(0, $this->maxOffset);
@@ -66,7 +51,7 @@ class LimitOffsetQuery extends Validator
     /**
      * Is valid.
      *
-     * Returns true if method is limit or offset and values are within range.
+     * Returns true if method is offset and values are within range.
      *
      * @param Query $value
      *
@@ -76,19 +61,14 @@ class LimitOffsetQuery extends Validator
     {
         // Validate method
         $method = $query->getMethod();
-        switch ($method) {
-            case Query::TYPE_LIMIT:
-                $limit = $query->getValue();
-                return $this->isValidLimit($limit);
-
-            case Query::TYPE_OFFSET:
-                $offset = $query->getValue();
-                return $this->isValidOffset($offset);
-
-            default:
-                $this->message = 'Query method invalid: ' . $method;
-                return false;
+        
+        if ($method !== Query::TYPE_OFFSET) {
+            $this->message = 'Query method invalid: ' . $method;
+            return false;
         }
+
+        $offset = $query->getValue();
+        return $this->isValidOffset($offset);
     }
 
     /**
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQuery.php b/src/Appwrite/Utopia/Database/Validator/Query/Order.php
similarity index 52%
rename from src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQuery.php
rename to src/Appwrite/Utopia/Database/Validator/Query/Order.php
index 3a8459fa47..9ee40fa117 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQuery.php
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Order.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Appwrite\Utopia\Database\Validator\Queries;
+namespace Appwrite\Utopia\Database\Validator\Query;
 
-use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetCursorFilterQuery;
 use Utopia\Database\Query;
+use Utopia\Validator;
 
-class LimitOffsetCursorFilterOrderQuery extends LimitOffsetCursorFilterQuery
+class Order extends Validator
 {
     /**
      * @var string
@@ -20,29 +20,29 @@ class LimitOffsetCursorFilterOrderQuery extends LimitOffsetCursorFilterQuery
     /**
      * Query constructor
      *
-     * @param int $maxLimit
-     * @param int $maxOffset
-     * @param int $maxValuesCount
      */
-    public function __construct(int $maxLimit = 100, int $maxOffset = 5000, array $attributes = [], int $maxValuesCount = 100)
+    public function __construct(array $attributes = [])
     {
         foreach ($attributes as $attribute) {
             $this->schema[$attribute->getAttribute('key')] = $attribute->getArrayCopy();
         }
+    }
 
-        $this->maxValuesCount = $maxValuesCount;
+    protected function isValidAttribute($attribute): bool
+    {
+        // Search for attribute in schema
+        if (!isset($this->schema[$attribute])) {
+            $this->message = 'Attribute not found in schema: ' . $attribute;
+            return false;
+        }
 
-        parent::__construct($maxLimit, $maxOffset);
+        return true;
     }
 
     /**
      * Is valid.
      *
-     * Returns true if:
-     * 1. method is limit or offset and values are within range
-     * 2. method is cursorBefore or cursorAfter and value is not null
-     * 3. method is a filter method, attribute exists, and value matches attribute type
-     * 4. method is orderAsc or orderDesc and attribute exists or is empty string
+     * Returns true if method is ORDER_ASC or ORDER_DESC and attributes are valid
      *
      * Otherwise, returns false
      *
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php b/src/Appwrite/Utopia/Database/Validator/Users.php
similarity index 100%
rename from src/Appwrite/Utopia/Database/Validator/Queries/Users.php
rename to src/Appwrite/Utopia/Database/Validator/Users.php

From 228bedd6d01d70c6ac0c321600f9ac5a60bcd5db Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Mon, 22 Aug 2022 14:05:49 +0000
Subject: [PATCH 12/28] feat: update file structure

---
 src/Appwrite/Utopia/Database/Validator/Queries.php              | 2 --
 .../Utopia/Database/Validator/{ => Queries}/Collection.php      | 0
 src/Appwrite/Utopia/Database/Validator/{ => Queries}/Users.php  | 0
 3 files changed, 2 deletions(-)
 rename src/Appwrite/Utopia/Database/Validator/{ => Queries}/Collection.php (100%)
 rename src/Appwrite/Utopia/Database/Validator/{ => Queries}/Users.php (100%)

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries.php b/src/Appwrite/Utopia/Database/Validator/Queries.php
index cc675429e4..83248b4ebf 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries.php
@@ -23,8 +23,6 @@ class Queries extends Validator
      * Queries constructor
      *
      * @param Validator $validator used to validate each query
-     * @param Document[] $attributes allowed attributes to be queried
-     * @param Document[] $indexes available for strict query matching
      * @param bool $strict
      */
     public function __construct(Validator $validator)
diff --git a/src/Appwrite/Utopia/Database/Validator/Collection.php b/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
similarity index 100%
rename from src/Appwrite/Utopia/Database/Validator/Collection.php
rename to src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
diff --git a/src/Appwrite/Utopia/Database/Validator/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
similarity index 100%
rename from src/Appwrite/Utopia/Database/Validator/Users.php
rename to src/Appwrite/Utopia/Database/Validator/Queries/Users.php

From afa71bcaf3eafcdf70358c5316f936ed69f29691 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Mon, 22 Aug 2022 14:09:04 +0000
Subject: [PATCH 13/28] feat: update file structure

---
 .../Database/Validator/{Queries => Queries-123}/Collection.php    | 0
 .../Utopia/Database/Validator/{Queries => Queries-123}/Users.php  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/Appwrite/Utopia/Database/Validator/{Queries => Queries-123}/Collection.php (100%)
 rename src/Appwrite/Utopia/Database/Validator/{Queries => Queries-123}/Users.php (100%)

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php b/src/Appwrite/Utopia/Database/Validator/Queries-123/Collection.php
similarity index 100%
rename from src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
rename to src/Appwrite/Utopia/Database/Validator/Queries-123/Collection.php
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries-123/Users.php
similarity index 100%
rename from src/Appwrite/Utopia/Database/Validator/Queries/Users.php
rename to src/Appwrite/Utopia/Database/Validator/Queries-123/Users.php

From 3fe22b7ed02c1696f8b8e13435218c0135e217de Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Mon, 22 Aug 2022 14:10:10 +0000
Subject: [PATCH 14/28] feat: update file structure

---
 .../Database/Validator/{Queries-123 => Queries}/Collection.php    | 0
 .../Utopia/Database/Validator/{Queries-123 => Queries}/Users.php  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/Appwrite/Utopia/Database/Validator/{Queries-123 => Queries}/Collection.php (100%)
 rename src/Appwrite/Utopia/Database/Validator/{Queries-123 => Queries}/Users.php (100%)

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries-123/Collection.php b/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
similarity index 100%
rename from src/Appwrite/Utopia/Database/Validator/Queries-123/Collection.php
rename to src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries-123/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
similarity index 100%
rename from src/Appwrite/Utopia/Database/Validator/Queries-123/Users.php
rename to src/Appwrite/Utopia/Database/Validator/Queries/Users.php

From 0304a579159514d82fa69b3bb35c080a49d87d06 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Mon, 22 Aug 2022 14:12:52 +0000
Subject: [PATCH 15/28] feat: remove queries

---
 .../Database/Validator/Queries/Collection.php | 58 -------------------
 .../Database/Validator/Queries/Users.php      | 31 ----------
 2 files changed, 89 deletions(-)
 delete mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
 delete mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Users.php

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php b/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
deleted file mode 100644
index 0404f299af..0000000000
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Appwrite\Utopia\Database\Validator\Queries;
-
-use Utopia\Config\Config;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Validator\Queries as QueriesValidator;
-use Utopia\Database\Validator\Query as QueryValidator;
-
-class Collection extends QueriesValidator
-{
-    /**
-     * Expression constructor
-     *
-     * @param string $collection
-     * @param string[] $allowedAttributes
-     */
-    public function __construct(string $collection, array $allowedAttributes)
-    {
-        $collection = Config::getParam('collections', [])[$collection];
-        // array for constant lookup time
-        $allowedAttributesLookup = [];
-        foreach ($allowedAttributes as $attribute) {
-            $allowedAttributesLookup[$attribute] = true;
-        }
-
-        $attributes = [];
-        foreach ($collection['attributes'] as $attribute) {
-            $key = $attribute['$id'];
-            if (!isset($allowedAttributesLookup[$key])) {
-                continue;
-            }
-
-            $attributes[] = new Document([
-                'key' => $key,
-                'type' => $attribute['type'],
-                'array' => $attribute['array'],
-            ]);
-        }
-
-        $indexes = [];
-        foreach ($allowedAttributes as $attribute) {
-            $indexes[] = new Document([
-                'status' => 'available',
-                'type' => Database::INDEX_KEY,
-                'attributes' => [$attribute]
-            ]);
-        }
-        $indexes[] = new Document([
-            'status' => 'available',
-            'type' => Database::INDEX_FULLTEXT,
-            'attributes' => ['search']
-        ]);
-
-        parent::__construct(new QueryValidator($attributes), $attributes, $indexes, true);
-    }
-}
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
deleted file mode 100644
index 59373c2cab..0000000000
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Appwrite\Utopia\Database\Validator\Queries;
-
-use Appwrite\Utopia\Database\Validator\Queries\Collection;
-
-class Users extends Collection
-{
-    public const ALLOWED_ATTRIBUTES = [
-        '$id',
-        '$createdAt',
-        '$updatedAt',
-        'name',
-        'email',
-        'phone',
-        'status',
-        'passwordUpdate',
-        'registration',
-        'emailVerification',
-        'phoneVerification',
-    ];
-
-    /**
-     * Expression constructor
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct('users', self::ALLOWED_ATTRIBUTES);
-    }
-}

From dd00c58b08b789dec6e7806e3db563f31c889ec3 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Mon, 22 Aug 2022 14:14:40 +0000
Subject: [PATCH 16/28] feat: remove queries

---
 .../Database/Validator/Queries/Collection.php | 58 +++++++++++++++++++
 .../Database/Validator/Queries/Users.php      | 31 ++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Users.php

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php b/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
new file mode 100644
index 0000000000..dffaabee6d
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Utopia\Config\Config;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Validator\Queries as QueriesValidator;
+use Utopia\Database\Validator\Query as QueryValidator;
+
+class Collection extends QueriesValidator
+{
+    /**
+     * Expression constructor
+     *
+     * @param string $collection
+     * @param string[] $allowedAttributes
+     */
+    public function __construct(string $collection, array $allowedAttributes)
+    {
+        $collection = Config::getParam('collections', [])[$collection];
+        // array for constant lookup time
+        $allowedAttributesLookup = [];
+        foreach ($allowedAttributes as $attribute) {
+            $allowedAttributesLookup[$attribute] = true;
+        }
+
+        $attributes = [];
+        foreach ($collection['attributes'] as $attribute) {
+            $key = $attribute['$id'];
+            if (!isset($allowedAttributesLookup[$key])) {
+                continue;
+            }
+
+            $attributes[] = new Document([
+                'key' => $key,
+                'type' => $attribute['type'],
+                'array' => $attribute['array'],
+            ]);
+        }
+
+        $indexes = [];
+        foreach ($allowedAttributes as $attribute) {
+            $indexes[] = new Document([
+                'status' => 'available',
+                'type' => Database::INDEX_KEY,
+                'attributes' => [$attribute]
+            ]);
+        }
+        $indexes[] = new Document([
+            'status' => 'available',
+            'type' => Database::INDEX_FULLTEXT,
+            'attributes' => ['search']
+        ]);
+
+        parent::__construct(new QueryValidator($attributes), $attributes, $indexes, true);
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
new file mode 100644
index 0000000000..b61ec9c086
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Collection;
+
+class Users extends Collection
+{
+    public const ALLOWED_ATTRIBUTES = [
+        '$id',
+        '$createdAt',
+        '$updatedAt',
+        'name',
+        'email',
+        'phone',
+        'status',
+        'passwordUpdate',
+        'registration',
+        'emailVerification',
+        'phoneVerification',
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('users', self::ALLOWED_ATTRIBUTES);
+    }
+}
\ No newline at end of file

From 3ceff5aa71ac0ba0a3a0e2502471fb11d8e6e520 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Mon, 22 Aug 2022 14:37:35 +0000
Subject: [PATCH 17/28] feat: update queries constructor

---
 src/Appwrite/Utopia/Database/Validator/Queries.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries.php b/src/Appwrite/Utopia/Database/Validator/Queries.php
index 83248b4ebf..8bcf60fe1b 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries.php
@@ -25,9 +25,9 @@ class Queries extends Validator
      * @param Validator $validator used to validate each query
      * @param bool $strict
      */
-    public function __construct(Validator $validator)
+    public function __construct(...$validators)
     {
-        $this->validator = $validator;
+        $this->validators = $validators;
     }
 
     /**

From 0fd55cb13caeeccb86c3519b368c6842f31d9892 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Mon, 22 Aug 2022 14:44:28 +0000
Subject: [PATCH 18/28] feat: update queries constructor

---
 src/Appwrite/Utopia/Database/Validator/Queries.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries.php b/src/Appwrite/Utopia/Database/Validator/Queries.php
index 8bcf60fe1b..d518ae64e3 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries.php
@@ -22,10 +22,9 @@ class Queries extends Validator
     /**
      * Queries constructor
      *
-     * @param Validator $validator used to validate each query
-     * @param bool $strict
+     * @param $validators - a list of validators
      */
-    public function __construct(...$validators)
+    public function __construct(Validator ...$validators)
     {
         $this->validators = $validators;
     }
@@ -66,9 +65,11 @@ class Queries extends Validator
                 }
             }
 
-            if (!$this->validator->isValid($query)) {
-                $this->message = 'Query not valid: ' . $this->validator->getDescription();
-                return false;
+            foreach ($this->validators as $validator) {
+                if (!$validator->isValid($query)) {
+                    $this->message = 'Query not valid: ' . $this->validator->getDescription();
+                    return false;
+                }
             }
 
             $queries[] = $query;

From cff0fd9476f24f67c811a85af3cd813752bfdfbc Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Mon, 22 Aug 2022 15:04:55 +0000
Subject: [PATCH 19/28] feat: update queries constructor

---
 .../Utopia/Database/Validator/Queries.php     | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries.php b/src/Appwrite/Utopia/Database/Validator/Queries.php
index d518ae64e3..1ad5b2e74f 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries.php
@@ -24,9 +24,11 @@ class Queries extends Validator
      *
      * @param $validators - a list of validators
      */
-    public function __construct(Validator ...$validators)
+    public function __construct(Limit $limit = null, Offset $offset = null, Order $order)
     {
-        $this->validators = $validators;
+        $this->limit = $limit;
+        $this->offset = $offset;
+        $this->order = $order;
     }
 
     /**
@@ -65,11 +67,21 @@ class Queries extends Validator
                 }
             }
 
-            foreach ($this->validators as $validator) {
-                if (!$validator->isValid($query)) {
-                    $this->message = 'Query not valid: ' . $this->validator->getDescription();
+            $method = $query->getMethod();
+            switch ($method) {
+                case Query::TYPE_LIMIT:
+                    $validator = $this->limit;
+                case Query::TYPE_OFFSET:
+                    $validator = $this->offset;
+                case Query::TYPE_ORDER:
+                    $validator = $this->order;
+                default:
                     return false;
-                }
+            }
+            
+            if (!$validator->isValid($query)) {
+                $this->message = 'Query not valid: ' . $this->validator->getDescription();
+                return false;
             }
 
             $queries[] = $query;

From 464738274d0aa4a56a270395e587511cd9b5e05f Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Mon, 22 Aug 2022 15:06:11 +0000
Subject: [PATCH 20/28] feat: update queries constructor

---
 src/Appwrite/Utopia/Database/Validator/Queries.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries.php b/src/Appwrite/Utopia/Database/Validator/Queries.php
index 1ad5b2e74f..0c3d144eb9 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries.php
@@ -79,7 +79,7 @@ class Queries extends Validator
                     return false;
             }
             
-            if (!$validator->isValid($query)) {
+            if ($validator && !$validator->isValid($query)) {
                 $this->message = 'Query not valid: ' . $this->validator->getDescription();
                 return false;
             }

From e09cb3a1cb5550c7e8c646a94e4497deb465a997 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Mon, 22 Aug 2022 15:11:47 +0000
Subject: [PATCH 21/28] feat: update queries constructor

---
 src/Appwrite/Utopia/Database/Validator/Queries.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries.php b/src/Appwrite/Utopia/Database/Validator/Queries.php
index 0c3d144eb9..826f783c4d 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries.php
@@ -24,11 +24,13 @@ class Queries extends Validator
      *
      * @param $validators - a list of validators
      */
-    public function __construct(Limit $limit = null, Offset $offset = null, Order $order)
+    public function __construct(Limit $limit = null, Offset $offset = null, Order $order = null, Cursor $cursor = null, Filter $filter = null)
     {
         $this->limit = $limit;
         $this->offset = $offset;
         $this->order = $order;
+        $this->filter = $filter;
+        $this->cursor = $cursor;
     }
 
     /**

From 66ff297103a3bff1cb2cce327824d06b022672b6 Mon Sep 17 00:00:00 2001
From: Steven <stnguyen90@users.noreply.github.com>
Date: Mon, 22 Aug 2022 19:12:30 +0000
Subject: [PATCH 22/28] Refactor Queries Validation

---
 app/controllers/api/databases.php             |  16 ++-
 app/controllers/api/users.php                 |   5 +-
 .../Database/Validator/IndexedQueries.php     |  14 +-
 .../Utopia/Database/Validator/Queries.php     |  69 ++++++----
 .../Database/Validator/Queries/Collection.php |  38 +++++-
 .../Database/Validator/Queries/Users.php      |   6 +-
 .../Utopia/Database/Validator/Query/Base.php  |  70 ++++++++++
 .../Database/Validator/Query/Cursor.php       |  14 +-
 .../Database/Validator/Query/Filter.php       |  14 +-
 .../Utopia/Database/Validator/Query/Limit.php |  46 +------
 .../Database/Validator/Query/Offset.php       |  46 +------
 .../Utopia/Database/Validator/Query/Order.php |  15 ++-
 .../Database/Validator/IndexedQueriesTest.php | 121 ++++++++++++++++++
 .../Validator/Queries/CollectionTest.php      |  43 +++++++
 .../LimitOffsetCursorFilterOrderQueryTest.php |  94 --------------
 .../LimitOffsetCursorFilterQueryTest.php      |  88 -------------
 .../Queries/LimitOffsetCursorQueryTest.php    |  74 -----------
 .../Queries/LimitOffsetQueryTest.php          |  74 -----------
 .../Database/Validator/Queries/UsersTest.php  |  40 ++++++
 .../Utopia/Database/Validator/QueriesTest.php |  76 +++++++++++
 .../Database/Validator/Query/CursorTest.php   |  41 ++++++
 .../Database/Validator/Query/FilterTest.php   |  59 +++++++++
 .../Database/Validator/Query/LimitTest.php    |  37 ++++++
 .../Database/Validator/Query/OffsetTest.php   |  41 ++++++
 .../Database/Validator/Query/OrderTest.php    |  54 ++++++++
 25 files changed, 716 insertions(+), 479 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Query/Base.php
 create mode 100644 tests/unit/Utopia/Database/Validator/IndexedQueriesTest.php
 create mode 100644 tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php
 delete mode 100644 tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQueryTest.php
 delete mode 100644 tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQueryTest.php
 delete mode 100644 tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorQueryTest.php
 delete mode 100644 tests/unit/Utopia/Database/Validator/Queries/LimitOffsetQueryTest.php
 create mode 100644 tests/unit/Utopia/Database/Validator/Queries/UsersTest.php
 create mode 100644 tests/unit/Utopia/Database/Validator/QueriesTest.php
 create mode 100644 tests/unit/Utopia/Database/Validator/Query/CursorTest.php
 create mode 100644 tests/unit/Utopia/Database/Validator/Query/FilterTest.php
 create mode 100644 tests/unit/Utopia/Database/Validator/Query/LimitTest.php
 create mode 100644 tests/unit/Utopia/Database/Validator/Query/OffsetTest.php
 create mode 100644 tests/unit/Utopia/Database/Validator/Query/OrderTest.php

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 7efd9fac8e..372c8eea95 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -38,7 +38,11 @@ use Appwrite\Network\Validator\IP;
 use Appwrite\Network\Validator\URL;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\IndexedQueries;
-use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetCursorFilterOrderQuery;
+use Appwrite\Utopia\Database\Validator\Query\Cursor as CursorQueryValidator;
+use Appwrite\Utopia\Database\Validator\Query\Filter as FilterQueryValidator;
+use Appwrite\Utopia\Database\Validator\Query\Limit as LimitQueryValidator;
+use Appwrite\Utopia\Database\Validator\Query\Offset as OffsetQueryValidator;
+use Appwrite\Utopia\Database\Validator\Query\Order as OrderQueryValidator;
 use Appwrite\Utopia\Response;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Database as EventDatabase;
@@ -2048,7 +2052,15 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
                     ]),
                 ]
             );
-            $validator = new IndexedQueries(new LimitOffsetCursorFilterOrderQuery(attributes: $attributes), $attributes, $collection->getAttribute('indexes', []));
+            $validator = new IndexedQueries(
+                $attributes,
+                $collection->getAttribute('indexes', []),
+                new CursorQueryValidator(),
+                new FilterQueryValidator($attributes),
+                new LimitQueryValidator(),
+                new OffsetQueryValidator(),
+                new OrderQueryValidator(),
+            );
             if (!$validator->isValid($queries)) {
                 throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
             }
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 87a8959f91..3856faeee0 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -11,7 +11,8 @@ use Appwrite\Stats\Stats;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries;
 use Appwrite\Utopia\Database\Validator\Queries\Users;
-use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetQuery;
+use Appwrite\Utopia\Database\Validator\Query\Limit;
+use Appwrite\Utopia\Database\Validator\Query\Offset;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Audit\Audit;
@@ -574,7 +575,7 @@ App::get('/v1/users/:userId/logs')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_LOG_LIST)
     ->param('userId', '', new UID(), 'User ID.')
-    ->param('queries', [], new Queries(new LimitOffsetQuery()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Only supported methods are limit and offset', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('locale')
diff --git a/src/Appwrite/Utopia/Database/Validator/IndexedQueries.php b/src/Appwrite/Utopia/Database/Validator/IndexedQueries.php
index f1f3e62eb9..1cc0429018 100644
--- a/src/Appwrite/Utopia/Database/Validator/IndexedQueries.php
+++ b/src/Appwrite/Utopia/Database/Validator/IndexedQueries.php
@@ -2,11 +2,10 @@
 
 namespace Appwrite\Utopia\Database\Validator;
 
-use Appwrite\Utopia\Database\Validator\Queries;
+use Appwrite\Utopia\Database\Validator\Query\Base;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
-use Utopia\Database\Validator\Query as QueryValidator;
 
 class IndexedQueries extends Queries
 {
@@ -25,18 +24,13 @@ class IndexedQueries extends Queries
      *
      * This Queries Validator filters indexes for only available indexes
      *
-     * @param QueryValidator $validator
      * @param Document[] $attributes
      * @param Document[] $indexes
+     * @param Base ...$validators
      * @param bool $strict
      */
-    public function __construct($validator, $attributes = [], $indexes = [])
+    public function __construct($attributes = [], $indexes = [], Base ...$validators)
     {
-        // Remove failed/stuck/processing indexes
-        $availableIndexes = \array_filter($indexes, function ($index) {
-            return $index->getAttribute('status') === 'available';
-        });
-
         $this->attributes = $attributes;
 
         $this->indexes[] = new Document([
@@ -58,7 +52,7 @@ class IndexedQueries extends Queries
             $this->indexes[] = $index;
         }
 
-        parent::__construct($validator);
+        parent::__construct(...$validators);
     }
 
     /**
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries.php b/src/Appwrite/Utopia/Database/Validator/Queries.php
index 826f783c4d..ec77971496 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries.php
@@ -2,9 +2,8 @@
 
 namespace Appwrite\Utopia\Database\Validator;
 
+use Appwrite\Utopia\Database\Validator\Query\Base;
 use Utopia\Validator;
-use Utopia\Database\Document;
-use Utopia\Database\Validator\Query as QueryValidator;
 use Utopia\Database\Query;
 
 class Queries extends Validator
@@ -15,22 +14,18 @@ class Queries extends Validator
     protected $message = 'Invalid queries';
 
     /**
-     * @var QueryValidator
+     * @var Base[]
      */
-    protected $validator;
+    protected $validators;
 
     /**
      * Queries constructor
      *
-     * @param $validators - a list of validators
+     * @param Base ...$validators a list of validators
      */
-    public function __construct(Limit $limit = null, Offset $offset = null, Order $order = null, Cursor $cursor = null, Filter $filter = null)
+    public function __construct(Base ...$validators)
     {
-        $this->limit = $limit;
-        $this->offset = $offset;
-        $this->order = $order;
-        $this->filter = $filter;
-        $this->cursor = $cursor;
+        $this->validators = $validators;
     }
 
     /**
@@ -58,7 +53,6 @@ class Queries extends Validator
      */
     public function isValid($value): bool
     {
-        $queries = [];
         foreach ($value as $query) {
             if (!$query instanceof Query) {
                 try {
@@ -70,23 +64,52 @@ class Queries extends Validator
             }
 
             $method = $query->getMethod();
+            $methodType = '';
             switch ($method) {
                 case Query::TYPE_LIMIT:
-                    $validator = $this->limit;
+                    $methodType = Base::METHOD_TYPE_LIMIT;
+                    break;
                 case Query::TYPE_OFFSET:
-                    $validator = $this->offset;
-                case Query::TYPE_ORDER:
-                    $validator = $this->order;
+                    $methodType = Base::METHOD_TYPE_OFFSET;
+                    break;
+                case Query::TYPE_CURSORAFTER:
+                case Query::TYPE_CURSORBEFORE:
+                    $methodType = Base::METHOD_TYPE_CURSOR;
+                    break;
+                case Query::TYPE_ORDERASC:
+                case Query::TYPE_ORDERDESC:
+                    $methodType = Base::METHOD_TYPE_ORDER;
+                    break;
+                case Query::TYPE_EQUAL:
+                case Query::TYPE_NOTEQUAL:
+                case Query::TYPE_LESSER:
+                case Query::TYPE_LESSEREQUAL:
+                case Query::TYPE_GREATER:
+                case Query::TYPE_GREATEREQUAL:
+                case Query::TYPE_SEARCH:
+                    $methodType = Base::METHOD_TYPE_FILTER;
+                    break;
                 default:
-                    return false;
-            }
-            
-            if ($validator && !$validator->isValid($query)) {
-                $this->message = 'Query not valid: ' . $this->validator->getDescription();
-                return false;
+                    break;
             }
 
-            $queries[] = $query;
+            $methodIsValid = false;
+            foreach ($this->validators as $validator) {
+                if ($validator->getMethodType() !== $methodType) {
+                    continue;
+                }
+                if (!$validator->isValid($query)) {
+                    $this->message = 'Query not valid: ' . $validator->getDescription();
+                    return false;
+                }
+
+                $methodIsValid = true;
+            }
+
+            if (!$methodIsValid) {
+                $this->message = 'Query method not valid: ' . $method;
+                return false;
+            }
         }
 
         return true;
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php b/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
index dffaabee6d..0c29ecd2ff 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
@@ -2,13 +2,17 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
+use Appwrite\Utopia\Database\Validator\IndexedQueries;
+use Appwrite\Utopia\Database\Validator\Query\Limit;
+use Appwrite\Utopia\Database\Validator\Query\Offset;
+use Appwrite\Utopia\Database\Validator\Query\Cursor;
+use Appwrite\Utopia\Database\Validator\Query\Filter;
+use Appwrite\Utopia\Database\Validator\Query\Order;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
-use Utopia\Database\Validator\Queries as QueriesValidator;
-use Utopia\Database\Validator\Query as QueryValidator;
 
-class Collection extends QueriesValidator
+class Collection extends IndexedQueries
 {
     /**
      * Expression constructor
@@ -39,6 +43,22 @@ class Collection extends QueriesValidator
             ]);
         }
 
+        $attributes[] = new Document([
+            'key' => '$id',
+            'type' => Database::VAR_STRING,
+            'array' => false,
+        ]);
+        $attributes[] = new Document([
+            '$id' => '$createdAt',
+            'type' => Database::VAR_DATETIME,
+            'array' => false,
+        ]);
+        $attributes[] = new Document([
+            '$id' => '$updatedAt',
+            'type' => Database::VAR_DATETIME,
+            'array' => false,
+        ]);
+
         $indexes = [];
         foreach ($allowedAttributes as $attribute) {
             $indexes[] = new Document([
@@ -53,6 +73,14 @@ class Collection extends QueriesValidator
             'attributes' => ['search']
         ]);
 
-        parent::__construct(new QueryValidator($attributes), $attributes, $indexes, true);
+        $validators = [
+            new Limit(),
+            new Offset(),
+            new Cursor(),
+            new Filter($attributes),
+            new Order($attributes),
+        ];
+
+        parent::__construct($attributes, $indexes, ...$validators);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
index b61ec9c086..ffe30f1209 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
@@ -7,9 +7,6 @@ use Appwrite\Utopia\Database\Validator\Queries\Collection;
 class Users extends Collection
 {
     public const ALLOWED_ATTRIBUTES = [
-        '$id',
-        '$createdAt',
-        '$updatedAt',
         'name',
         'email',
         'phone',
@@ -18,6 +15,7 @@ class Users extends Collection
         'registration',
         'emailVerification',
         'phoneVerification',
+        'search',
     ];
 
     /**
@@ -28,4 +26,4 @@ class Users extends Collection
     {
         parent::__construct('users', self::ALLOWED_ATTRIBUTES);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Appwrite/Utopia/Database/Validator/Query/Base.php b/src/Appwrite/Utopia/Database/Validator/Query/Base.php
new file mode 100644
index 0000000000..b23d594ea7
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Base.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Query;
+
+use Utopia\Validator;
+use Utopia\Database\Query;
+
+abstract class Base extends Validator
+{
+    public const METHOD_TYPE_LIMIT = 'limit';
+    public const METHOD_TYPE_OFFSET = 'offset';
+    public const METHOD_TYPE_CURSOR = 'cursor';
+    public const METHOD_TYPE_ORDER = 'order';
+    public const METHOD_TYPE_FILTER = 'filter';
+
+    /**
+     * @var string
+     */
+    protected $message = 'Invalid query';
+
+    /**
+     * Get Description.
+     *
+     * Returns validator description
+     *
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        return $this->message;
+    }
+
+    /**
+     * Is array
+     *
+     * Function will return true if object is array.
+     *
+     * @return bool
+     */
+    public function isArray(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Get Type
+     *
+     * Returns validator type.
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return self::TYPE_OBJECT;
+    }
+
+    /**
+     * Is valid.
+     *
+     * @param Query $value
+     *
+     * @return bool
+     */
+    abstract public function isValid($query): bool;
+
+    /**
+     * Returns what type of query this Validator is for
+     */
+    abstract public function getMethodType(): string;
+}
diff --git a/src/Appwrite/Utopia/Database/Validator/Query/Cursor.php b/src/Appwrite/Utopia/Database/Validator/Query/Cursor.php
index 0fb77ee0b6..42bff08a1d 100644
--- a/src/Appwrite/Utopia/Database/Validator/Query/Cursor.php
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Cursor.php
@@ -2,17 +2,12 @@
 
 namespace Appwrite\Utopia\Database\Validator\Query;
 
-use Utopia\Validator;
+use Appwrite\Utopia\Database\Validator\Query\Base;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\UID;
 
-class Cursor extends Validator
+class Cursor extends Base
 {
-    /**
-     * @var string
-     */
-    protected $message = 'Invalid query';
-
     /**
      * Is valid.
      *
@@ -41,4 +36,9 @@ class Cursor extends Validator
 
         return false;
     }
+
+    public function getMethodType(): string
+    {
+        return self::METHOD_TYPE_CURSOR;
+    }
 }
diff --git a/src/Appwrite/Utopia/Database/Validator/Query/Filter.php b/src/Appwrite/Utopia/Database/Validator/Query/Filter.php
index e32b3aab66..096d036907 100644
--- a/src/Appwrite/Utopia/Database/Validator/Query/Filter.php
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Filter.php
@@ -2,11 +2,11 @@
 
 namespace Appwrite\Utopia\Database\Validator\Query;
 
-use Utopia\Validator;
+use Appwrite\Utopia\Database\Validator\Query\Base;
 use Utopia\Database\Database;
 use Utopia\Database\Query;
 
-class Filter extends Validator
+class Filter extends Base
 {
     /**
      * @var string
@@ -92,11 +92,6 @@ class Filter extends Validator
         $attribute = $query->getAttribute();
 
         switch ($method) {
-            // Do we support contains ? 
-            // case Query::TYPE_CONTAINS:
-            //     $values = $query->getValues();
-            //     return $this->isValidContains($attribute, $values);
-
             case Query::TYPE_EQUAL:
             case Query::TYPE_NOTEQUAL:
             case Query::TYPE_LESSER:
@@ -111,4 +106,9 @@ class Filter extends Validator
                 return false;
         }
     }
+
+    public function getMethodType(): string
+    {
+        return self::METHOD_TYPE_FILTER;
+    }
 }
diff --git a/src/Appwrite/Utopia/Database/Validator/Query/Limit.php b/src/Appwrite/Utopia/Database/Validator/Query/Limit.php
index 63f681f7d9..232df93666 100644
--- a/src/Appwrite/Utopia/Database/Validator/Query/Limit.php
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Limit.php
@@ -2,17 +2,12 @@
 
 namespace Appwrite\Utopia\Database\Validator\Query;
 
+use Appwrite\Utopia\Database\Validator\Query\Base;
 use Utopia\Database\Query;
 use Utopia\Validator\Range;
-use Utopia\Validator;
 
-class Limit extends Validator
+class Limit extends Base
 {
-    /**
-     * @var string
-     */
-    protected $message = 'Invalid query';
-
     protected int $maxLimit;
 
     /**
@@ -25,18 +20,6 @@ class Limit extends Validator
         $this->maxLimit = $maxLimit;
     }
 
-    /**
-     * Get Description.
-     *
-     * Returns validator description
-     *
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        return $this->message;
-    }
-
     protected function isValidLimit($limit): bool
     {
         $validator = new Range(0, $this->maxLimit);
@@ -62,7 +45,7 @@ class Limit extends Validator
         // Validate method
         $method = $query->getMethod();
 
-        if ($method !== Query::LIMIT) {
+        if ($method !== Query::TYPE_LIMIT) {
             $this->message = 'Query method invalid: ' . $method;
             return false;
         }
@@ -71,27 +54,8 @@ class Limit extends Validator
         return $this->isValidLimit($limit);
     }
 
-    /**
-     * Is array
-     *
-     * Function will return true if object is array.
-     *
-     * @return bool
-     */
-    public function isArray(): bool
+    public function getMethodType(): string
     {
-        return false;
-    }
-
-    /**
-     * Get Type
-     *
-     * Returns validator type.
-     *
-     * @return string
-     */
-    public function getType(): string
-    {
-        return self::TYPE_OBJECT;
+        return self::METHOD_TYPE_LIMIT;
     }
 }
diff --git a/src/Appwrite/Utopia/Database/Validator/Query/Offset.php b/src/Appwrite/Utopia/Database/Validator/Query/Offset.php
index a319c91502..9f832a7c62 100644
--- a/src/Appwrite/Utopia/Database/Validator/Query/Offset.php
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Offset.php
@@ -2,17 +2,12 @@
 
 namespace Appwrite\Utopia\Database\Validator\Query;
 
+use Appwrite\Utopia\Database\Validator\Query\Base;
 use Utopia\Database\Query;
 use Utopia\Validator\Range;
-use Utopia\Validator;
 
-class Offset extends Validator
+class Offset extends Base
 {
-    /**
-     * @var string
-     */
-    protected $message = 'Invalid query';
-
     protected int $maxOffset;
 
     /**
@@ -25,18 +20,6 @@ class Offset extends Validator
         $this->maxOffset = $maxOffset;
     }
 
-    /**
-     * Get Description.
-     *
-     * Returns validator description
-     *
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        return $this->message;
-    }
-
     protected function isValidOffset($offset): bool
     {
         $validator = new Range(0, $this->maxOffset);
@@ -61,7 +44,7 @@ class Offset extends Validator
     {
         // Validate method
         $method = $query->getMethod();
-        
+
         if ($method !== Query::TYPE_OFFSET) {
             $this->message = 'Query method invalid: ' . $method;
             return false;
@@ -71,27 +54,8 @@ class Offset extends Validator
         return $this->isValidOffset($offset);
     }
 
-    /**
-     * Is array
-     *
-     * Function will return true if object is array.
-     *
-     * @return bool
-     */
-    public function isArray(): bool
+    public function getMethodType(): string
     {
-        return false;
-    }
-
-    /**
-     * Get Type
-     *
-     * Returns validator type.
-     *
-     * @return string
-     */
-    public function getType(): string
-    {
-        return self::TYPE_OBJECT;
+        return self::METHOD_TYPE_OFFSET;
     }
 }
diff --git a/src/Appwrite/Utopia/Database/Validator/Query/Order.php b/src/Appwrite/Utopia/Database/Validator/Query/Order.php
index 9ee40fa117..0c12d7ac44 100644
--- a/src/Appwrite/Utopia/Database/Validator/Query/Order.php
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Order.php
@@ -2,16 +2,12 @@
 
 namespace Appwrite\Utopia\Database\Validator\Query;
 
+use Appwrite\Utopia\Database\Validator\Query\Base;
 use Utopia\Database\Query;
 use Utopia\Validator;
 
-class Order extends Validator
+class Order extends Base
 {
-    /**
-     * @var string
-     */
-    protected $message = 'Invalid query';
-
     /**
      * @var array
      */
@@ -62,6 +58,11 @@ class Order extends Validator
             return $this->isValidAttribute($attribute);
         }
 
-        return parent::isValid($query);
+        return false;
+    }
+
+    public function getMethodType(): string
+    {
+        return self::METHOD_TYPE_ORDER;
     }
 }
diff --git a/tests/unit/Utopia/Database/Validator/IndexedQueriesTest.php b/tests/unit/Utopia/Database/Validator/IndexedQueriesTest.php
new file mode 100644
index 0000000000..52375004ca
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/IndexedQueriesTest.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator;
+
+use Appwrite\Utopia\Database\Validator\IndexedQueries;
+use Appwrite\Utopia\Database\Validator\Query\Cursor;
+use Appwrite\Utopia\Database\Validator\Query\Filter;
+use Appwrite\Utopia\Database\Validator\Query\Limit;
+use Appwrite\Utopia\Database\Validator\Query\Offset;
+use Appwrite\Utopia\Database\Validator\Query\Order;
+use PHPUnit\Framework\TestCase;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+
+class IndexedQueriesTest extends TestCase
+{
+    public function setUp(): void
+    {
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testEmptyQueries(): void
+    {
+        $validator = new IndexedQueries();
+
+        $this->assertEquals(true, $validator->isValid([]));
+    }
+
+    public function testInvalidQuery(): void
+    {
+        $validator = new IndexedQueries();
+
+        $this->assertEquals(false, $validator->isValid(["this.is.invalid"]));
+    }
+
+    public function testInvalidMethod(): void
+    {
+        $validator = new IndexedQueries();
+        $this->assertEquals(false, $validator->isValid(['equal("attr", "value")']));
+
+        $validator = new IndexedQueries([], [], new Limit());
+        $this->assertEquals(false, $validator->isValid(['equal("attr", "value")']));
+    }
+
+    public function testInvalidValue(): void
+    {
+        $validator = new IndexedQueries([], [], new Limit());
+        $this->assertEquals(false, $validator->isValid(['limit(-1)']));
+    }
+
+    public function testValid(): void
+    {
+        $attributes = [
+            new Document([
+                'key' => 'name',
+                'type' => Database::VAR_STRING,
+                'array' => false,
+            ]),
+        ];
+        $indexes = [
+            new Document([
+                'status' => 'available',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['name'],
+            ]),
+            new Document([
+                'status' => 'available',
+                'type' => Database::INDEX_FULLTEXT,
+                'attributes' => ['name'],
+            ]),
+        ];
+        $validator = new IndexedQueries(
+            $attributes,
+            $indexes,
+            new Cursor(),
+            new Filter($attributes),
+            new Limit(),
+            new Offset(),
+            new Order($attributes),
+        );
+        $this->assertEquals(true, $validator->isValid(['cursorAfter("asdf")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['equal("name", "value")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['limit(10)']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['offset(10)']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['orderAsc("name")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['search("name", "value")']), $validator->getDescription());
+    }
+
+    public function testMissingIndex(): void
+    {
+        $attributes = [
+            new Document([
+                'key' => 'name',
+                'type' => Database::VAR_STRING,
+                'array' => false,
+            ]),
+        ];
+        $indexes = [
+            new Document([
+                'status' => 'available',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['name'],
+            ]),
+        ];
+        $validator = new IndexedQueries(
+            $attributes,
+            $indexes,
+            new Cursor(),
+            new Filter($attributes),
+            new Limit(),
+            new Offset(),
+            new Order($attributes),
+        );
+        $this->assertEquals(false, $validator->isValid(['equal("dne", "value")']), $validator->getDescription());
+        $this->assertEquals(false, $validator->isValid(['orderAsc("dne")']), $validator->getDescription());
+        $this->assertEquals(false, $validator->isValid(['search("name", "value")']), $validator->getDescription());
+    }
+}
diff --git a/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php b/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php
new file mode 100644
index 0000000000..198fc2895d
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Collection;
+use PHPUnit\Framework\TestCase;
+
+class CollectionTest extends TestCase
+{
+    public function setUp(): void
+    {
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testEmptyQueries(): void
+    {
+        $validator = new Collection('users', []);
+
+        $this->assertEquals($validator->isValid([]), true);
+    }
+
+    public function testValid(): void
+    {
+        $validator = new Collection('users', ['name', 'search']);
+        $this->assertEquals(true, $validator->isValid(['cursorAfter("asdf")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['equal("name", "value")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['limit(10)']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['offset(10)']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['orderAsc("name")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['search("search", "value")']), $validator->getDescription());
+    }
+
+    public function testMissingIndex(): void
+    {
+        $validator = new Collection('users', ['name']);
+        $this->assertEquals(false, $validator->isValid(['equal("dne", "value")']), $validator->getDescription());
+        $this->assertEquals(false, $validator->isValid(['orderAsc("dne")']), $validator->getDescription());
+        $this->assertEquals(false, $validator->isValid(['search("search", "value")']), $validator->getDescription());
+    }
+}
diff --git a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQueryTest.php b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQueryTest.php
deleted file mode 100644
index c46911b30e..0000000000
--- a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterOrderQueryTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Tests\Unit\Utopia\Database\Validator\Queries;
-
-use Appwrite\Utopia\Database\Validator\Queries;
-use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetCursorFilterOrderQuery;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Query;
-use Utopia\Validator;
-use PHPUnit\Framework\TestCase;
-
-class LimitOffsetCursorFilterOrderQueryTest extends TestCase
-{
-    /**
-     * @var Validator
-     */
-    protected $validator = null;
-
-    public function setUp(): void
-    {
-        $this->validator = new LimitOffsetCursorFilterOrderQuery(
-            attributes: [
-                new Document([
-                    'key' => 'attr',
-                    'type' => Database::VAR_STRING,
-                    'array' => false,
-                ]),
-            ],
-        );
-    }
-
-    public function tearDown(): void
-    {
-    }
-
-    public function testValue(): void
-    {
-        // Test for Success
-        $this->assertEquals($this->validator->isValid(Query::limit(1)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::limit(0)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::limit(100)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(1)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(0)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(5000)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORAFTER, values: ['asdf'])), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: ['asdf'])), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::equal('attr', ['v'])), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::orderAsc('attr')), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::orderAsc('')), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::orderDesc('attr')), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::orderDesc('')), true, $this->validator->getDescription());
-
-        // Test for Failure
-        $this->assertEquals($this->validator->isValid(Query::limit(-1)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::equal('dne', ['v'])), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::equal('', ['v'])), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::orderDesc('dne')), false, $this->validator->getDescription());
-    }
-
-    public function testValues(): void
-    {
-
-        $validator = new Queries($this->validator);
-
-        // Test for Success
-        $this->assertEquals($validator->isValid(['limit(1)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(0)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(100)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(1)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(0)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(5000)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(25)', 'offset(25)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['cursorAfter("asdf")']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['cursorBefore("asdf")']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['equal("attr", "v")']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['orderAsc("attr")']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['orderAsc("")']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['orderDesc("attr")']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['orderDesc("")']), true, $validator->getDescription());
-
-        // Test for Failure
-        $this->assertEquals($validator->isValid(['limit(-1)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(101)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(-1)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(5001)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['equal("dne", "v")']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['equal("", "v")']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['orderDesc("dne")']), false, $validator->getDescription());
-    }
-}
diff --git a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQueryTest.php b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQueryTest.php
deleted file mode 100644
index 1ae43ae37f..0000000000
--- a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorFilterQueryTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Tests\Unit\Utopia\Database\Validator\Queries;
-
-use Appwrite\Utopia\Database\Validator\Queries;
-use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetCursorFilterQuery;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Query;
-use Utopia\Validator;
-use PHPUnit\Framework\TestCase;
-
-class LimitOffsetCursorFilterQueryTest extends TestCase
-{
-    /**
-     * @var Validator
-     */
-    protected $validator = null;
-
-    public function setUp(): void
-    {
-        $this->validator = new LimitOffsetCursorFilterQuery(
-            attributes: [
-                new Document([
-                    'key' => 'attr',
-                    'type' => Database::VAR_STRING,
-                    'array' => false,
-                ]),
-            ],
-        );
-    }
-
-    public function tearDown(): void
-    {
-    }
-
-    public function testValue(): void
-    {
-        // Test for Success
-        $this->assertEquals($this->validator->isValid(Query::limit(1)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::limit(0)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::limit(100)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(1)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(0)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(5000)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORAFTER, values: ['asdf'])), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: ['asdf'])), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::equal('attr', ['v'])), true, $this->validator->getDescription());
-
-        // Test for Failure
-        $this->assertEquals($this->validator->isValid(Query::limit(-1)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::orderAsc('attr')), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::orderDesc('attr')), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::equal('dne', ['v'])), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::equal('', ['v'])), false, $this->validator->getDescription());
-    }
-
-    public function testValues(): void
-    {
-
-        $validator = new Queries($this->validator);
-
-        // Test for Success
-        $this->assertEquals($validator->isValid(['limit(1)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(0)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(100)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(1)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(0)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(5000)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(25)', 'offset(25)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['cursorAfter("asdf")']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['cursorBefore("asdf")']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['equal("attr", "v")']), true, $validator->getDescription());
-
-        // Test for Failure
-        $this->assertEquals($validator->isValid(['limit(-1)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(101)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(-1)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(5001)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['orderAsc("attr")']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['orderDesc("attr")']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['equal("dne", "v")']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['equal("", "v")']), false, $validator->getDescription());
-    }
-}
diff --git a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorQueryTest.php b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorQueryTest.php
deleted file mode 100644
index 77e6a1e257..0000000000
--- a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetCursorQueryTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Tests\Unit\Utopia\Database\Validator\Queries;
-
-use Appwrite\Utopia\Database\Validator\Queries;
-use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetCursorQuery;
-use Utopia\Database\Query;
-use Utopia\Validator;
-use PHPUnit\Framework\TestCase;
-
-class LimitOffsetCursorQueryTest extends TestCase
-{
-    /**
-     * @var Validator
-     */
-    protected $validator = null;
-
-    public function setUp(): void
-    {
-        $this->validator = new LimitOffsetCursorQuery();
-    }
-
-    public function tearDown(): void
-    {
-    }
-
-    public function testValue(): void
-    {
-        // Test for Success
-        $this->assertEquals($this->validator->isValid(Query::limit(1)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::limit(0)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::limit(100)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(1)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(0)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(5000)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORAFTER, values: ['asdf'])), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: ['asdf'])), true, $this->validator->getDescription());
-
-        // Test for Failure
-        $this->assertEquals($this->validator->isValid(Query::limit(-1)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::equal('attr', ['v'])), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::orderAsc('attr')), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::orderDesc('attr')), false, $this->validator->getDescription());
-    }
-
-    public function testValues(): void
-    {
-
-        $validator = new Queries($this->validator);
-
-        // Test for Success
-        $this->assertEquals($validator->isValid(['limit(1)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(0)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(100)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(1)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(0)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(5000)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(25)', 'offset(25)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['cursorAfter("asdf")']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['cursorBefore("asdf")']), true, $validator->getDescription());
-
-        // Test for Failure
-        $this->assertEquals($validator->isValid(['limit(-1)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(101)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(-1)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(5001)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['equal("attr", "v")']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['orderAsc("attr")']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['orderDesc("attr")']), false, $validator->getDescription());
-    }
-}
diff --git a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetQueryTest.php b/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetQueryTest.php
deleted file mode 100644
index 724a1e5939..0000000000
--- a/tests/unit/Utopia/Database/Validator/Queries/LimitOffsetQueryTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Tests\Unit\Utopia\Database\Validator\Queries;
-
-use Appwrite\Utopia\Database\Validator\Queries;
-use Appwrite\Utopia\Database\Validator\Queries\LimitOffsetQuery;
-use Utopia\Database\Query;
-use Utopia\Validator;
-use PHPUnit\Framework\TestCase;
-
-class LimitOffsetQueryTest extends TestCase
-{
-    /**
-     * @var Validator
-     */
-    protected $validator = null;
-
-    public function setUp(): void
-    {
-        $this->validator = new LimitOffsetQuery();
-    }
-
-    public function tearDown(): void
-    {
-    }
-
-    public function testValue(): void
-    {
-        // Test for Success
-        $this->assertEquals($this->validator->isValid(Query::limit(1)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::limit(0)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::limit(100)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(1)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(0)), true, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(5000)), true, $this->validator->getDescription());
-
-        // Test for Failure
-        $this->assertEquals($this->validator->isValid(Query::limit(-1)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORAFTER, values: ['asdf'])), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: ['asdf'])), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::equal('attr', ['v'])), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::orderAsc('attr')), false, $this->validator->getDescription());
-        $this->assertEquals($this->validator->isValid(Query::orderDesc('attr')), false, $this->validator->getDescription());
-    }
-
-    public function testValues(): void
-    {
-
-        $validator = new Queries($this->validator);
-
-        // Test for Success
-        $this->assertEquals($validator->isValid(['limit(1)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(0)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(100)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(1)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(0)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(5000)']), true, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(25)', 'offset(25)']), true, $validator->getDescription());
-
-        // Test for Failure
-        $this->assertEquals($validator->isValid(['limit(-1)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['limit(101)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(-1)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['offset(5001)']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['cursorAfter("asdf")']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['cursorBefore("asdf")']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['equal("attr", "v")']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['orderAsc("attr")']), false, $validator->getDescription());
-        $this->assertEquals($validator->isValid(['orderDesc("attr")']), false, $validator->getDescription());
-    }
-}
diff --git a/tests/unit/Utopia/Database/Validator/Queries/UsersTest.php b/tests/unit/Utopia/Database/Validator/Queries/UsersTest.php
new file mode 100644
index 0000000000..24a818c128
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/Queries/UsersTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Users;
+use PHPUnit\Framework\TestCase;
+
+class UsersTest extends TestCase
+{
+    public function setUp(): void
+    {
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testIsValid(): void
+    {
+        $validator = new Users();
+
+        /**
+         * Test for Success
+         */
+        $this->assertEquals(true, $validator->isValid([]), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['equal("name", "value")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['equal("email", "value")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['equal("phone", "value")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['greaterThan("passwordUpdate", "2020-10-15 06:38")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['greaterThan("registration", "2020-10-15 06:38")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['equal("emailVerification", true)']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['equal("phoneVerification", true)']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['search("search", "value")']), $validator->getDescription());
+
+        /**
+         * Test for Failure
+         */
+        $this->assertEquals(false, $validator->isValid(['equal("password", "value")']), $validator->getDescription());
+    }
+}
diff --git a/tests/unit/Utopia/Database/Validator/QueriesTest.php b/tests/unit/Utopia/Database/Validator/QueriesTest.php
new file mode 100644
index 0000000000..55e04c2b84
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/QueriesTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator;
+
+use Appwrite\Utopia\Database\Validator\Queries;
+use Appwrite\Utopia\Database\Validator\Query\Cursor;
+use Appwrite\Utopia\Database\Validator\Query\Filter;
+use Appwrite\Utopia\Database\Validator\Query\Limit;
+use Appwrite\Utopia\Database\Validator\Query\Offset;
+use Appwrite\Utopia\Database\Validator\Query\Order;
+use PHPUnit\Framework\TestCase;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+
+class QueriesTest extends TestCase
+{
+    public function setUp(): void
+    {
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testEmptyQueries(): void
+    {
+        $validator = new Queries();
+
+        $this->assertEquals(true, $validator->isValid([]));
+    }
+
+    public function testInvalidQuery(): void
+    {
+        $validator = new Queries();
+
+        $this->assertEquals(false, $validator->isValid(["this.is.invalid"]));
+    }
+
+    public function testInvalidMethod(): void
+    {
+        $validator = new Queries();
+        $this->assertEquals(false, $validator->isValid(['equal("attr", "value")']));
+
+        $validator = new Queries(new Limit());
+        $this->assertEquals(false, $validator->isValid(['equal("attr", "value")']));
+    }
+
+    public function testInvalidValue(): void
+    {
+        $validator = new Queries(new Limit());
+        $this->assertEquals(false, $validator->isValid(['limit(-1)']));
+    }
+
+    public function testValid(): void
+    {
+        $attributes = [
+            new Document([
+                'key' => 'name',
+                'type' => Database::VAR_STRING,
+                'array' => false,
+            ])
+        ];
+        $validator = new Queries(
+            new Cursor(),
+            new Filter($attributes),
+            new Limit(),
+            new Offset(),
+            new Order($attributes),
+        );
+        $this->assertEquals(true, $validator->isValid(['cursorAfter("asdf")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['equal("name", "value")']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['limit(10)']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['offset(10)']), $validator->getDescription());
+        $this->assertEquals(true, $validator->isValid(['orderAsc("name")']), $validator->getDescription());
+    }
+}
diff --git a/tests/unit/Utopia/Database/Validator/Query/CursorTest.php b/tests/unit/Utopia/Database/Validator/Query/CursorTest.php
new file mode 100644
index 0000000000..0afc8baddd
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/Query/CursorTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator\Query;
+
+use Appwrite\Utopia\Database\Validator\Query\Base;
+use Appwrite\Utopia\Database\Validator\Query\Cursor;
+use Utopia\Database\Query;
+use PHPUnit\Framework\TestCase;
+
+class CursorTest extends TestCase
+{
+    /**
+     * @var Base
+     */
+    protected $validator = null;
+
+    public function setUp(): void
+    {
+        $this->validator = new Cursor();
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testValue(): void
+    {
+        // Test for Success
+        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORAFTER, values: ['asdf'])), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: ['asdf'])), true, $this->validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($this->validator->isValid(Query::limit(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('attr', ['v'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderAsc('attr')), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderDesc('attr')), false, $this->validator->getDescription());
+    }
+}
diff --git a/tests/unit/Utopia/Database/Validator/Query/FilterTest.php b/tests/unit/Utopia/Database/Validator/Query/FilterTest.php
new file mode 100644
index 0000000000..8f2f1d44ba
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/Query/FilterTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator\Query;
+
+use Appwrite\Utopia\Database\Validator\Query\Base;
+use Appwrite\Utopia\Database\Validator\Query\Filter;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
+use PHPUnit\Framework\TestCase;
+
+class FilterTest extends TestCase
+{
+    /**
+     * @var Base
+     */
+    protected $validator = null;
+
+    public function setUp(): void
+    {
+        $this->validator = new Filter(
+            attributes: [
+                new Document([
+                    'key' => 'attr',
+                    'type' => Database::VAR_STRING,
+                    'array' => false,
+                ]),
+            ],
+        );
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testValue(): void
+    {
+        // Test for Success
+        $this->assertEquals($this->validator->isValid(Query::equal('attr', ['v'])), true, $this->validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($this->validator->isValid(Query::limit(1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(0)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(100)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(0)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5000)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('dne', ['v'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('', ['v'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderAsc('attr')), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderDesc('attr')), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORAFTER, values: ['asdf'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(new Query(Query::TYPE_CURSORBEFORE, values: ['asdf'])), false, $this->validator->getDescription());
+    }
+}
diff --git a/tests/unit/Utopia/Database/Validator/Query/LimitTest.php b/tests/unit/Utopia/Database/Validator/Query/LimitTest.php
new file mode 100644
index 0000000000..e37cb49624
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/Query/LimitTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator\Query;
+
+use Appwrite\Utopia\Database\Validator\Query\Base;
+use Appwrite\Utopia\Database\Validator\Query\Limit;
+use Utopia\Database\Query;
+use PHPUnit\Framework\TestCase;
+
+class LimitTest extends TestCase
+{
+    /**
+     * @var Base
+     */
+    protected $validator = null;
+
+    public function setUp(): void
+    {
+        $this->validator = new Limit();
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testValue(): void
+    {
+        // Test for Success
+        $this->assertEquals($this->validator->isValid(Query::limit(1)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(0)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(100)), true, $this->validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($this->validator->isValid(Query::limit(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
+    }
+}
diff --git a/tests/unit/Utopia/Database/Validator/Query/OffsetTest.php b/tests/unit/Utopia/Database/Validator/Query/OffsetTest.php
new file mode 100644
index 0000000000..8f7010c718
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/Query/OffsetTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator\Query;
+
+use Appwrite\Utopia\Database\Validator\Query\Base;
+use Appwrite\Utopia\Database\Validator\Query\Offset;
+use Utopia\Database\Query;
+use PHPUnit\Framework\TestCase;
+
+class OffsetTest extends TestCase
+{
+    /**
+     * @var Base
+     */
+    protected $validator = null;
+
+    public function setUp(): void
+    {
+        $this->validator = new Offset();
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testValue(): void
+    {
+        // Test for Success
+        $this->assertEquals($this->validator->isValid(Query::offset(1)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(0)), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5000)), true, $this->validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('attr', ['v'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderAsc('attr')), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderDesc('attr')), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(100)), false, $this->validator->getDescription());
+    }
+}
diff --git a/tests/unit/Utopia/Database/Validator/Query/OrderTest.php b/tests/unit/Utopia/Database/Validator/Query/OrderTest.php
new file mode 100644
index 0000000000..e60b7ce9b9
--- /dev/null
+++ b/tests/unit/Utopia/Database/Validator/Query/OrderTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Tests\Unit\Utopia\Database\Validator\Query;
+
+use Appwrite\Utopia\Database\Validator\Query\Base;
+use Appwrite\Utopia\Database\Validator\Query\Order;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
+use PHPUnit\Framework\TestCase;
+
+class OrderTest extends TestCase
+{
+    /**
+     * @var Base
+     */
+    protected $validator = null;
+
+    public function setUp(): void
+    {
+        $this->validator = new Order(
+            attributes: [
+                new Document([
+                    'key' => 'attr',
+                    'type' => Database::VAR_STRING,
+                    'array' => false,
+                ]),
+            ],
+        );
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testValue(): void
+    {
+        // Test for Success
+        $this->assertEquals($this->validator->isValid(Query::orderAsc('attr')), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderAsc('')), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderDesc('attr')), true, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderDesc('')), true, $this->validator->getDescription());
+
+        // Test for Failure
+        $this->assertEquals($this->validator->isValid(Query::limit(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::limit(101)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(-1)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::offset(5001)), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('attr', ['v'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('dne', ['v'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::equal('', ['v'])), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderDesc('dne')), false, $this->validator->getDescription());
+    }
+}

From f15f8e7bf03892e74d130c267c629973333334ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Thu, 25 Aug 2022 09:34:36 +0000
Subject: [PATCH 23/28] Linter fix

---
 app/controllers/api/users.php |  6 ++++--
 composer.lock                 | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index c99d3b41d0..6d7529ce7e 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -738,7 +738,8 @@ App::patch('/v1/users/:userId/name')
 
         $user
             ->setAttribute('name', $name)
-            ->setAttribute('search', \implode(' ', [$user->getId(), $user->getAttribute('email', ''), $name, $user->getAttribute('phone', '')]));;
+            ->setAttribute('search', \implode(' ', [$user->getId(), $user->getAttribute('email', ''), $name, $user->getAttribute('phone', '')]));
+        ;
 
         $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
@@ -864,7 +865,8 @@ App::patch('/v1/users/:userId/phone')
         $user
             ->setAttribute('phone', $number)
             ->setAttribute('phoneVerification', false)
-            ->setAttribute('search', implode(' ', [$user->getId(), $user->getAttribute('name', ''), $user->getAttribute('email', ''), $number]));;
+            ->setAttribute('search', implode(' ', [$user->getId(), $user->getAttribute('name', ''), $user->getAttribute('email', ''), $number]));
+        ;
 
         try {
             $user = $dbForProject->updateDocument('users', $user->getId(), $user);
diff --git a/composer.lock b/composer.lock
index 0da13d2de3..39ac8e206c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2056,12 +2056,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/database.git",
-                "reference": "44dda6914c7be148eb59ce11847386ce39f7b106"
+                "reference": "336df0d08d8bd875acd6b2b87d7b24133aa016f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/44dda6914c7be148eb59ce11847386ce39f7b106",
-                "reference": "44dda6914c7be148eb59ce11847386ce39f7b106",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/336df0d08d8bd875acd6b2b87d7b24133aa016f5",
+                "reference": "336df0d08d8bd875acd6b2b87d7b24133aa016f5",
                 "shasum": ""
             },
             "require": {
@@ -2112,7 +2112,7 @@
                 "issues": "https://github.com/utopia-php/database/issues",
                 "source": "https://github.com/utopia-php/database/tree/refactor-permissions"
             },
-            "time": "2022-08-24T10:22:04+00:00"
+            "time": "2022-08-25T08:19:47+00:00"
         },
         {
             "name": "utopia-php/domains",
@@ -5390,5 +5390,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

From bc73b7bbf04d205afc513c5d549a20eac42d522b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Thu, 25 Aug 2022 10:28:13 +0000
Subject: [PATCH 24/28] Fix bugs after merge

---
 app/controllers/api/databases.php | 5 ++---
 app/controllers/api/users.php     | 8 ++------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 9bb443edf0..18e87aceb3 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -1278,9 +1278,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti
     ->inject('response')
     ->inject('dbForProject')
     ->inject('database')
-    ->inject('usage')
     ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?bool $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Stats $usage, Event $events) {
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?bool $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
 
         $attribute = createAttribute($databaseId, $collectionId, new Document([
             'key' => $key,
@@ -1290,7 +1289,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti
             'default' => $default,
             'array' => $array,
             'filters' => ['datetime']
-        ]), $response, $dbForProject, $database, $events, $usage);
+        ]), $response, $dbForProject, $database, $events);
 
         $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
         $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_DATETIME);
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 6d7529ce7e..54ca96cb13 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -347,8 +347,7 @@ App::get('/v1/users')
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->inject('usage')
-    ->action(function (array $queries, string $search, Response $response, Database $dbForProject, Stats $usage) {
+    ->action(function (array $queries, string $search, Response $response, Database $dbForProject) {
 
         $queries = Query::parseQueries($queries);
 
@@ -375,8 +374,6 @@ App::get('/v1/users')
 
         $filterQueries = Query::groupByType($queries)['filters'];
 
-        $usage->setParam('users.read', 1);
-
         $response->dynamic(new Document([
             'users' => $dbForProject->find('users', $queries),
             'total' => $dbForProject->count('users', $filterQueries, APP_LIMIT_COUNT),
@@ -537,8 +534,7 @@ App::get('/v1/users/:userId/logs')
     ->inject('dbForProject')
     ->inject('locale')
     ->inject('geodb')
-    ->inject('usage')
-    ->action(function (string $userId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Stats $usage) {
+    ->action(function (string $userId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
 
         $user = $dbForProject->getDocument('users', $userId);
 

From 793fbff7f56f733c6aaa4f7648e974036fb3ac3e Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Sat, 27 Aug 2022 20:23:20 +0000
Subject: [PATCH 25/28] feat: update dependencies

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index f8325a3773..f0f182d8c2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5383,5 +5383,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }

From 6b5a0cbd4fd4502e570a4df3bbcf80ae5eb6b142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Mon, 29 Aug 2022 08:49:00 +0000
Subject: [PATCH 26/28] Fix bug after merge comflict

---
 app/controllers/api/databases.php |  2 +-
 composer.lock                     | 78 +++++++++++++++++--------------
 2 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 2a3c07f353..7df980a78f 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -2028,7 +2028,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
 
         $allQueries = \array_merge($filterQueries, $otherQueries);
 
-        if ($documentSecurity) {
+        if ($documentSecurity && !$valid) {
             $documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $allQueries);
             $total = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $filterQueries, APP_LIMIT_COUNT);
         } else {
diff --git a/composer.lock b/composer.lock
index f0f182d8c2..d2f881d7cc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -481,16 +481,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.4.5",
+            "version": "7.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
+                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
-                "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
                 "shasum": ""
             },
             "require": {
@@ -505,10 +505,10 @@
                 "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
+                "bamarni/composer-bin-plugin": "^1.8.1",
                 "ext-curl": "*",
                 "php-http/client-integration-tests": "^3.0",
-                "phpunit/phpunit": "^8.5.5 || ^9.3.5",
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -518,8 +518,12 @@
             },
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                },
                 "branch-alias": {
-                    "dev-master": "7.4-dev"
+                    "dev-master": "7.5-dev"
                 }
             },
             "autoload": {
@@ -585,7 +589,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.4.5"
+                "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
             },
             "funding": [
                 {
@@ -601,20 +605,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-20T22:16:13+00:00"
+            "time": "2022-08-28T15:39:27+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.1",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
                 "shasum": ""
             },
             "require": {
@@ -669,7 +673,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.1"
+                "source": "https://github.com/guzzle/promises/tree/1.5.2"
             },
             "funding": [
                 {
@@ -685,20 +689,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-22T20:56:57+00:00"
+            "time": "2022-08-28T14:55:35+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.4.0",
+            "version": "2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "13388f00956b1503577598873fffb5ae994b5737"
+                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
-                "reference": "13388f00956b1503577598873fffb5ae994b5737",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379",
+                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379",
                 "shasum": ""
             },
             "require": {
@@ -712,15 +716,19 @@
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
+                "bamarni/composer-bin-plugin": "^1.8.1",
                 "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.8 || ^9.3.10"
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                },
                 "branch-alias": {
                     "dev-master": "2.4-dev"
                 }
@@ -784,7 +792,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.4.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.4.1"
             },
             "funding": [
                 {
@@ -800,7 +808,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-20T21:43:11+00:00"
+            "time": "2022-08-28T14:45:39+00:00"
         },
         {
             "name": "influxdb/influxdb-php",
@@ -2833,12 +2841,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "1a67d9dcd2884a6a708176955f83e319ac53059e"
+                "reference": "bf05fc00755b9d27dac530669ca834f3ceb655ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/1a67d9dcd2884a6a708176955f83e319ac53059e",
-                "reference": "1a67d9dcd2884a6a708176955f83e319ac53059e",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/bf05fc00755b9d27dac530669ca834f3ceb655ec",
+                "reference": "bf05fc00755b9d27dac530669ca834f3ceb655ec",
                 "shasum": ""
             },
             "require": {
@@ -2876,7 +2884,7 @@
                 "issues": "https://github.com/appwrite/sdk-generator/issues",
                 "source": "https://github.com/appwrite/sdk-generator/tree/master"
             },
-            "time": "2022-08-19T10:03:22+00:00"
+            "time": "2022-08-28T04:14:32+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -4802,16 +4810,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "3.0.0",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
+                "reference": "fb44e1cc6e557418387ad815780360057e40753e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb44e1cc6e557418387ad815780360057e40753e",
+                "reference": "fb44e1cc6e557418387ad815780360057e40753e",
                 "shasum": ""
             },
             "require": {
@@ -4823,7 +4831,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -4846,7 +4854,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.1.0"
             },
             "funding": [
                 {
@@ -4854,7 +4862,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-15T09:54:48+00:00"
+            "time": "2022-08-29T06:55:37+00:00"
         },
         {
             "name": "sebastian/version",
@@ -5383,5 +5391,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

From 56282fb2fa96fdd1e3dbe04bcdb370eb1c475d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Mon, 29 Aug 2022 09:16:18 +0000
Subject: [PATCH 27/28] Fix users logs test

---
 tests/e2e/Services/Users/UsersBase.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/e2e/Services/Users/UsersBase.php b/tests/e2e/Services/Users/UsersBase.php
index f2e498366b..88bb8872e9 100644
--- a/tests/e2e/Services/Users/UsersBase.php
+++ b/tests/e2e/Services/Users/UsersBase.php
@@ -984,7 +984,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'limit' => 1
+            'queries' => [ 'limit(1)' ],
         ]);
 
         $this->assertEquals($logs['headers']['status-code'], 200);
@@ -996,7 +996,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'offset' => 1
+            'queries' => [ 'offset(1)' ],
         ]);
 
         $this->assertEquals($logs['headers']['status-code'], 200);
@@ -1007,8 +1007,7 @@ trait UsersBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'offset' => 1,
-            'limit' => 1
+            'queries' => [ 'limit(1)', 'offset(1)' ],
         ]);
 
         $this->assertEquals($logs['headers']['status-code'], 200);

From b8f6393df6ab538621812bc99ecc90f81d8fd2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 30 Aug 2022 08:57:10 +0000
Subject: [PATCH 28/28] PR review changes

---
 composer.lock                                            | 8 ++++----
 src/Appwrite/Utopia/Database/Validator/Queries.php       | 1 +
 src/Appwrite/Utopia/Database/Validator/Query/Base.php    | 9 ---------
 tests/unit/Utopia/Database/Validator/Query/LimitTest.php | 2 +-
 .../unit/Utopia/Database/Validator/Query/OffsetTest.php  | 2 +-
 tests/unit/Utopia/Database/Validator/Query/OrderTest.php | 1 +
 6 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/composer.lock b/composer.lock
index d2f881d7cc..ebecc59afb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2841,12 +2841,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "bf05fc00755b9d27dac530669ca834f3ceb655ec"
+                "reference": "6e630a62f522ac68a7056bebf81cd032c7a053ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/bf05fc00755b9d27dac530669ca834f3ceb655ec",
-                "reference": "bf05fc00755b9d27dac530669ca834f3ceb655ec",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/6e630a62f522ac68a7056bebf81cd032c7a053ba",
+                "reference": "6e630a62f522ac68a7056bebf81cd032c7a053ba",
                 "shasum": ""
             },
             "require": {
@@ -2884,7 +2884,7 @@
                 "issues": "https://github.com/appwrite/sdk-generator/issues",
                 "source": "https://github.com/appwrite/sdk-generator/tree/master"
             },
-            "time": "2022-08-28T04:14:32+00:00"
+            "time": "2022-08-29T10:43:33+00:00"
         },
         {
             "name": "doctrine/instantiator",
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries.php b/src/Appwrite/Utopia/Database/Validator/Queries.php
index ec77971496..1e9fe8f208 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries.php
@@ -114,6 +114,7 @@ class Queries extends Validator
 
         return true;
     }
+
     /**
      * Is array
      *
diff --git a/src/Appwrite/Utopia/Database/Validator/Query/Base.php b/src/Appwrite/Utopia/Database/Validator/Query/Base.php
index b23d594ea7..71a1497d29 100644
--- a/src/Appwrite/Utopia/Database/Validator/Query/Base.php
+++ b/src/Appwrite/Utopia/Database/Validator/Query/Base.php
@@ -54,15 +54,6 @@ abstract class Base extends Validator
         return self::TYPE_OBJECT;
     }
 
-    /**
-     * Is valid.
-     *
-     * @param Query $value
-     *
-     * @return bool
-     */
-    abstract public function isValid($query): bool;
-
     /**
      * Returns what type of query this Validator is for
      */
diff --git a/tests/unit/Utopia/Database/Validator/Query/LimitTest.php b/tests/unit/Utopia/Database/Validator/Query/LimitTest.php
index e37cb49624..1594d0db1f 100644
--- a/tests/unit/Utopia/Database/Validator/Query/LimitTest.php
+++ b/tests/unit/Utopia/Database/Validator/Query/LimitTest.php
@@ -16,7 +16,7 @@ class LimitTest extends TestCase
 
     public function setUp(): void
     {
-        $this->validator = new Limit();
+        $this->validator = new Limit(100);
     }
 
     public function tearDown(): void
diff --git a/tests/unit/Utopia/Database/Validator/Query/OffsetTest.php b/tests/unit/Utopia/Database/Validator/Query/OffsetTest.php
index 8f7010c718..4a29117e83 100644
--- a/tests/unit/Utopia/Database/Validator/Query/OffsetTest.php
+++ b/tests/unit/Utopia/Database/Validator/Query/OffsetTest.php
@@ -16,7 +16,7 @@ class OffsetTest extends TestCase
 
     public function setUp(): void
     {
-        $this->validator = new Offset();
+        $this->validator = new Offset(5000);
     }
 
     public function tearDown(): void
diff --git a/tests/unit/Utopia/Database/Validator/Query/OrderTest.php b/tests/unit/Utopia/Database/Validator/Query/OrderTest.php
index e60b7ce9b9..fe1b42d5c1 100644
--- a/tests/unit/Utopia/Database/Validator/Query/OrderTest.php
+++ b/tests/unit/Utopia/Database/Validator/Query/OrderTest.php
@@ -50,5 +50,6 @@ class OrderTest extends TestCase
         $this->assertEquals($this->validator->isValid(Query::equal('dne', ['v'])), false, $this->validator->getDescription());
         $this->assertEquals($this->validator->isValid(Query::equal('', ['v'])), false, $this->validator->getDescription());
         $this->assertEquals($this->validator->isValid(Query::orderDesc('dne')), false, $this->validator->getDescription());
+        $this->assertEquals($this->validator->isValid(Query::orderAsc('dne')), false, $this->validator->getDescription());
     }
 }