From 926d1c64599e4aa2e4f167c2c4e08f928672858a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Fri, 19 Aug 2022 14:14:39 +0000
Subject: [PATCH 01/33] Fix incorrect endpoint information

---
 app/controllers/api/databases.php     | 6 +++---
 docs/references/databases/get-logs.md | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 docs/references/databases/get-logs.md

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 321f3c5829..795527600d 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -315,13 +315,13 @@ App::get('/v1/databases/:databaseId')
     });
 
 App::get('/v1/databases/:databaseId/logs')
-    ->desc('List Collection Logs')
+    ->desc('List Database Logs')
     ->groups(['api', 'database'])
-    ->label('scope', 'collections.read')
+    ->label('scope', 'databases.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
     ->label('sdk.namespace', 'databases')
     ->label('sdk.method', 'listLogs')
-    ->label('sdk.description', '/docs/references/databases/get-collection-logs.md')
+    ->label('sdk.description', '/docs/references/databases/get-logs.md')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_LOG_LIST)
diff --git a/docs/references/databases/get-logs.md b/docs/references/databases/get-logs.md
new file mode 100644
index 0000000000..8e49da4603
--- /dev/null
+++ b/docs/references/databases/get-logs.md
@@ -0,0 +1 @@
+Get the database activity logs list by its unique ID.
\ No newline at end of file

From da73dc7fcb4b621bf94bda61834ad4d275a4c785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 08:37:31 +0000
Subject: [PATCH 02/33] Fix users queries allowed params

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

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
index ffe30f1209..76321394c1 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
@@ -7,6 +7,10 @@ use Appwrite\Utopia\Database\Validator\Queries\Collection;
 class Users extends Collection
 {
     public const ALLOWED_ATTRIBUTES = [
+        '$id',
+        '$createdAt',
+        '$updatedAt',
+        
         'name',
         'email',
         'phone',
@@ -14,8 +18,7 @@ class Users extends Collection
         'passwordUpdate',
         'registration',
         'emailVerification',
-        'phoneVerification',
-        'search',
+        'phoneVerification'
     ];
 
     /**

From 6fcd3757fef4cc5625aa735d1e37c34bae45b24e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 08:37:55 +0000
Subject: [PATCH 03/33] Upgrade listBuckets queries

---
 app/controllers/api/storage.php               | 38 ++++++++++---------
 .../Database/Validator/Queries/Buckets.php    | 30 +++++++++++++++
 2 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index de69bd1351..4920ba92bd 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -25,6 +25,7 @@ use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Permissions;
 use Utopia\Database\Validator\UID;
 use Appwrite\Extend\Exception;
+use Appwrite\Utopia\Database\Validator\Queries\Buckets;
 use Utopia\Image\Image;
 use Utopia\Storage\Compression\Algorithms\GZIP;
 use Utopia\Storage\Device;
@@ -154,41 +155,42 @@ App::get('/v1/storage/buckets')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_BUCKET_LIST)
+    ->param('queries', [], new Buckets(), '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(', ', Buckets::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), 'Results limit value. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
-    ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
-    ->param('cursor', '', new UID(), 'ID of the bucket used as the starting point for the query, excluding the bucket itself. Should be used for efficient pagination when working with large sets of data.', 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 ' .  Database::ORDER_ASC . ' or ' .  Database::ORDER_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) {
-
-        $filterQueries = [];
+    ->action(function (array $queries, string $search, Response $response, Database $dbForProject, Stats $usage) {
+        
+        $queries = Query::parseQueries($queries);
 
         if (!empty($search)) {
-            $filterQueries[] = Query::search('name', $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('buckets', $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 */
+            $bucketId = $cursor->getValue();
+            $cursorDocument = $dbForProject->getDocument('buckets', $bucketId);
 
             if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Bucket '{$cursor}' for the 'cursor' value not found.");
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Bucket '{$bucketId}' 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('storage.buckets.read', 1);
 
         $response->dynamic(new Document([
-            'buckets' => $dbForProject->find('buckets', \array_merge($filterQueries, $queries)),
+            'buckets' => $dbForProject->find('buckets', $queries),
             'total' => $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT),
         ]), Response::MODEL_BUCKET_LIST);
     });
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
new file mode 100644
index 0000000000..e14b74ea3d
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Collection;
+
+class Buckets extends Collection
+{
+    public const ALLOWED_ATTRIBUTES = [
+        '$id',
+        '$createdAt',
+        '$updatedAt',
+        
+        'enabled',
+        'name',
+        'fileSecurity',
+        'maximumFileSize',
+        'encryption',
+        'antivirus'
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('buckets', self::ALLOWED_ATTRIBUTES);
+    }
+}

From d1f6cb31d6d4fce27210d85f548388affc6b4f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 08:49:39 +0000
Subject: [PATCH 04/33] Upgrade listFiles queries

---
 app/controllers/api/storage.php               | 38 ++++++++++---------
 .../Database/Validator/Queries/Files.php      | 30 +++++++++++++++
 2 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Files.php

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index 4920ba92bd..1e472815fc 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -26,6 +26,7 @@ use Utopia\Database\Validator\Permissions;
 use Utopia\Database\Validator\UID;
 use Appwrite\Extend\Exception;
 use Appwrite\Utopia\Database\Validator\Queries\Buckets;
+use Appwrite\Utopia\Database\Validator\Queries\Files;
 use Utopia\Image\Image;
 use Utopia\Storage\Compression\Algorithms\GZIP;
 use Utopia\Storage\Device;
@@ -684,17 +685,13 @@ App::get('/v1/storage/buckets/:bucketId/files')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FILE_LIST)
     ->param('bucketId', null, new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->param('queries', [], new Files(), '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(', ', Files::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 files 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 file used as the starting point for the query, excluding the file 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 ' . Database::ORDER_ASC . ' or ' . Database::ORDER_DESC . ' order.', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('usage')
     ->inject('mode')
-    ->action(function (string $bucketId, string $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject, Stats $usage, string $mode) {
+    ->action(function (string $bucketId, array $queries, string $search, Response $response, Database $dbForProject, Stats $usage, string $mode) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
@@ -707,31 +704,36 @@ App::get('/v1/storage/buckets/:bucketId/files')
             throw new Exception(Exception::USER_UNAUTHORIZED);
         }
 
-        $filterQueries = [];
+        $queries = Query::parseQueries($queries);
 
         if (!empty($search)) {
-            $filterQueries[] = Query::search('name', $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('bucket_' . $bucket->getInternalId(), $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 */
+            $fileId = $cursor->getValue();
+            $cursorDocument = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
 
             if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "File '{$cursor}' for the 'cursor' value not found.");
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "File '{$fileId}' 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'];
+
         if ($bucket->getAttribute('fileSecurity', false)) {
-            $files = $dbForProject->find('bucket_' . $bucket->getInternalId(), \array_merge($filterQueries, $queries));
+            $files = $dbForProject->find('bucket_' . $bucket->getInternalId(), $queries);
             $total = $dbForProject->count('bucket_' . $bucket->getInternalId(), $filterQueries, APP_LIMIT_COUNT);
         } else {
-            $files = Authorization::skip(fn () => $dbForProject->find('bucket_' . $bucket->getInternalId(), \array_merge($filterQueries, $queries)));
+            $files = Authorization::skip(fn () => $dbForProject->find('bucket_' . $bucket->getInternalId(), $queries));
             $total = Authorization::skip(fn () => $dbForProject->count('bucket_' . $bucket->getInternalId(), $filterQueries, APP_LIMIT_COUNT));
         }
 
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Files.php b/src/Appwrite/Utopia/Database/Validator/Queries/Files.php
new file mode 100644
index 0000000000..1fb9b39c5a
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Files.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Collection;
+
+class Files extends Collection
+{
+    public const ALLOWED_ATTRIBUTES = [
+        '$id',
+        '$createdAt',
+        '$updatedAt',
+        
+        'name',
+        'signature',
+        'mimeType',
+        'sizeOriginal',
+        'chunksTotal',
+        'chunksUploaded'
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('files', self::ALLOWED_ATTRIBUTES);
+    }
+}

From 6c971f6eceaec9c1630f44444b70a2cbf20bd2f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 08:56:28 +0000
Subject: [PATCH 05/33] Upgrade listTeams queries

---
 app/controllers/api/teams.php                 | 36 ++++++++++---------
 .../Database/Validator/Queries/Teams.php      | 26 ++++++++++++++
 2 files changed, 45 insertions(+), 17 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Teams.php

diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index f20f90049d..47c4b3e7cb 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -10,6 +10,7 @@ use Appwrite\Network\Validator\Email;
 use Appwrite\Network\Validator\Host;
 use Appwrite\Template\Template;
 use Appwrite\Utopia\Database\Validator\CustomId;
+use Appwrite\Utopia\Database\Validator\Queries\Teams;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
@@ -122,37 +123,38 @@ App::get('/v1/teams')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_TEAM_LIST)
+    ->param('queries', [], new Teams(), '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(', ', Teams::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 teams 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 team used as the starting point for the query, excluding the team 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', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function (string $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject) {
+    ->action(function (array $queries, string $search, Response $response, Database $dbForProject) {
 
-        $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('teams', $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 */
+            $teamId = $cursor->getValue();
+            $cursorDocument = $dbForProject->getDocument('teams', $teamId);
 
             if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Team '{$cursor}' for the 'cursor' value not found.");
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Team '{$teamId}' for the 'cursor' value not found.");
             }
 
-            $queries[] = $cursorDirection === Database::CURSOR_AFTER ? Query::cursorAfter($cursorDocument) : Query::cursorBefore($cursorDocument);
+            $cursor->setValue($cursorDocument);
         }
 
-        $results = $dbForProject->find('teams', \array_merge($filterQueries, $queries));
+        $filterQueries = Query::groupByType($queries)['filters'];
+
+        $results = $dbForProject->find('teams', $queries);
         $total = $dbForProject->count('teams', $filterQueries, APP_LIMIT_COUNT);
 
         $response->dynamic(new Document([
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php b/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php
new file mode 100644
index 0000000000..7aae93f65a
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Collection;
+
+class Teams extends Collection
+{
+    public const ALLOWED_ATTRIBUTES = [
+        '$id',
+        '$createdAt',
+        '$updatedAt',
+        
+        'name',
+        'total'
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('teams', self::ALLOWED_ATTRIBUTES);
+    }
+}

From 1eee0baa286f066ffc69ff6e2e62de72423d76be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 09:02:06 +0000
Subject: [PATCH 06/33] Upgrade listFunctions queries

---
 app/controllers/api/functions.php             | 36 ++++++++++---------
 .../Database/Validator/Queries/Functions.php  | 32 +++++++++++++++++
 2 files changed, 51 insertions(+), 17 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Functions.php

diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 2c38a529eb..9f79d77f93 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -22,6 +22,7 @@ use Utopia\Storage\Validator\Upload;
 use Appwrite\Utopia\Response;
 use Utopia\Swoole\Request;
 use Appwrite\Task\Validator\Cron;
+use Appwrite\Utopia\Database\Validator\Queries\Functions;
 use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
@@ -102,38 +103,39 @@ App::get('/v1/functions')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FUNCTION_LIST)
+    ->param('queries', [], new Functions(), '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(', ', Functions::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 functions 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('cursor', '', new UID(), 'ID of the function used as the starting point for the query, excluding the function 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 ' . Database::ORDER_ASC . ' or ' . Database::ORDER_DESC . ' order.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function (string $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject) {
+    ->action(function (array $queries, string $search, Response $response, Database $dbForProject) {
 
-        $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('functions', $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 */
+            $functionId = $cursor->getValue();
+            $cursorDocument = $dbForProject->getDocument('functions', $functionId);
 
             if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Function '{$cursor}' for the 'cursor' value not found.");
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Function '{$functionId}' 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'];
+
         $response->dynamic(new Document([
-            'functions' => $dbForProject->find('functions', \array_merge($filterQueries, $queries)),
+            'functions' => $dbForProject->find('functions', $queries),
             'total' => $dbForProject->count('functions', $filterQueries, APP_LIMIT_COUNT),
         ]), Response::MODEL_FUNCTION_LIST);
     });
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php b/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php
new file mode 100644
index 0000000000..8a08a8371a
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Collection;
+
+class Functions extends Collection
+{
+    public const ALLOWED_ATTRIBUTES = [
+        '$id',
+        '$createdAt',
+        '$updatedAt',
+        
+        'name',
+        'status',
+        'runtime',
+        'deployment',
+        'schedule',
+        'scheduleNext',
+        'schedulePrevious',
+        'timeout'
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('functions', self::ALLOWED_ATTRIBUTES);
+    }
+}

From a92f96bf805ee3be395a67051711e6c707d3c63f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 09:12:48 +0000
Subject: [PATCH 07/33] Upgrade listDeployments queries

---
 app/controllers/api/functions.php             | 41 ++++++++++---------
 .../Validator/Queries/Deployments.php         | 29 +++++++++++++
 2 files changed, 51 insertions(+), 19 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php

diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 9f79d77f93..ace753e938 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -22,6 +22,7 @@ use Utopia\Storage\Validator\Upload;
 use Appwrite\Utopia\Response;
 use Utopia\Swoole\Request;
 use Appwrite\Task\Validator\Cron;
+use Appwrite\Utopia\Database\Validator\Queries\Deployments;
 use Appwrite\Utopia\Database\Validator\Queries\Functions;
 use Utopia\App;
 use Utopia\Database\Database;
@@ -662,15 +663,11 @@ App::get('/v1/functions/:functionId/deployments')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_DEPLOYMENT_LIST)
     ->param('functionId', '', new UID(), 'Function ID.')
+    ->param('queries', [], new Deployments(), '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(', ', Deployments::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 deployments 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('cursor', '', new UID(), 'ID of the deployment used as the starting point for the query, excluding the deployment 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 ' . Database::ORDER_ASC . ' or ' . Database::ORDER_DESC . ' order.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function (string $functionId, string $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject) {
+    ->action(function (string $functionId, array $queries, string $search, Response $response, Database $dbForProject) {
 
         $function = $dbForProject->getDocument('functions', $functionId);
 
@@ -678,30 +675,36 @@ App::get('/v1/functions/:functionId/deployments')
             throw new Exception(Exception::FUNCTION_NOT_FOUND);
         }
 
-        $filterQueries = [];
+        $queries = Query::parseQueries($queries);
 
         if (!empty($search)) {
-            $filterQueries[] = Query::search('search', $search);
+            $queries[] = Query::search('search', $search);
         }
 
-        $filterQueries[] = Query::equal('resourceId', [$function->getId()]);
-        $filterQueries[] = Query::equal('resourceType', ['functions']);
+        // Set default limit
+        $queries[] = Query::limit(25);
 
-        $queries = [];
-        $queries[] = Query::limit($limit);
-        $queries[] = Query::offset($offset);
-        $queries[] = $orderType === Database::ORDER_ASC ? Query::orderAsc('') : Query::orderDesc('');
-        if (!empty($cursor)) {
-            $cursorDocument = $dbForProject->getDocument('deployments', $cursor);
+        // Set resource queries
+        $queries[] = Query::equal('resourceId', [$function->getId()]);
+        $queries[] = Query::equal('resourceType', ['functions']);
+
+        // 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 */
+            $deploymentId = $cursor->getValue();
+            $cursorDocument = $dbForProject->getDocument('deployments', $deploymentId);
 
             if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Tag '{$cursor}' for the 'cursor' value not found.");
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Deployment '{$deploymentId}' for the 'cursor' value not found.");
             }
 
-            $queries[] = $cursorDirection === Database::CURSOR_AFTER ? Query::cursorAfter($cursorDocument) : Query::cursorBefore($cursorDocument);
+            $cursor->setValue($cursorDocument);
         }
 
-        $results = $dbForProject->find('deployments', \array_merge($filterQueries, $queries));
+        $filterQueries = Query::groupByType($queries)['filters'];
+
+        $results = $dbForProject->find('deployments', $queries);
         $total = $dbForProject->count('deployments', $filterQueries, APP_LIMIT_COUNT);
 
         foreach ($results as $result) {
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php b/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
new file mode 100644
index 0000000000..2d4e2ca32d
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Collection;
+
+class Deployments extends Collection
+{
+    public const ALLOWED_ATTRIBUTES = [
+        '$id',
+        '$createdAt',
+        '$updatedAt',
+        
+        'entrypoint',
+        'size',
+        'buildId',
+        'activate',
+        'status',
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('deployments', self::ALLOWED_ATTRIBUTES);
+    }
+}

From 17e41eee1dbcf84ca500b520df34a40dfe4e6a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 09:26:34 +0000
Subject: [PATCH 08/33] Upgrade listExecutions queries

---
 app/controllers/api/functions.php             | 40 ++++++++++---------
 .../Database/Validator/Queries/Executions.php | 28 +++++++++++++
 2 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Executions.php

diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index ace753e938..81be96d7ea 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -23,6 +23,7 @@ use Appwrite\Utopia\Response;
 use Utopia\Swoole\Request;
 use Appwrite\Task\Validator\Cron;
 use Appwrite\Utopia\Database\Validator\Queries\Deployments;
+use Appwrite\Utopia\Database\Validator\Queries\Executions;
 use Appwrite\Utopia\Database\Validator\Queries\Functions;
 use Utopia\App;
 use Utopia\Database\Database;
@@ -1023,14 +1024,11 @@ App::get('/v1/functions/:functionId/executions')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_EXECUTION_LIST)
     ->param('functionId', '', new UID(), 'Function ID.')
-    ->param('limit', 25, new Range(0, 100), 'Maximum number of executions 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 Executions(), '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(', ', Executions::ALLOWED_ATTRIBUTES), true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
-    ->param('cursor', '', new UID(), 'ID of the execution used as the starting point for the query, excluding the execution 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)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function (string $functionId, int $limit, int $offset, string $search, string $cursor, string $cursorDirection, Response $response, Database $dbForProject) {
+    ->action(function (string $functionId, array $queries, string $search, Response $response, Database $dbForProject) {
 
         $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
 
@@ -1038,29 +1036,35 @@ App::get('/v1/functions/:functionId/executions')
             throw new Exception(Exception::FUNCTION_NOT_FOUND);
         }
 
-        $filterQueries = [
-            Query::equal('functionId', [$function->getId()])
-        ];
+        $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[] = Query::orderDesc('');
-        if (!empty($cursor)) {
-            $cursorDocument = $dbForProject->getDocument('executions', $cursor);
+        // Set default limit
+        $queries[] = Query::limit(25);
+
+        // Set internal queries
+        $queries[] = Query::equal('functionId', [$function->getId()]);
+
+        // 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 */
+            $executionId = $cursor->getValue();
+            $cursorDocument = $dbForProject->getDocument('executions', $executionId);
 
             if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Tag '{$cursor}' for the 'cursor' value not found.");
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Execution '{$executionId}' for the 'cursor' value not found.");
             }
 
-            $queries[] = $cursorDirection === Database::CURSOR_AFTER ? Query::cursorAfter($cursorDocument) : Query::cursorBefore($cursorDocument);
+            $cursor->setValue($cursorDocument);
         }
 
-        $results = $dbForProject->find('executions', \array_merge($filterQueries, $queries));
+        $filterQueries = Query::groupByType($queries)['filters'];
+
+        $results = $dbForProject->find('executions', $queries);
         $total = $dbForProject->count('executions', $filterQueries, APP_LIMIT_COUNT);
 
         $roles = Authorization::getRoles();
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php b/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php
new file mode 100644
index 0000000000..b53fda8f18
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Collection;
+
+class Executions extends Collection
+{
+    public const ALLOWED_ATTRIBUTES = [
+        '$id',
+        '$createdAt',
+        '$updatedAt',
+        
+        'trigger',
+        'status',
+        'statusCode',
+        'time'
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('executions', self::ALLOWED_ATTRIBUTES);
+    }
+}

From 94acd32d690c68b40668c5f11604bc1b2c8dc456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 09:40:17 +0000
Subject: [PATCH 09/33] Upgrade listDatabases queries

---
 app/controllers/api/databases.php             | 36 ++++++++++---------
 .../Database/Validator/Queries/Databases.php  | 25 +++++++++++++
 2 files changed, 44 insertions(+), 17 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Databases.php

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index d2fd3b9fdd..716c74f7ff 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -48,6 +48,7 @@ use Appwrite\Detector\Detector;
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
 use Appwrite\Stats\Stats;
+use Appwrite\Utopia\Database\Validator\Queries\Databases;
 use Utopia\Config\Config;
 use MaxMind\Db\Reader;
 
@@ -239,41 +240,42 @@ App::get('/v1/databases')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_DATABASE_LIST)
+    ->param('queries', [], new Databases(), '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(', ', Databases::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 collection 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 collection used as the starting point for the query, excluding the collection itself. Should be used for efficient pagination when working with large sets of data.', 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 ' . Database::ORDER_ASC . ' or ' . Database::ORDER_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 === 'ASC' ? Query::orderAsc('') : Query::orderDesc('');
-        if (!empty($cursor)) {
-            $cursorDocument = $dbForProject->getDocument('databases', $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 */
+            $databaseId = $cursor->getValue();
+            $cursorDocument = $dbForProject->getDocument('databases', $databaseId);
 
             if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Collection '{$cursor}' for the 'cursor' value not found.");
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Database '{$databaseId}' for the 'cursor' value not found.");
             }
 
-            $queries[] = $cursorDirection === Database::CURSOR_AFTER ? Query::cursorAfter($cursorDocument) : Query::cursorBefore($cursorDocument);
+            $cursor->setValue($cursorDocument);
         }
 
         $usage->setParam('databases.read', 1);
 
+        $filterQueries = Query::groupByType($queries)['filters'];
+
         $response->dynamic(new Document([
-            'databases' => $dbForProject->find('databases', \array_merge($filterQueries, $queries)),
+            'databases' => $dbForProject->find('databases', $queries),
             'total' => $dbForProject->count('databases', $filterQueries, APP_LIMIT_COUNT),
         ]), Response::MODEL_DATABASE_LIST);
     });
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php b/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php
new file mode 100644
index 0000000000..8fee0492eb
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Collection;
+
+class Databases extends Collection
+{
+    public const ALLOWED_ATTRIBUTES = [
+        '$id',
+        '$createdAt',
+        '$updatedAt',
+        
+        'name'
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('databases', self::ALLOWED_ATTRIBUTES);
+    }
+}

From e068bcdbc1396da7c459034c567fd5b02077556d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 12:30:28 +0000
Subject: [PATCH 10/33] Upgrade listCollections queries

---
 app/controllers/api/databases.php             | 42 +++++++++----------
 .../Validator/Queries/Collections.php         | 27 ++++++++++++
 2 files changed, 48 insertions(+), 21 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Collections.php

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 716c74f7ff..f1ecfdeabe 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -48,6 +48,7 @@ use Appwrite\Detector\Detector;
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
 use Appwrite\Stats\Stats;
+use Appwrite\Utopia\Database\Validator\Queries\Collections;
 use Appwrite\Utopia\Database\Validator\Queries\Databases;
 use Utopia\Config\Config;
 use MaxMind\Db\Reader;
@@ -270,10 +271,10 @@ App::get('/v1/databases')
             $cursor->setValue($cursorDocument);
         }
 
-        $usage->setParam('databases.read', 1);
-
         $filterQueries = Query::groupByType($queries)['filters'];
 
+        $usage->setParam('databases.read', 1);
+
         $response->dynamic(new Document([
             'databases' => $dbForProject->find('databases', $queries),
             'total' => $dbForProject->count('databases', $filterQueries, APP_LIMIT_COUNT),
@@ -562,16 +563,12 @@ App::get('/v1/databases/:databaseId/collections')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_COLLECTION_LIST)
     ->param('databaseId', '', new UID(), 'Database ID.')
+    ->param('queries', [], new Collections(), '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(', ', Collections::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 collection 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 collection used as the starting point for the query, excluding the collection itself. Should be used for efficient pagination when working with large sets of data.', 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 ' . Database::ORDER_ASC . ' or ' . Database::ORDER_DESC . ' order.', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('usage')
-    ->action(function (string $databaseId, string $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject, Stats $usage) {
+    ->action(function (string $databaseId, array $queries, string $search, Response $response, Database $dbForProject, Stats $usage) {
 
         $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
 
@@ -579,34 +576,37 @@ App::get('/v1/databases/:databaseId/collections')
             throw new Exception(Exception::DATABASE_NOT_FOUND);
         }
 
-        $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 === 'ASC' ? Query::orderAsc('') : Query::orderDesc('');
-        if (!empty($cursor)) {
-            $cursorDocument = $dbForProject->getDocument('database_' . $database->getInternalId(), $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 */
+            $collectionId = $cursor->getValue();
+            $cursorDocument = $dbForProject->getDocument('database_' . $database->getInternalId(), $collectionId);
 
             if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Collection '{$cursor}' for the 'cursor' value not found.");
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Collection '{$collectionId}' 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('databaseId', $databaseId)
             ->setParam('databases.collections.read', 1);
 
         $response->dynamic(new Document([
-            'collections' => $dbForProject->find('database_' . $database->getInternalId(), \array_merge($filterQueries, $queries)),
+            'collections' => $dbForProject->find('database_' . $database->getInternalId(), $queries),
             'total' => $dbForProject->count('database_' . $database->getInternalId(), $filterQueries, APP_LIMIT_COUNT),
         ]), Response::MODEL_COLLECTION_LIST);
     });
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php b/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php
new file mode 100644
index 0000000000..b429a1b744
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Collection;
+
+class Collections extends Collection
+{
+    public const ALLOWED_ATTRIBUTES = [
+        '$id',
+        '$createdAt',
+        '$updatedAt',
+        
+        'name',
+        'enabled',
+        'documentSecurity'
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('collections', self::ALLOWED_ATTRIBUTES);
+    }
+}

From 79560c13e6c709f179c418525dfe38ca628e73bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 12:50:52 +0000
Subject: [PATCH 11/33] Upgrade teamListLogs queries

---
 app/controllers/api/teams.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 47c4b3e7cb..1c53152eeb 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -10,7 +10,10 @@ use Appwrite\Network\Validator\Email;
 use Appwrite\Network\Validator\Host;
 use Appwrite\Template\Template;
 use Appwrite\Utopia\Database\Validator\CustomId;
+use Appwrite\Utopia\Database\Validator\Queries;
 use Appwrite\Utopia\Database\Validator\Queries\Teams;
+use Appwrite\Utopia\Database\Validator\Query\Limit;
+use Appwrite\Utopia\Database\Validator\Query\Offset;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
@@ -857,18 +860,12 @@ App::get('/v1/teams/:teamId/logs')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_LOG_LIST)
     ->param('teamId', null, new UID(), 'Team 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 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')
     ->inject('geodb')
-    ->action(function ($teamId, $limit, $offset, $response, $dbForProject, $locale, $geodb) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Document $project */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Utopia\Locale\Locale $locale */
-        /** @var MaxMind\Db\Reader $geodb */
+    ->action(function (string $teamId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -876,6 +873,11 @@ App::get('/v1/teams/:teamId/logs')
             throw new Exception(Exception::TEAM_NOT_FOUND);
         }
 
+        $queries = Query::parseQueries($queries);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+        
         $audit = new Audit($dbForProject);
         $resource = 'team/' . $team->getId();
         $logs = $audit->getLogsByResource($resource, $limit, $offset);

From 36903d6358ead32adecc70e4c71b9841001dca6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 13:03:38 +0000
Subject: [PATCH 12/33] Upgrade document&collection&database logs queries

---
 app/controllers/api/databases.php | 54 ++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index f1ecfdeabe..415a575b6a 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -38,16 +38,17 @@ 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\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\Database\Validator\Query\Cursor as Cursor;
+use Appwrite\Utopia\Database\Validator\Query\Filter as Filter;
+use Appwrite\Utopia\Database\Validator\Query\Limit as Limit;
+use Appwrite\Utopia\Database\Validator\Query\Offset as Offset;
+use Appwrite\Utopia\Database\Validator\Query\Order as Order;
 use Appwrite\Utopia\Response;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
 use Appwrite\Stats\Stats;
+use Appwrite\Utopia\Database\Validator\Queries;
 use Appwrite\Utopia\Database\Validator\Queries\Collections;
 use Appwrite\Utopia\Database\Validator\Queries\Databases;
 use Utopia\Config\Config;
@@ -321,13 +322,12 @@ App::get('/v1/databases/:databaseId/logs')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_LOG_LIST)
     ->param('databaseId', '', new UID(), 'Database 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 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')
     ->inject('geodb')
-    ->action(function (string $databaseId, int $limit, int $offset, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->action(function (string $databaseId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
 
         $database = $dbForProject->getDocument('databases', $databaseId);
 
@@ -335,9 +335,17 @@ App::get('/v1/databases/:databaseId/logs')
             throw new Exception(Exception::DATABASE_NOT_FOUND);
         }
 
+        $queries = Query::parseQueries($queries);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+
         $audit = new Audit($dbForProject);
         $resource = 'database/' . $databaseId;
         $logs = $audit->getLogsByResource($resource, $limit, $offset);
+        
+        $output = [];
+
         foreach ($logs as $i => &$log) {
             $log['userAgent'] = (!empty($log['userAgent'])) ? $log['userAgent'] : 'UNKNOWN';
 
@@ -663,13 +671,12 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
     ->label('sdk.response.model', Response::MODEL_LOG_LIST)
     ->param('databaseId', '', new UID(), 'Database ID.')
     ->param('collectionId', '', new UID(), 'Collection 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 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')
     ->inject('geodb')
-    ->action(function (string $databaseId, string $collectionId, int $limit, int $offset, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
 
         $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
 
@@ -683,6 +690,11 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
             throw new Exception(Exception::COLLECTION_NOT_FOUND);
         }
 
+        $queries = Query::parseQueries($queries);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+
         $audit = new Audit($dbForProject);
         $resource = 'database/' . $databaseId . '/collection/' . $collectionId;
         $logs = $audit->getLogsByResource($resource, $limit, $offset);
@@ -2057,11 +2069,11 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
             $validator = new IndexedQueries(
                 $attributes,
                 $collection->getAttribute('indexes', []),
-                new CursorQueryValidator(),
-                new FilterQueryValidator($attributes),
-                new LimitQueryValidator(),
-                new OffsetQueryValidator(),
-                new OrderQueryValidator(),
+                new Cursor(),
+                new Filter($attributes),
+                new Limit(),
+                new Offset(),
+                new Order(),
             );
             if (!$validator->isValid($queries)) {
                 throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
@@ -2201,13 +2213,12 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
     ->param('databaseId', '', new UID(), 'Database ID.')
     ->param('collectionId', '', new UID(), 'Collection ID.')
     ->param('documentId', null, new UID(), 'Document 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 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')
     ->inject('geodb')
-    ->action(function (string $databaseId, string $collectionId, string $documentId, int $limit, int $offset, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->action(function (string $databaseId, string $collectionId, string $documentId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
 
         $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
 
@@ -2226,6 +2237,11 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
             throw new Exception(Exception::DOCUMENT_NOT_FOUND);
         }
 
+        $queries = Query::parseQueries($queries);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+
         $audit = new Audit($dbForProject);
         $resource = 'database/' . $databaseId . '/collection/' . $collectionId . '/document/' . $document->getId();
         $logs = $audit->getLogsByResource($resource, $limit, $offset);

From b1348dbdd8024e7322e7bfc2e5f4cfe1b48894f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 13:06:59 +0000
Subject: [PATCH 13/33] Upgrade account logs queries

---
 app/controllers/api/account.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 5e70c244d5..4f321e2818 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -19,6 +19,9 @@ use Appwrite\Stats\Stats;
 use Appwrite\Template\Template;
 use Appwrite\URL\URL as URLParser;
 use Appwrite\Utopia\Database\Validator\CustomId;
+use Appwrite\Utopia\Database\Validator\Queries;
+use Appwrite\Utopia\Database\Validator\Query\Limit;
+use Appwrite\Utopia\Database\Validator\Query\Offset;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
@@ -1360,16 +1363,20 @@ App::get('/v1/account/logs')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_LOG_LIST)
-    ->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 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('user')
     ->inject('locale')
     ->inject('geodb')
     ->inject('dbForProject')
     ->inject('usage')
-    ->action(function (int $limit, int $offset, Response $response, Document $user, Locale $locale, Reader $geodb, Database $dbForProject, Stats $usage) {
+    ->action(function (array $queries, Response $response, Document $user, Locale $locale, Reader $geodb, Database $dbForProject, Stats $usage) {
 
+        $queries = Query::parseQueries($queries);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+        
         $audit = new EventAudit($dbForProject);
 
         $logs = $audit->getLogsByUser($user->getId(), $limit, $offset);

From 2d82eed4be770e6cc86c06bc3a2e86ecde98c0df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 13:10:27 +0000
Subject: [PATCH 14/33] Linter fix

---
 app/controllers/api/account.php                                | 2 +-
 app/controllers/api/databases.php                              | 2 +-
 app/controllers/api/storage.php                                | 2 +-
 app/controllers/api/teams.php                                  | 2 +-
 src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php     | 2 +-
 src/Appwrite/Utopia/Database/Validator/Queries/Collections.php | 2 +-
 src/Appwrite/Utopia/Database/Validator/Queries/Databases.php   | 2 +-
 src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php | 2 +-
 src/Appwrite/Utopia/Database/Validator/Queries/Executions.php  | 2 +-
 src/Appwrite/Utopia/Database/Validator/Queries/Files.php       | 2 +-
 src/Appwrite/Utopia/Database/Validator/Queries/Functions.php   | 2 +-
 src/Appwrite/Utopia/Database/Validator/Queries/Teams.php       | 2 +-
 src/Appwrite/Utopia/Database/Validator/Queries/Users.php       | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 4f321e2818..8d5fe517d4 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1376,7 +1376,7 @@ App::get('/v1/account/logs')
         $grouped = Query::groupByType($queries);
         $limit = $grouped['limit'] ?? 25;
         $offset = $grouped['offset'] ?? 0;
-        
+
         $audit = new EventAudit($dbForProject);
 
         $logs = $audit->getLogsByUser($user->getId(), $limit, $offset);
diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 415a575b6a..6900e3fec6 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -343,7 +343,7 @@ App::get('/v1/databases/:databaseId/logs')
         $audit = new Audit($dbForProject);
         $resource = 'database/' . $databaseId;
         $logs = $audit->getLogsByResource($resource, $limit, $offset);
-        
+
         $output = [];
 
         foreach ($logs as $i => &$log) {
diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index 1e472815fc..c5adc47148 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -162,7 +162,7 @@ App::get('/v1/storage/buckets')
     ->inject('dbForProject')
     ->inject('usage')
     ->action(function (array $queries, string $search, Response $response, Database $dbForProject, Stats $usage) {
-        
+
         $queries = Query::parseQueries($queries);
 
         if (!empty($search)) {
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 1c53152eeb..af51e9f2da 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -877,7 +877,7 @@ App::get('/v1/teams/:teamId/logs')
         $grouped = Query::groupByType($queries);
         $limit = $grouped['limit'] ?? 25;
         $offset = $grouped['offset'] ?? 0;
-        
+
         $audit = new Audit($dbForProject);
         $resource = 'team/' . $team->getId();
         $logs = $audit->getLogsByResource($resource, $limit, $offset);
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
index e14b74ea3d..af7f7d4380 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
@@ -10,7 +10,7 @@ class Buckets extends Collection
         '$id',
         '$createdAt',
         '$updatedAt',
-        
+
         'enabled',
         'name',
         'fileSecurity',
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php b/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php
index b429a1b744..ea1a4ef548 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php
@@ -10,7 +10,7 @@ class Collections extends Collection
         '$id',
         '$createdAt',
         '$updatedAt',
-        
+
         'name',
         'enabled',
         'documentSecurity'
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php b/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php
index 8fee0492eb..aa6af85c1a 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php
@@ -10,7 +10,7 @@ class Databases extends Collection
         '$id',
         '$createdAt',
         '$updatedAt',
-        
+
         'name'
     ];
 
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php b/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
index 2d4e2ca32d..dec54311c3 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
@@ -10,7 +10,7 @@ class Deployments extends Collection
         '$id',
         '$createdAt',
         '$updatedAt',
-        
+
         'entrypoint',
         'size',
         'buildId',
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php b/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php
index b53fda8f18..2da974942f 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php
@@ -10,7 +10,7 @@ class Executions extends Collection
         '$id',
         '$createdAt',
         '$updatedAt',
-        
+
         'trigger',
         'status',
         'statusCode',
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Files.php b/src/Appwrite/Utopia/Database/Validator/Queries/Files.php
index 1fb9b39c5a..d66ec04a33 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Files.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Files.php
@@ -10,7 +10,7 @@ class Files extends Collection
         '$id',
         '$createdAt',
         '$updatedAt',
-        
+
         'name',
         'signature',
         'mimeType',
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php b/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php
index 8a08a8371a..ae3e4086c9 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php
@@ -10,7 +10,7 @@ class Functions extends Collection
         '$id',
         '$createdAt',
         '$updatedAt',
-        
+
         'name',
         'status',
         'runtime',
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php b/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php
index 7aae93f65a..7924d2784c 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php
@@ -10,7 +10,7 @@ class Teams extends Collection
         '$id',
         '$createdAt',
         '$updatedAt',
-        
+
         'name',
         'total'
     ];
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
index 76321394c1..e8f2507cda 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
@@ -10,7 +10,7 @@ class Users extends Collection
         '$id',
         '$createdAt',
         '$updatedAt',
-        
+
         'name',
         'email',
         'phone',

From 531d57feffc9a6a1577c12c5284ee430784b5f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 13:16:46 +0000
Subject: [PATCH 15/33] Upgrade listMemberships queries

---
 app/controllers/api/teams.php                 | 39 +++++++++++--------
 .../Validator/Queries/TeamMemberships.php     | 33 ++++++++++++++++
 2 files changed, 55 insertions(+), 17 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php

diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index af51e9f2da..022caf641a 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -11,6 +11,7 @@ use Appwrite\Network\Validator\Host;
 use Appwrite\Template\Template;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries;
+use Appwrite\Utopia\Database\Validator\Queries\TeamMemberships;
 use Appwrite\Utopia\Database\Validator\Queries\Teams;
 use Appwrite\Utopia\Database\Validator\Query\Limit;
 use Appwrite\Utopia\Database\Validator\Query\Offset;
@@ -465,15 +466,11 @@ App::get('/v1/teams/:teamId/memberships')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_MEMBERSHIP_LIST)
     ->param('teamId', '', new UID(), 'Team ID.')
+    ->param('queries', [], new TeamMemberships(), '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(', ', TeamMemberships::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 memberships 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('cursor', '', new UID(), 'ID of the membership used as the starting point for the query, excluding the membership 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 ' . Database::ORDER_ASC . ' or ' . Database::ORDER_DESC . ' order.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function (string $teamId, string $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject) {
+    ->action(function (string $teamId, array $queries, string $search, Response $response, Database $dbForProject) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -481,29 +478,37 @@ App::get('/v1/teams/:teamId/memberships')
             throw new Exception(Exception::TEAM_NOT_FOUND);
         }
 
-        $filterQueries = [Query::equal('teamId', [$teamId])];
+        $queries = Query::parseQueries($queries);
 
         if (!empty($search)) {
-            $filterQueries[] = Query::search('search', $search);
+            $queries[] = Query::search('search', $search);
         }
 
-        $otherQueries = [];
-        $otherQueries[] = Query::limit($limit);
-        $otherQueries[] = Query::offset($offset);
-        $otherQueries[] = $orderType === Database::ORDER_ASC ? Query::orderAsc('') : Query::orderDesc('');
-        if (!empty($cursor)) {
-            $cursorDocument = $dbForProject->getDocument('memberships', $cursor);
+        // Set default limit
+        $queries[] = Query::limit(25);
+
+        // Set internal queries
+        $queries[] = Query::equal('teamId', [$teamId]);
+
+        // 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 */
+            $membershipId = $cursor->getValue();
+            $cursorDocument = $dbForProject->getDocument('memberships', $membershipId);
 
             if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Membership '{$cursor}' for the 'cursor' value not found.");
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Membership '{$membershipId}' for the 'cursor' value not found.");
             }
 
-            $otherQueries[] = $cursorDirection === Database::CURSOR_AFTER ? Query::cursorAfter($cursorDocument) : Query::cursorBefore($cursorDocument);
+            $cursor->setValue($cursorDocument);
         }
 
+        $filterQueries = Query::groupByType($queries)['filters'];
+
         $memberships = $dbForProject->find(
             collection: 'memberships',
-            queries: \array_merge($filterQueries, $otherQueries),
+            queries: $queries,
         );
 
         $total = $dbForProject->count(
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php b/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php
new file mode 100644
index 0000000000..08acba40e8
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Collection;
+
+class TeamMemberships extends Collection
+{
+    public const ALLOWED_ATTRIBUTES = [
+        '$id',
+        '$createdAt',
+        '$updatedAt',
+
+        'userId',
+        'userName',
+        'userName',
+        'userEmail',
+        'teamId',
+        'teamName',
+        'invited',
+        'joined',
+        'confirm'
+    ];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('teamMemberships', self::ALLOWED_ATTRIBUTES);
+    }
+}

From 11c8fccd8889c0c3314e58a39121bccee88bbd30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 15:01:57 +0000
Subject: [PATCH 16/33] PR review changes

---
 composer.lock                                        |  2 +-
 .../Validator/Queries/{Collection.php => Base.php}   |  6 +++---
 .../Utopia/Database/Validator/Queries/Buckets.php    |  8 ++------
 .../Database/Validator/Queries/Collections.php       |  8 ++------
 .../Utopia/Database/Validator/Queries/Databases.php  |  8 ++------
 .../Database/Validator/Queries/Deployments.php       |  8 ++------
 .../Utopia/Database/Validator/Queries/Executions.php |  8 ++------
 .../Utopia/Database/Validator/Queries/Files.php      |  8 ++------
 .../Utopia/Database/Validator/Queries/Functions.php  |  8 ++------
 .../Database/Validator/Queries/TeamMemberships.php   | 12 ++----------
 .../Utopia/Database/Validator/Queries/Teams.php      |  8 ++------
 .../Utopia/Database/Validator/Queries/Users.php      |  8 ++------
 .../Database/Validator/Queries/CollectionTest.php    |  8 ++++----
 13 files changed, 28 insertions(+), 72 deletions(-)
 rename src/Appwrite/Utopia/Database/Validator/Queries/{Collection.php => Base.php} (95%)

diff --git a/composer.lock b/composer.lock
index b9176fe53e..f31e5efe52 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2874,7 +2874,7 @@
             "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
             "support": {
                 "issues": "https://github.com/appwrite/sdk-generator/issues",
-                "source": "https://github.com/appwrite/sdk-generator/tree/master"
+                "source": "https://github.com/appwrite/sdk-generator/tree/feat-change-default-functionID"
             },
             "time": "2022-08-19T10:03:22+00:00"
         },
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
similarity index 95%
rename from src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
rename to src/Appwrite/Utopia/Database/Validator/Queries/Base.php
index 0c29ecd2ff..42c60dbec4 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Collection.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
@@ -12,7 +12,7 @@ use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 
-class Collection extends IndexedQueries
+class Base extends IndexedQueries
 {
     /**
      * Expression constructor
@@ -49,12 +49,12 @@ class Collection extends IndexedQueries
             'array' => false,
         ]);
         $attributes[] = new Document([
-            '$id' => '$createdAt',
+            'key' => '$createdAt',
             'type' => Database::VAR_DATETIME,
             'array' => false,
         ]);
         $attributes[] = new Document([
-            '$id' => '$updatedAt',
+            'key' => '$updatedAt',
             'type' => Database::VAR_DATETIME,
             'array' => false,
         ]);
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
index af7f7d4380..b52c0456a4 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
@@ -2,15 +2,11 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Collection;
+use Appwrite\Utopia\Database\Validator\Queries\Base;
 
-class Buckets extends Collection
+class Buckets extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
-        '$id',
-        '$createdAt',
-        '$updatedAt',
-
         'enabled',
         'name',
         'fileSecurity',
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php b/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php
index ea1a4ef548..579e80ceab 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php
@@ -2,15 +2,11 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Collection;
+use Appwrite\Utopia\Database\Validator\Queries\Base;
 
-class Collections extends Collection
+class Collections extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
-        '$id',
-        '$createdAt',
-        '$updatedAt',
-
         'name',
         'enabled',
         'documentSecurity'
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php b/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php
index aa6af85c1a..3278b140bf 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php
@@ -2,15 +2,11 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Collection;
+use Appwrite\Utopia\Database\Validator\Queries\Base;
 
-class Databases extends Collection
+class Databases extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
-        '$id',
-        '$createdAt',
-        '$updatedAt',
-
         'name'
     ];
 
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php b/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
index dec54311c3..b33a6ac5a4 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
@@ -2,15 +2,11 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Collection;
+use Appwrite\Utopia\Database\Validator\Queries\Base;
 
-class Deployments extends Collection
+class Deployments extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
-        '$id',
-        '$createdAt',
-        '$updatedAt',
-
         'entrypoint',
         'size',
         'buildId',
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php b/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php
index 2da974942f..ae26b26337 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php
@@ -2,15 +2,11 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Collection;
+use Appwrite\Utopia\Database\Validator\Queries\Base;
 
-class Executions extends Collection
+class Executions extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
-        '$id',
-        '$createdAt',
-        '$updatedAt',
-
         'trigger',
         'status',
         'statusCode',
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Files.php b/src/Appwrite/Utopia/Database/Validator/Queries/Files.php
index d66ec04a33..8c2cf653b8 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Files.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Files.php
@@ -2,15 +2,11 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Collection;
+use Appwrite\Utopia\Database\Validator\Queries\Base;
 
-class Files extends Collection
+class Files extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
-        '$id',
-        '$createdAt',
-        '$updatedAt',
-
         'name',
         'signature',
         'mimeType',
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php b/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php
index ae3e4086c9..6ecf76d7ab 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php
@@ -2,15 +2,11 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Collection;
+use Appwrite\Utopia\Database\Validator\Queries\Base;
 
-class Functions extends Collection
+class Functions extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
-        '$id',
-        '$createdAt',
-        '$updatedAt',
-
         'name',
         'status',
         'runtime',
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php b/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php
index 08acba40e8..eff5016e6c 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php
@@ -2,21 +2,13 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Collection;
+use Appwrite\Utopia\Database\Validator\Queries\Base;
 
-class TeamMemberships extends Collection
+class TeamMemberships extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
-        '$id',
-        '$createdAt',
-        '$updatedAt',
-
         'userId',
-        'userName',
-        'userName',
-        'userEmail',
         'teamId',
-        'teamName',
         'invited',
         'joined',
         'confirm'
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php b/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php
index 7924d2784c..e51c565190 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php
@@ -2,15 +2,11 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Collection;
+use Appwrite\Utopia\Database\Validator\Queries\Base;
 
-class Teams extends Collection
+class Teams extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
-        '$id',
-        '$createdAt',
-        '$updatedAt',
-
         'name',
         'total'
     ];
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
index e8f2507cda..a19cbfc415 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
@@ -2,15 +2,11 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Collection;
+use Appwrite\Utopia\Database\Validator\Queries\Base;
 
-class Users extends Collection
+class Users extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
-        '$id',
-        '$createdAt',
-        '$updatedAt',
-
         'name',
         'email',
         'phone',
diff --git a/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php b/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php
index 198fc2895d..a32acc4a95 100644
--- a/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php
+++ b/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Collection;
+use Appwrite\Utopia\Database\Validator\Queries\Base;
 use PHPUnit\Framework\TestCase;
 
 class CollectionTest extends TestCase
@@ -17,14 +17,14 @@ class CollectionTest extends TestCase
 
     public function testEmptyQueries(): void
     {
-        $validator = new Collection('users', []);
+        $validator = new Base('users', []);
 
         $this->assertEquals($validator->isValid([]), true);
     }
 
     public function testValid(): void
     {
-        $validator = new Collection('users', ['name', 'search']);
+        $validator = new Base('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());
@@ -35,7 +35,7 @@ class CollectionTest extends TestCase
 
     public function testMissingIndex(): void
     {
-        $validator = new Collection('users', ['name']);
+        $validator = new Base('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());

From 7fb74027d49b102db08dc666121b60c181b88e81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 15:18:59 +0000
Subject: [PATCH 17/33] Upgrade listDocuments queries

---
 app/controllers/api/databases.php             | 81 +++++--------------
 .../Database/Validator/Queries/Documents.php  | 19 +++++
 2 files changed, 40 insertions(+), 60 deletions(-)
 create mode 100644 src/Appwrite/Utopia/Database/Validator/Queries/Documents.php

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 6900e3fec6..9bd3a41832 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -51,6 +51,7 @@ use Appwrite\Stats\Stats;
 use Appwrite\Utopia\Database\Validator\Queries;
 use Appwrite\Utopia\Database\Validator\Queries\Collections;
 use Appwrite\Utopia\Database\Validator\Queries\Databases;
+use Appwrite\Utopia\Database\Validator\Queries\Documents;
 use Utopia\Config\Config;
 use MaxMind\Db\Reader;
 
@@ -2011,18 +2012,12 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
     ->label('sdk.response.model', Response::MODEL_DOCUMENT_LIST)
     ->param('databaseId', '', new UID(), 'Database ID.')
     ->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/database#createCollection).')
-    ->param('queries', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/database#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long.', true)
-    ->param('limit', 25, new Range(0, 100), 'Maximum number of documents to return in response. By default will return maximum 25 results. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' 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('cursor', '', new UID(), 'ID of the document used as the starting point for the query, excluding the document 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('orderAttributes', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of attributes used to sort results. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' order attributes are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long.', true)
-    ->param('orderTypes', [], new ArrayList(new WhiteList([Database::ORDER_DESC, Database::ORDER_ASC], true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of order directions for sorting attribtues. Possible values are DESC for descending order, or ASC for ascending order. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' order types are allowed.', true)
+    ->param('queries', [], new Documents(), '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.', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('usage')
     ->inject('mode')
-    ->action(function (string $databaseId, string $collectionId, array $queries, int $limit, int $offset, string $cursor, string $cursorDirection, array $orderAttributes, array $orderTypes, Response $response, Database $dbForProject, Stats $usage, string $mode) {
+    ->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Database $dbForProject, Stats $usage, string $mode) {
 
         $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
 
@@ -2045,70 +2040,36 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
             throw new Exception(Exception::USER_UNAUTHORIZED);
         }
 
-        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(
-                $attributes,
-                $collection->getAttribute('indexes', []),
-                new Cursor(),
-                new Filter($attributes),
-                new Limit(),
-                new Offset(),
-                new Order(),
-            );
-            if (!$validator->isValid($queries)) {
-                throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
-            }
-        }
+        $queries = Query::parseQueries($queries);
 
-        $filterQueries = Query::parseQueries($queries);
+        // Set default limit
+        $queries[] = Query::limit(25);
 
-        $otherQueries = [];
-        $otherQueries[] = Query::limit($limit);
-        $otherQueries[] = Query::offset($offset);
-        foreach ($orderTypes as $i => $orderType) {
-            $otherQueries[] = $orderType === Database::ORDER_DESC ? Query::orderDesc($orderAttributes[$i] ?? '') : Query::orderAsc($orderAttributes[$i] ?? '');
-        }
-
-        if (!empty($cursor)) {
+        // 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 */
+            $documentId = $cursor->getValue();
             if ($documentSecurity) {
-                $cursorDocument = $dbForProject->getDocument('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $cursor);
+                $cursorDocument = $dbForProject->getDocument('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $documentId);
             } else {
-                $cursorDocument = Authorization::skip(fn() => $dbForProject->getDocument('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $cursor));
-            }
-            if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Document '{$cursor}' for the 'cursor' value not found.");
+                $cursorDocument = Authorization::skip(fn() => $dbForProject->getDocument('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $documentId));
             }
 
-            $otherQueries[] = $cursorDirection === Database::CURSOR_AFTER ? Query::cursorAfter($cursorDocument) : Query::cursorBefore($cursorDocument);
+            if ($cursorDocument->isEmpty()) {
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Document '{$documentId}' for the 'cursor' value not found.");
+            }
+
+            $cursor->setValue($cursorDocument);
         }
 
-        $allQueries = \array_merge($filterQueries, $otherQueries);
+        $filterQueries = Query::groupByType($queries)['filters'];
 
         if ($documentSecurity) {
-            $documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $allQueries);
+            $documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries);
             $total = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $filterQueries, APP_LIMIT_COUNT);
         } else {
-            $documents = Authorization::skip(fn () => $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $allQueries));
+            $documents = Authorization::skip(fn () => $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries));
             $total = Authorization::skip(fn () => $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $filterQueries, APP_LIMIT_COUNT));
         }
 
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Documents.php b/src/Appwrite/Utopia/Database/Validator/Queries/Documents.php
new file mode 100644
index 0000000000..c487ed5a13
--- /dev/null
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Documents.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Appwrite\Utopia\Database\Validator\Queries\Base;
+
+class Documents extends Base
+{
+    public const ALLOWED_ATTRIBUTES = [];
+
+    /**
+     * Expression constructor
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct('documents', self::ALLOWED_ATTRIBUTES);
+    }
+}

From 01a57d91ad30eba1c16b3642c7ab6f69247d396f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 23 Aug 2022 16:33:08 +0000
Subject: [PATCH 18/33] Fix listDocument queries validation

---
 app/controllers/api/databases.php             |  9 ++++++-
 .../Database/Validator/Queries/Base.php       |  5 ----
 .../Database/Validator/Queries/Documents.php  | 27 ++++++++++++++-----
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 9bd3a41832..fa78d003f8 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -2012,7 +2012,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
     ->label('sdk.response.model', Response::MODEL_DOCUMENT_LIST)
     ->param('databaseId', '', new UID(), 'Database ID.')
     ->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/database#createCollection).')
-    ->param('queries', [], new Documents(), '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.', true)
+    ->param('queries', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), '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.', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('usage')
@@ -2040,6 +2040,13 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
             throw new Exception(Exception::USER_UNAUTHORIZED);
         }
 
+        // Validate queries
+        $validator = new Documents($collection->getAttribute('attributes'), $collection->getAttribute('indexes'));
+        $valid = $validator->isValid($collection->getRead());
+        if (!$valid) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $validator->getDescription());
+        }
+
         $queries = Query::parseQueries($queries);
 
         // Set default limit
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
index 42c60dbec4..85f5c74ac7 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
@@ -67,11 +67,6 @@ class Base extends IndexedQueries
                 'attributes' => [$attribute]
             ]);
         }
-        $indexes[] = new Document([
-            'status' => 'available',
-            'type' => Database::INDEX_FULLTEXT,
-            'attributes' => ['search']
-        ]);
 
         $validators = [
             new Limit(),
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Documents.php b/src/Appwrite/Utopia/Database/Validator/Queries/Documents.php
index c487ed5a13..430ad399e4 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Documents.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Documents.php
@@ -2,18 +2,33 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Base;
+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\Database\Database;
+use Utopia\Database\Document;
 
-class Documents extends Base
+class Documents extends IndexedQueries
 {
-    public const ALLOWED_ATTRIBUTES = [];
-
     /**
      * Expression constructor
      *
+     * @param Document[] $attributes
+     * @param Document[] $indexes
      */
-    public function __construct()
+    public function __construct(array $attributes, array $indexes)
     {
-        parent::__construct('documents', self::ALLOWED_ATTRIBUTES);
+        $validators = [
+            new Limit(),
+            new Offset(),
+            new Cursor(),
+            new Filter($attributes),
+            new Order($attributes),
+        ];
+
+        parent::__construct($attributes, $indexes, ...$validators);
     }
 }

From bd7395cb446414f131c62d96cf623ddc8173771f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 24 Aug 2022 09:22:13 +0000
Subject: [PATCH 19/33] Bug fixing, upgrade tests to new syntax

---
 app/controllers/api/databases.php                 |  2 +-
 composer.lock                                     |  2 +-
 .../Validator/Queries/TeamMemberships.php         |  2 +-
 tests/e2e/Services/Account/AccountBase.php        |  7 +++----
 tests/e2e/Services/Databases/DatabasesBase.php    |  8 ++++----
 .../Functions/FunctionsCustomClientTest.php       |  5 ++---
 .../Services/Storage/StorageCustomServerTest.php  |  2 +-
 tests/e2e/Services/Teams/TeamsBase.php            | 15 ++++++---------
 tests/e2e/Services/Teams/TeamsBaseClient.php      |  2 +-
 9 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index fa78d003f8..5b64db341e 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -2042,7 +2042,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
 
         // Validate queries
         $validator = new Documents($collection->getAttribute('attributes'), $collection->getAttribute('indexes'));
-        $valid = $validator->isValid($collection->getRead());
+        $valid = $validator->isValid($queries);
         if (!$valid) {
             throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $validator->getDescription());
         }
diff --git a/composer.lock b/composer.lock
index f31e5efe52..b9176fe53e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2874,7 +2874,7 @@
             "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
             "support": {
                 "issues": "https://github.com/appwrite/sdk-generator/issues",
-                "source": "https://github.com/appwrite/sdk-generator/tree/feat-change-default-functionID"
+                "source": "https://github.com/appwrite/sdk-generator/tree/master"
             },
             "time": "2022-08-19T10:03:22+00:00"
         },
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php b/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php
index eff5016e6c..5a29e3b63e 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php
@@ -20,6 +20,6 @@ class TeamMemberships extends Base
      */
     public function __construct()
     {
-        parent::__construct('teamMemberships', self::ALLOWED_ATTRIBUTES);
+        parent::__construct('memberships', self::ALLOWED_ATTRIBUTES);
     }
 }
diff --git a/tests/e2e/Services/Account/AccountBase.php b/tests/e2e/Services/Account/AccountBase.php
index 1b287357b8..e5f20f1d80 100644
--- a/tests/e2e/Services/Account/AccountBase.php
+++ b/tests/e2e/Services/Account/AccountBase.php
@@ -390,7 +390,7 @@ trait AccountBase
             'x-appwrite-project' => $this->getProject()['$id'],
             'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]), [
-            'limit' => 1
+            'queries' => [ 'limit(1)' ],
         ]);
 
         $this->assertEquals($responseLimit['headers']['status-code'], 200);
@@ -407,7 +407,7 @@ trait AccountBase
             'x-appwrite-project' => $this->getProject()['$id'],
             'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]), [
-            'offset' => 1
+            'queries' => [ 'offset(1)' ],
         ]);
 
         $this->assertEquals($responseOffset['headers']['status-code'], 200);
@@ -424,8 +424,7 @@ trait AccountBase
             'x-appwrite-project' => $this->getProject()['$id'],
             'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]), [
-            'limit' => 1,
-            'offset' => 1
+            'queries' => [ 'limit(1)', 'offset(1)' ],
         ]);
 
         $this->assertEquals($responseLimitOffset['headers']['status-code'], 200);
diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php
index 4df1c71760..21ddede753 100644
--- a/tests/e2e/Services/Databases/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/DatabasesBase.php
@@ -986,10 +986,11 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'orderAttributes' => ['releaseYear'],
-            'orderTypes' => ['ASC'],
+            'queries' => [ 'orderAsc("releaseYear")' ],
         ]);
 
+        \var_dump($documents);
+
         $this->assertEquals(200, $documents['headers']['status-code']);
         $this->assertEquals(1944, $documents['body']['documents'][0]['releaseYear']);
         $this->assertEquals(2017, $documents['body']['documents'][1]['releaseYear']);
@@ -1007,8 +1008,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'orderAttributes' => ['releaseYear'],
-            'orderTypes' => ['DESC'],
+            'queries' => [ 'orderDesc("releaseYear")' ],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
diff --git a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
index cfc1b3e64a..b35b5cfab8 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
@@ -293,7 +293,7 @@ class FunctionsCustomClientTest extends Scope
             'x-appwrite-project' => $projectId,
             'x-appwrite-key' => $apikey,
         ], [
-            'cursor' => $base['body']['executions'][0]['$id']
+            'queries' => [ 'cursorAfter("' . $base['body']['executions'][0]['$id'] . '")' ],
         ]);
 
         $this->assertCount(1, $executions['body']['executions']);
@@ -304,8 +304,7 @@ class FunctionsCustomClientTest extends Scope
             'x-appwrite-project' => $projectId,
             'x-appwrite-key' => $apikey,
         ], [
-            'cursor' => $base['body']['executions'][1]['$id'],
-            'cursorDirection' => Database::CURSOR_BEFORE
+            'queries' => [ 'cursorBefore("' . $base['body']['executions'][1]['$id'] . '")' ],
         ]);
 
         // Cleanup : Delete function
diff --git a/tests/e2e/Services/Storage/StorageCustomServerTest.php b/tests/e2e/Services/Storage/StorageCustomServerTest.php
index 13130f1ea1..226df031bf 100644
--- a/tests/e2e/Services/Storage/StorageCustomServerTest.php
+++ b/tests/e2e/Services/Storage/StorageCustomServerTest.php
@@ -98,7 +98,7 @@ class StorageCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $response['body']['buckets'][0]['$id'],
+            'queries' => [ 'cursorAfter("' . $response['body']['buckets'][0]['$id'] . '")' ],
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);
diff --git a/tests/e2e/Services/Teams/TeamsBase.php b/tests/e2e/Services/Teams/TeamsBase.php
index 2404ca3243..7f2c4244d3 100644
--- a/tests/e2e/Services/Teams/TeamsBase.php
+++ b/tests/e2e/Services/Teams/TeamsBase.php
@@ -128,7 +128,7 @@ trait TeamsBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'limit' => 2,
+            'queries' => [ 'limit(2)' ],
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);
@@ -140,7 +140,7 @@ trait TeamsBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'offset' => 1,
+            'queries' => [ 'offset(1)' ],
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);
@@ -191,7 +191,7 @@ trait TeamsBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'limit' => 2,
+            'queries' => [ 'limit(2)' ],
         ]);
 
         $this->assertEquals(200, $teams['headers']['status-code']);
@@ -203,8 +203,7 @@ trait TeamsBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'limit' => 1,
-            'cursor' => $teams['body']['teams'][0]['$id']
+            'queries' => [ 'limit(1)', 'cursorAfter("' . $teams['body']['teams'][0]['$id'] . '")' ],
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);
@@ -217,9 +216,7 @@ trait TeamsBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'limit' => 1,
-            'cursor' => $teams['body']['teams'][1]['$id'],
-            'cursorDirection' => Database::CURSOR_BEFORE
+            'queries' => [ 'limit(1)', 'cursorBefore("' . $teams['body']['teams'][1]['$id'] . '")' ],
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);
@@ -235,7 +232,7 @@ trait TeamsBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => 'unknown'
+            'queries' => [ 'cursorAfter("unknown")' ],
         ]);
 
         $this->assertEquals(400, $response['headers']['status-code']);
diff --git a/tests/e2e/Services/Teams/TeamsBaseClient.php b/tests/e2e/Services/Teams/TeamsBaseClient.php
index e07e9fbb18..3a1921105b 100644
--- a/tests/e2e/Services/Teams/TeamsBaseClient.php
+++ b/tests/e2e/Services/Teams/TeamsBaseClient.php
@@ -209,7 +209,7 @@ trait TeamsBaseClient
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $memberships['body']['memberships'][0]['$id']
+            'queries' => [ 'cursorAfter("' . $memberships['body']['memberships'][0]['$id'] . '")' ]
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);

From 4645fcd0c8c85051ba4f28818430b17d4be7e7c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 24 Aug 2022 10:31:47 +0000
Subject: [PATCH 20/33] Fix tests

---
 .../Database/Validator/Queries/Documents.php  | 16 ++++++
 .../e2e/Services/Databases/DatabasesBase.php  | 53 ++++++-------------
 .../Databases/DatabasesCustomServerTest.php   | 28 +++++-----
 .../Functions/FunctionsCustomServerTest.php   |  7 ++-
 .../Validator/Queries/CollectionTest.php      |  2 -
 .../Database/Validator/Queries/UsersTest.php  |  1 -
 6 files changed, 46 insertions(+), 61 deletions(-)

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Documents.php b/src/Appwrite/Utopia/Database/Validator/Queries/Documents.php
index 430ad399e4..fe1e85d699 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Documents.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Documents.php
@@ -21,6 +21,22 @@ class Documents extends IndexedQueries
      */
     public function __construct(array $attributes, array $indexes)
     {
+        $attributes[] = new Document([
+            'key' => '$id',
+            'type' => Database::VAR_STRING,
+            'array' => false,
+        ]);
+        $attributes[] = new Document([
+            'key' => '$createdAt',
+            'type' => Database::VAR_DATETIME,
+            'array' => false,
+        ]);
+        $attributes[] = new Document([
+            'key' => '$updatedAt',
+            'type' => Database::VAR_DATETIME,
+            'array' => false,
+        ]);
+
         $validators = [
             new Limit(),
             new Offset(),
diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php
index 21ddede753..9a6eb10cd1 100644
--- a/tests/e2e/Services/Databases/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/DatabasesBase.php
@@ -989,8 +989,6 @@ trait DatabasesBase
             'queries' => [ 'orderAsc("releaseYear")' ],
         ]);
 
-        \var_dump($documents);
-
         $this->assertEquals(200, $documents['headers']['status-code']);
         $this->assertEquals(1944, $documents['body']['documents'][0]['releaseYear']);
         $this->assertEquals(2017, $documents['body']['documents'][1]['releaseYear']);
@@ -1123,7 +1121,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $base['body']['documents'][0]['$id']
+            'queries' => [ 'cursorAfter("' . $base['body']['documents'][0]['$id'] . '")' ],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1135,7 +1133,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $base['body']['documents'][2]['$id']
+            'queries' => [ 'cursorAfter("' . $base['body']['documents'][2]['$id'] . '")' ],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1148,8 +1146,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'orderAttributes' => ['releaseYear'],
-            'orderTypes' => ['ASC'],
+            'queries' => [ 'orderAsc("releaseYear")' ],
         ]);
 
         $this->assertEquals(200, $base['headers']['status-code']);
@@ -1162,9 +1159,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'orderAttributes' => ['releaseYear'],
-            'orderTypes' => ['ASC'],
-            'cursor' => $base['body']['documents'][1]['$id']
+            'queries' => [ 'cursorAfter("' . $base['body']['documents'][1]['$id'] . '")', 'orderAsc("releaseYear")' ],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1178,8 +1173,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'orderAttributes' => ['releaseYear'],
-            'orderTypes' => ['DESC'],
+            'queries' => [ 'orderDesc("releaseYear")' ],
         ]);
 
         $this->assertEquals(200, $base['headers']['status-code']);
@@ -1192,9 +1186,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'orderAttributes' => ['releaseYear'],
-            'orderTypes' => ['DESC'],
-            'cursor' => $base['body']['documents'][1]['$id']
+            'queries' => [ 'cursorAfter("' . $base['body']['documents'][1]['$id'] . '")', 'orderDesc("releaseYear")' ],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1208,7 +1200,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => 'unknown'
+            'queries' => [ 'cursorAfter("unknown")' ],
         ]);
 
         $this->assertEquals(400, $documents['headers']['status-code']);
@@ -1240,8 +1232,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $base['body']['documents'][2]['$id'],
-            'cursorDirection' => Database::CURSOR_BEFORE
+            'queries' => [ 'cursorBefore("' . $base['body']['documents'][2]['$id'] . '")' ],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1253,8 +1244,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $base['body']['documents'][0]['$id'],
-            'cursorDirection' => Database::CURSOR_BEFORE
+            'queries' => [ 'cursorBefore("' . $base['body']['documents'][0]['$id'] . '")' ],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1267,8 +1257,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'orderAttributes' => ['releaseYear'],
-            'orderTypes' => ['ASC'],
+            'queries' => [ 'orderAsc("releaseYear")' ],
         ]);
 
         $this->assertEquals(200, $base['headers']['status-code']);
@@ -1281,10 +1270,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'orderAttributes' => ['releaseYear'],
-            'orderTypes' => ['ASC'],
-            'cursor' => $base['body']['documents'][1]['$id'],
-            'cursorDirection' => Database::CURSOR_BEFORE
+            'queries' => [ 'cursorBefore("' . $base['body']['documents'][1]['$id'] . '")', 'orderAsc("releaseYear")' ],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1298,8 +1284,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'orderAttributes' => ['releaseYear'],
-            'orderTypes' => ['DESC'],
+            'queries' => [ 'orderDesc("releaseYear")' ],
         ]);
 
         $this->assertEquals(200, $base['headers']['status-code']);
@@ -1312,10 +1297,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'orderAttributes' => ['releaseYear'],
-            'orderTypes' => ['DESC'],
-            'cursor' => $base['body']['documents'][1]['$id'],
-            'cursorDirection' => Database::CURSOR_BEFORE
+            'queries' => [ 'cursorBefore("' . $base['body']['documents'][1]['$id'] . '")', 'orderDesc("releaseYear")' ],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1335,9 +1317,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'limit' => 1,
-            'orderAttributes' => ['releaseYear'],
-            'orderTypes' => ['ASC'],
+            'queries' => [ 'limit(1)', 'orderAsc("releaseYear")' ],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1348,10 +1328,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'limit' => 2,
-            'offset' => 1,
-            'orderAttributes' => ['releaseYear'],
-            'orderTypes' => ['ASC'],
+            'queries' => [ 'limit(2)', 'offset(1)', 'orderAsc("releaseYear")' ],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
index 40238550f7..6a2658651f 100644
--- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
@@ -58,7 +58,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'orderType' => 'DESC'
+            'queries' => [ 'orderDesc("$id")' ],
         ]);
 
         $this->assertEquals(2, $databases['body']['total']);
@@ -77,7 +77,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $base['body']['databases'][0]['$id']
+            'queries' => [ 'cursorAfter("' . $base['body']['databases'][0]['$id'] . '")' ],
         ]);
 
         $this->assertCount(1, $databases['body']['databases']);
@@ -87,7 +87,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $base['body']['databases'][1]['$id']
+            'queries' => [ 'cursorAfter("' . $base['body']['databases'][1]['$id'] . '")' ],
         ]);
 
         $this->assertCount(0, $databases['body']['databases']);
@@ -105,8 +105,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $base['body']['databases'][1]['$id'],
-            'cursorDirection' => Database::CURSOR_BEFORE
+            'queries' => [ 'cursorBefore("' . $base['body']['databases'][1]['$id'] . '")' ],
         ]);
 
         $this->assertCount(1, $databases['body']['databases']);
@@ -116,8 +115,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $base['body']['databases'][0]['$id'],
-            'cursorDirection' => Database::CURSOR_BEFORE
+            'queries' => [ 'cursorBefore("' . $base['body']['databases'][0]['$id'] . '")' ],
         ]);
 
         $this->assertCount(0, $databases['body']['databases']);
@@ -163,7 +161,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => 'unknown',
+            'queries' => [ 'cursorAfter("unknown")' ],
         ]);
 
         $this->assertEquals(400, $response['headers']['status-code']);
@@ -295,7 +293,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'orderType' => 'DESC'
+            'queries' => [ 'orderDesc("$id")' ],
         ]);
 
         $this->assertEquals(2, $collections['body']['total']);
@@ -314,7 +312,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $base['body']['collections'][0]['$id']
+            'queries' => [ 'cursorAfter("' . $base['body']['collections'][0]['$id'] . '")' ],
         ]);
 
         $this->assertCount(1, $collections['body']['collections']);
@@ -324,7 +322,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $base['body']['collections'][1]['$id']
+            'queries' => [ 'cursorAfter("' . $base['body']['collections'][1]['$id'] . '")' ],
         ]);
 
         $this->assertCount(0, $collections['body']['collections']);
@@ -342,8 +340,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $base['body']['collections'][1]['$id'],
-            'cursorDirection' => Database::CURSOR_BEFORE
+            'queries' => [ 'cursorBefore("' . $base['body']['collections'][1]['$id'] . '")' ],
         ]);
 
         $this->assertCount(1, $collections['body']['collections']);
@@ -353,8 +350,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $base['body']['collections'][0]['$id'],
-            'cursorDirection' => Database::CURSOR_BEFORE
+            'queries' => [ 'cursorBefore("' . $base['body']['collections'][0]['$id'] . '")' ],
         ]);
 
         $this->assertCount(0, $collections['body']['collections']);
@@ -400,7 +396,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => 'unknown',
+            'queries' => [ 'cursorAfter("unknown")' ],
         ]);
 
         $this->assertEquals(400, $response['headers']['status-code']);
diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
index 450f65f305..32d24e2ce4 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
@@ -158,7 +158,7 @@ class FunctionsCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $functions['body']['functions'][0]['$id']
+            'queries' => [ 'cursorAfter("' . $functions['body']['functions'][0]['$id'] . '")' ],
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -169,8 +169,7 @@ class FunctionsCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => $functions['body']['functions'][1]['$id'],
-            'cursorDirection' => Database::CURSOR_BEFORE
+            'queries' => [ 'cursorBefore("' . $functions['body']['functions'][1]['$id'] . '")' ],
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -184,7 +183,7 @@ class FunctionsCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'cursor' => 'unknown',
+            'queries' => [ 'cursorAfter("unknown")' ],
         ]);
 
         $this->assertEquals($response['headers']['status-code'], 400);
diff --git a/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php b/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php
index a32acc4a95..3899ce0d80 100644
--- a/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php
+++ b/tests/unit/Utopia/Database/Validator/Queries/CollectionTest.php
@@ -30,7 +30,6 @@ class CollectionTest extends TestCase
         $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
@@ -38,6 +37,5 @@ class CollectionTest extends TestCase
         $validator = new Base('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/UsersTest.php b/tests/unit/Utopia/Database/Validator/Queries/UsersTest.php
index 24a818c128..122d83d885 100644
--- a/tests/unit/Utopia/Database/Validator/Queries/UsersTest.php
+++ b/tests/unit/Utopia/Database/Validator/Queries/UsersTest.php
@@ -30,7 +30,6 @@ class UsersTest extends TestCase
         $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

From 22f05b4cf80d6f9fe27dbcce272b0bc8765b1ae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 24 Aug 2022 11:55:43 +0000
Subject: [PATCH 21/33] Include new tests, fix existing

---
 .../Functions/FunctionsCustomClientTest.php   |  44 +++++++
 .../Functions/FunctionsCustomServerTest.php   | 110 ++++++++++++++++++
 tests/e2e/Services/Storage/StorageBase.php    |  36 ++++++
 .../Storage/StorageCustomServerTest.php       |  40 +++++++
 tests/e2e/Services/Teams/TeamsBase.php        |  20 ++++
 tests/e2e/Services/Teams/TeamsBaseClient.php  |  42 +++++++
 tests/e2e/Services/Users/UsersBase.php        |   7 +-
 7 files changed, 295 insertions(+), 4 deletions(-)

diff --git a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
index b35b5cfab8..fb900ef252 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
@@ -288,6 +288,50 @@ class FunctionsCustomClientTest extends Scope
         $this->assertEquals('completed', $base['body']['executions'][0]['status']);
         $this->assertEquals('completed', $base['body']['executions'][1]['status']);
 
+        $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $projectId,
+            'x-appwrite-key' => $apikey,
+        ], [
+            'queries' => [ 'limit(1)' ]
+        ]);
+
+        $this->assertEquals(200, $executions['headers']['status-code']);
+        $this->assertCount(1, $executions['body']['executions']);
+
+        $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $projectId,
+            'x-appwrite-key' => $apikey,
+        ], [
+            'queries' => [ 'offset(1)' ]
+        ]);
+
+        $this->assertEquals(200, $executions['headers']['status-code']);
+        $this->assertCount(1, $executions['body']['executions']);
+
+        $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $projectId,
+            'x-appwrite-key' => $apikey,
+        ], [
+            'queries' => [ 'equal("status", ["completed"])' ]
+        ]);
+
+        $this->assertEquals(200, $executions['headers']['status-code']);
+        $this->assertCount(2, $executions['body']['executions']);
+
+        $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $projectId,
+            'x-appwrite-key' => $apikey,
+        ], [
+            'queries' => [ 'equal("status", ["failed"])' ]
+        ]);
+
+        $this->assertEquals(200, $executions['headers']['status-code']);
+        $this->assertCount(0, $executions['body']['executions']);
+
         $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
             'content-type' => 'application/json',
             'x-appwrite-project' => $projectId,
diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
index 32d24e2ce4..7922d5a0da 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
@@ -96,6 +96,46 @@ class FunctionsCustomServerTest extends Scope
         $this->assertCount(1, $response['body']['functions']);
         $this->assertEquals($response['body']['functions'][0]['name'], 'Test');
 
+        $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'limit(0)' ]
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertCount(0, $response['body']['functions']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'offset(1)' ]
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertCount(0, $response['body']['functions']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("status", "disabled")' ]
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertCount(1, $response['body']['functions']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("status", "enabled")' ]
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertCount(0, $response['body']['functions']);
+
         $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -411,6 +451,46 @@ class FunctionsCustomServerTest extends Scope
         $this->assertCount(2, $function['body']['deployments']);
         $this->assertEquals($function['body']['deployments'][0]['$id'], $data['deploymentId']);
 
+        $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'limit(1)' ]
+        ]);
+
+        $this->assertEquals($function['headers']['status-code'], 200);
+        $this->assertCount(1, $function['body']['deployments']);
+
+        $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'offset(1)' ]
+        ]);
+
+        $this->assertEquals($function['headers']['status-code'], 200);
+        $this->assertCount(1, $function['body']['deployments']);
+
+        $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("entrypoint", "index.php")' ]
+        ]);
+
+        $this->assertEquals($function['headers']['status-code'], 200);
+        $this->assertCount(2, $function['body']['deployments']);
+
+        $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("entrypoint", "index.js")' ]
+        ]);
+
+        $this->assertEquals($function['headers']['status-code'], 200);
+        $this->assertCount(0, $function['body']['deployments']);
+
         $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -547,6 +627,36 @@ class FunctionsCustomServerTest extends Scope
         $this->assertCount(1, $function['body']['executions']);
         $this->assertEquals($function['body']['executions'][0]['$id'], $data['executionId']);
 
+        $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/executions', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'limit(0)' ]
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(0, $response['body']['executions']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/executions', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'offset(1)' ]
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(0, $response['body']['executions']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/executions', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("trigger", "http")' ]
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(1, $response['body']['executions']);
+
         /**
          * Test search queries
          */
diff --git a/tests/e2e/Services/Storage/StorageBase.php b/tests/e2e/Services/Storage/StorageBase.php
index 3e695c73b1..026979db12 100644
--- a/tests/e2e/Services/Storage/StorageBase.php
+++ b/tests/e2e/Services/Storage/StorageBase.php
@@ -259,6 +259,42 @@ trait StorageBase
         $this->assertGreaterThan(0, $files['body']['total']);
         $this->assertGreaterThan(0, count($files['body']['files']));
 
+        $files = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $data['bucketId'] . '/files', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'limit(0)' ]
+        ]);
+        $this->assertEquals(200, $files['headers']['status-code']);
+        $this->assertEquals(0, count($files['body']['files']));
+
+        $files = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $data['bucketId'] . '/files', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'offset(1)' ]
+        ]);
+        $this->assertEquals(200, $files['headers']['status-code']);
+        $this->assertEquals(0, count($files['body']['files']));
+
+        $files = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $data['bucketId'] . '/files', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("mimeType", "image/png")' ]
+        ]);
+        $this->assertEquals(200, $files['headers']['status-code']);
+        $this->assertEquals(1, count($files['body']['files']));
+
+        $files = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $data['bucketId'] . '/files', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("mimeType", "image/jpeg")' ]
+        ]);
+        $this->assertEquals(200, $files['headers']['status-code']);
+        $this->assertEquals(0, count($files['body']['files']));
+
         /**
          * Test for FAILURE unknown Bucket
          */
diff --git a/tests/e2e/Services/Storage/StorageCustomServerTest.php b/tests/e2e/Services/Storage/StorageCustomServerTest.php
index 226df031bf..ac03f2b83c 100644
--- a/tests/e2e/Services/Storage/StorageCustomServerTest.php
+++ b/tests/e2e/Services/Storage/StorageCustomServerTest.php
@@ -94,6 +94,46 @@ class StorageCustomServerTest extends Scope
         $this->assertEquals($id, $response['body']['buckets'][0]['$id']);
         $this->assertEquals('Test Bucket', $response['body']['buckets'][0]['name']);
 
+        $response = $this->client->call(Client::METHOD_GET, '/storage/buckets', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'limit(1)' ],
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(1, $response['body']['buckets']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/storage/buckets', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'offset(1)' ],
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(1, $response['body']['buckets']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/storage/buckets', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("$id", "bucket1")' ],
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(1, $response['body']['buckets']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/storage/buckets', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("fileSecurity", true)' ],
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(2, $response['body']['buckets']);
+
         $response = $this->client->call(Client::METHOD_GET, '/storage/buckets', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
diff --git a/tests/e2e/Services/Teams/TeamsBase.php b/tests/e2e/Services/Teams/TeamsBase.php
index 7f2c4244d3..e10a3f2514 100644
--- a/tests/e2e/Services/Teams/TeamsBase.php
+++ b/tests/e2e/Services/Teams/TeamsBase.php
@@ -148,6 +148,26 @@ trait TeamsBase
         $this->assertIsInt($response['body']['total']);
         $this->assertGreaterThan(2, $response['body']['teams']);
 
+        $response = $this->client->call(Client::METHOD_GET, '/teams', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'greaterThanEqual("total", 0)' ],
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(3, $response['body']['teams']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/teams', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("name", ["Arsenal", "Newcastle"])' ],
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(2, $response['body']['teams']);
+
         $response = $this->client->call(Client::METHOD_GET, '/teams', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
diff --git a/tests/e2e/Services/Teams/TeamsBaseClient.php b/tests/e2e/Services/Teams/TeamsBaseClient.php
index 3a1921105b..d3ece78765 100644
--- a/tests/e2e/Services/Teams/TeamsBaseClient.php
+++ b/tests/e2e/Services/Teams/TeamsBaseClient.php
@@ -34,6 +34,46 @@ trait TeamsBaseClient
 
         $membershipId = $response['body']['memberships'][0]['$id'];
 
+        $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'limit(0)' ]
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(0, $response['body']['memberships']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'offset(1)' ]
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(0, $response['body']['memberships']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("confirm", true)' ]
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(1, $response['body']['memberships']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("confirm", false)' ]
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertCount(0, $response['body']['memberships']);
+
         $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -217,6 +257,8 @@ trait TeamsBaseClient
         $this->assertNotEmpty($response['body']['memberships']);
         $this->assertCount(1, $response['body']['memberships']);
         $this->assertEquals($memberships['body']['memberships'][1]['$id'], $response['body']['memberships'][0]['$id']);
+
+        
     }
 
     /**
diff --git a/tests/e2e/Services/Users/UsersBase.php b/tests/e2e/Services/Users/UsersBase.php
index f2e498366b..3ff4e65fa6 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 c3372e4a1f0ae46a9d21b69580c978576f86941b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 24 Aug 2022 11:57:00 +0000
Subject: [PATCH 22/33] Fix linter

---
 tests/e2e/Services/Teams/TeamsBaseClient.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/e2e/Services/Teams/TeamsBaseClient.php b/tests/e2e/Services/Teams/TeamsBaseClient.php
index d3ece78765..6553318bcf 100644
--- a/tests/e2e/Services/Teams/TeamsBaseClient.php
+++ b/tests/e2e/Services/Teams/TeamsBaseClient.php
@@ -257,8 +257,6 @@ trait TeamsBaseClient
         $this->assertNotEmpty($response['body']['memberships']);
         $this->assertCount(1, $response['body']['memberships']);
         $this->assertEquals($memberships['body']['memberships'][1]['$id'], $response['body']['memberships'][0]['$id']);
-
-        
     }
 
     /**

From 25590cc210523751a1931a84ec0f5a270caf1d32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 24 Aug 2022 12:43:07 +0000
Subject: [PATCH 23/33] Add list queries test for databases

---
 .../Databases/DatabasesCustomServerTest.php   | 91 ++++++++++++++++++-
 tests/e2e/Services/Teams/TeamsBase.php        | 12 +--
 2 files changed, 93 insertions(+), 10 deletions(-)

diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
index 6a2658651f..2b204da304 100644
--- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
@@ -50,10 +50,56 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($test1['body']['$id'], $databases['body']['databases'][0]['$id']);
         $this->assertEquals($test2['body']['$id'], $databases['body']['databases'][1]['$id']);
 
+        $base = array_reverse($databases['body']['databases']);
+
+        $databases = $this->client->call(Client::METHOD_GET, '/databases', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'limit(1)' ],
+        ]);
+        $this->assertEquals(200, $databases['headers']['status-code']);
+        $this->assertCount(1, $databases['body']['databases']);
+
+        $databases = $this->client->call(Client::METHOD_GET, '/databases', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'offset(1)' ],
+        ]);
+        $this->assertEquals(200, $databases['headers']['status-code']);
+        $this->assertCount(1, $databases['body']['databases']);
+
+        $databases = $this->client->call(Client::METHOD_GET, '/databases', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("name", ["Test 1", "Test 2"])' ],
+        ]);
+        $this->assertEquals(200, $databases['headers']['status-code']);
+        $this->assertCount(2, $databases['body']['databases']);
+
+        $databases = $this->client->call(Client::METHOD_GET, '/databases', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("name", "Test 2")' ],
+        ]);
+        $this->assertEquals(200, $databases['headers']['status-code']);
+        $this->assertCount(1, $databases['body']['databases']);
+
+        $databases = $this->client->call(Client::METHOD_GET, '/databases', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("$id", "first")' ],
+        ]);
+        $this->assertEquals(200, $databases['headers']['status-code']);
+        $this->assertCount(1, $databases['body']['databases']);
+
         /**
          * Test for Order
          */
-        $base = array_reverse($databases['body']['databases']);
         $databases = $this->client->call(Client::METHOD_GET, '/databases', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -285,10 +331,51 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($test1['body']['$id'], $collections['body']['collections'][0]['$id']);
         $this->assertEquals($test2['body']['$id'], $collections['body']['collections'][1]['$id']);
 
+        $base = array_reverse($collections['body']['collections']);
+
+        $collections = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'limit(1)' ]
+        ]);
+
+        $this->assertEquals(200, $collections['headers']['status-code']);
+        $this->assertCount(1, $collections['body']['collections']);
+
+        $collections = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'offset(1)' ]
+        ]);
+
+        $this->assertEquals(200, $collections['headers']['status-code']);
+        $this->assertCount(1, $collections['body']['collections']);
+
+        $collections = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("enabled", true)' ]
+        ]);
+
+        $this->assertEquals(200, $collections['headers']['status-code']);
+        $this->assertCount(2, $collections['body']['collections']);
+
+        $collections = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'queries' => [ 'equal("enabled", false)' ]
+        ]);
+
+        $this->assertEquals(200, $collections['headers']['status-code']);
+        $this->assertCount(0, $collections['body']['collections']);
+
         /**
          * Test for Order
          */
-        $base = array_reverse($collections['body']['collections']);
         $collections = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
diff --git a/tests/e2e/Services/Teams/TeamsBase.php b/tests/e2e/Services/Teams/TeamsBase.php
index e10a3f2514..380fb8cac5 100644
--- a/tests/e2e/Services/Teams/TeamsBase.php
+++ b/tests/e2e/Services/Teams/TeamsBase.php
@@ -132,9 +132,7 @@ trait TeamsBase
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertGreaterThan(0, $response['body']['total']);
-        $this->assertIsInt($response['body']['total']);
-        $this->assertCount(2, $response['body']['teams']);
+        $this->assertEquals(2, count($response['body']['teams']));
 
         $response = $this->client->call(Client::METHOD_GET, '/teams', array_merge([
             'content-type' => 'application/json',
@@ -144,9 +142,7 @@ trait TeamsBase
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertGreaterThan(0, $response['body']['total']);
-        $this->assertIsInt($response['body']['total']);
-        $this->assertGreaterThan(2, $response['body']['teams']);
+        $this->assertGreaterThan(1, count($response['body']['teams']));
 
         $response = $this->client->call(Client::METHOD_GET, '/teams', array_merge([
             'content-type' => 'application/json',
@@ -156,7 +152,7 @@ trait TeamsBase
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertCount(3, $response['body']['teams']);
+        $this->assertGreaterThan(2, count($response['body']['teams']));
 
         $response = $this->client->call(Client::METHOD_GET, '/teams', array_merge([
             'content-type' => 'application/json',
@@ -166,7 +162,7 @@ trait TeamsBase
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertCount(2, $response['body']['teams']);
+        $this->assertEquals(2, count($response['body']['teams']));
 
         $response = $this->client->call(Client::METHOD_GET, '/teams', array_merge([
             'content-type' => 'application/json',

From 55a2e5276472303e0649b6f7f3802793fe283b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 24 Aug 2022 18:23:34 +0000
Subject: [PATCH 24/33] Allow unindexed internal queries

---
 .../Utopia/Database/Validator/Queries/Base.php    | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
index 85f5c74ac7..89c82c8e82 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\IndexedQueries;
+use Appwrite\Utopia\Database\Validator\Queries;
 use Appwrite\Utopia\Database\Validator\Query\Limit;
 use Appwrite\Utopia\Database\Validator\Query\Offset;
 use Appwrite\Utopia\Database\Validator\Query\Cursor;
@@ -12,7 +12,7 @@ use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 
-class Base extends IndexedQueries
+class Base extends Queries
 {
     /**
      * Expression constructor
@@ -59,15 +59,6 @@ class Base extends IndexedQueries
             'array' => false,
         ]);
 
-        $indexes = [];
-        foreach ($allowedAttributes as $attribute) {
-            $indexes[] = new Document([
-                'status' => 'available',
-                'type' => Database::INDEX_KEY,
-                'attributes' => [$attribute]
-            ]);
-        }
-
         $validators = [
             new Limit(),
             new Offset(),
@@ -76,6 +67,6 @@ class Base extends IndexedQueries
             new Order($attributes),
         ];
 
-        parent::__construct($attributes, $indexes, ...$validators);
+        parent::__construct(...$validators);
     }
 }

From 65d09705acb0fffa6fe9499cafbc98a480c56ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 24 Aug 2022 18:25:15 +0000
Subject: [PATCH 25/33] Simplify class name

---
 app/controllers/api/teams.php                                 | 4 ++--
 .../Queries/{TeamMemberships.php => Memberships.php}          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/Appwrite/Utopia/Database/Validator/Queries/{TeamMemberships.php => Memberships.php} (92%)

diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 022caf641a..47b8c1b0cb 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -11,7 +11,7 @@ use Appwrite\Network\Validator\Host;
 use Appwrite\Template\Template;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries;
-use Appwrite\Utopia\Database\Validator\Queries\TeamMemberships;
+use Appwrite\Utopia\Database\Validator\Queries\Memberships;
 use Appwrite\Utopia\Database\Validator\Queries\Teams;
 use Appwrite\Utopia\Database\Validator\Query\Limit;
 use Appwrite\Utopia\Database\Validator\Query\Offset;
@@ -466,7 +466,7 @@ App::get('/v1/teams/:teamId/memberships')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_MEMBERSHIP_LIST)
     ->param('teamId', '', new UID(), 'Team ID.')
-    ->param('queries', [], new TeamMemberships(), '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(', ', TeamMemberships::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Memberships(), '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(', ', Memberships::ALLOWED_ATTRIBUTES), true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php b/src/Appwrite/Utopia/Database/Validator/Queries/Memberships.php
similarity index 92%
rename from src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php
rename to src/Appwrite/Utopia/Database/Validator/Queries/Memberships.php
index 5a29e3b63e..2d90eeb0e6 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/TeamMemberships.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Memberships.php
@@ -4,7 +4,7 @@ namespace Appwrite\Utopia\Database\Validator\Queries;
 
 use Appwrite\Utopia\Database\Validator\Queries\Base;
 
-class TeamMemberships extends Base
+class Memberships extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
         'userId',

From b1dfd94d4933f37379413ce3ba4bdc4d138044c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 24 Aug 2022 18:41:26 +0000
Subject: [PATCH 26/33] Add indexes for internal queries

---
 app/config/collections.php                    | 275 +++++++++++++++++-
 .../Database/Validator/Queries/Buckets.php    |   2 +-
 .../Validator/Queries/Deployments.php         |   1 -
 3 files changed, 275 insertions(+), 3 deletions(-)

diff --git a/app/config/collections.php b/app/config/collections.php
index 6f284000ac..6ad859a136 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -52,6 +52,13 @@ $collections = [
                 'lengths' => [],
                 'orders' => [],
             ],
+            [
+                '$id' => ID::custom('_key_name'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['name'],
+                'lengths' => [256],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ],
     ],
     'collections' => [
@@ -150,6 +157,27 @@ $collections = [
                 'lengths' => [],
                 'orders' => [],
             ],
+            [
+                '$id' => ID::custom('_key_name'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['name'],
+                'lengths' => [256],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_enabled'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['enabled'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_documentSecurity'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['documentSecurity'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ],
     ],
 
@@ -1792,6 +1820,20 @@ $collections = [
                 'lengths' => [],
                 'orders' => [],
             ],
+            [
+                '$id' => ID::custom('_key_name'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['name'],
+                'lengths' => [128],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_total'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['total'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ],
     ],
 
@@ -1940,6 +1982,41 @@ $collections = [
                 'lengths' => [],
                 'orders' => [],
             ],
+            [
+                '$id' => ID::custom('_key_userId'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['userId'],
+                'lengths' => [Database::LENGTH_KEY],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_teamId'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['teamId'],
+                'lengths' => [Database::LENGTH_KEY],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_invited'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['invited'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_joined'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['joined'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_confirm'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['confirm'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ],
     ],
 
@@ -2088,7 +2165,63 @@ $collections = [
                 'attributes' => ['search'],
                 'lengths' => [2048],
                 'orders' => [Database::ORDER_ASC],
-            ]
+            ],
+            [
+                '$id' => ID::custom('_key_name'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['name'],
+                'lengths' => [2048],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_status'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['status'],
+                'lengths' => [Database::LENGTH_KEY],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_runtime'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['runtime'],
+                'lengths' => [2048],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_deployment'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['deployment'],
+                'lengths' => [Database::LENGTH_KEY],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_schedule'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['schedule'],
+                'lengths' => [128],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_scheduleNext'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['scheduleNext'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_schedulePrevious'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['schedulePrevious'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_timeout'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['timeout'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ],
     ],
 
@@ -2241,6 +2374,34 @@ $collections = [
                 'lengths' => [],
                 'orders' => [],
             ],
+            [
+                '$id' => ID::custom('_key_entrypoint'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['entrypoint'],
+                'lengths' => [2048],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_size'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['size'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_buildId'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['buildId'],
+                'lengths' => [Database::LENGTH_KEY],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_activate'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['activate'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ],
     ],
 
@@ -2513,6 +2674,34 @@ $collections = [
                 'lengths' => [],
                 'orders' => [],
             ],
+            [
+                '$id' => ID::custom('_key_trigger'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['trigger'],
+                'lengths' => [128],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_status'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['status'],
+                'lengths' => [128],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_statusCode'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['statusCode'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_time'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['time'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ],
     ],
 
@@ -2704,6 +2893,48 @@ $collections = [
                 'lengths' => [2048],
                 'orders' => [Database::ORDER_ASC],
             ],
+            [
+                '$id' => ID::custom('_key_enabled'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['enabled'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_name'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['name'],
+                'lengths' => [128],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_fileSecurity'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['fileSecurity'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_maximumFileSize'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['maximumFileSize'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_encryption'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['encryption'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_antivirus'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['antivirus'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ]
     ],
 
@@ -3106,6 +3337,48 @@ $collections = [
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],
             ],
+            [
+                '$id' => ID::custom('_key_name'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['name'],
+                'lengths' => [2048],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_signature'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['signature'],
+                'lengths' => [2048],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_mimeType'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['mimeType'],
+                'lengths' => [127],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_sizeOriginal'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['sizeOriginal'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_chunksTotal'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['chunksTotal'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_chunksUploaded'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['chunksUploaded'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ]
     ],
 ];
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
index b52c0456a4..b4d804ec2a 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
@@ -23,4 +23,4 @@ class Buckets extends Base
     {
         parent::__construct('buckets', self::ALLOWED_ATTRIBUTES);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php b/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
index b33a6ac5a4..a8323a8316 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
@@ -11,7 +11,6 @@ class Deployments extends Base
         'size',
         'buildId',
         'activate',
-        'status',
     ];
 
     /**

From 756d0bbd5b019a4500a86fdc199a2336f4914fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 24 Aug 2022 18:59:34 +0000
Subject: [PATCH 27/33] Linter fix

---
 composer.lock                                              | 2 +-
 src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.lock b/composer.lock
index b9176fe53e..2dcac966fe 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"
 }
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
index b4d804ec2a..b52c0456a4 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
@@ -23,4 +23,4 @@ class Buckets extends Base
     {
         parent::__construct('buckets', self::ALLOWED_ATTRIBUTES);
     }
-}
\ No newline at end of file
+}

From 035e72edf7467a223a3b09cd8ce0ef5d07994b4d 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:59 +0000
Subject: [PATCH 28/33] Lockfile update

---
 composer.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 c85363f355780c5309c2bcc81bca1ca42f53f7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Thu, 25 Aug 2022 09:59:28 +0000
Subject: [PATCH 29/33] Fix bugs after merge

---
 app/controllers/api/account.php               |  3 +--
 app/controllers/api/databases.php             | 19 +++++--------------
 app/controllers/api/storage.php               |  7 ++-----
 app/controllers/api/users.php                 |  8 ++------
 .../Databases/DatabasesCustomServerTest.php   |  4 ++--
 5 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 1d93d8de55..e9f280eaef 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1354,8 +1354,7 @@ App::get('/v1/account/logs')
     ->inject('locale')
     ->inject('geodb')
     ->inject('dbForProject')
-    ->inject('usage')
-    ->action(function (array $queries, Response $response, Document $user, Locale $locale, Reader $geodb, Database $dbForProject, Stats $usage) {
+    ->action(function (array $queries, Response $response, Document $user, Locale $locale, Reader $geodb, Database $dbForProject) {
 
         $queries = Query::parseQueries($queries);
         $grouped = Query::groupByType($queries);
diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 884807fcfc..8ed75d88c0 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -242,8 +242,7 @@ App::get('/v1/databases')
     ->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);
 
@@ -270,8 +269,6 @@ App::get('/v1/databases')
 
         $filterQueries = Query::groupByType($queries)['filters'];
 
-        $usage->setParam('databases.read', 1);
-
         $response->dynamic(new Document([
             'databases' => $dbForProject->find('databases', $queries),
             'total' => $dbForProject->count('databases', $filterQueries, APP_LIMIT_COUNT),
@@ -562,8 +559,7 @@ App::get('/v1/databases/:databaseId/collections')
     ->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 (string $databaseId, array $queries, string $search, Response $response, Database $dbForProject, Stats $usage) {
+    ->action(function (string $databaseId, array $queries, string $search, Response $response, Database $dbForProject) {
 
         $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
 
@@ -596,10 +592,6 @@ App::get('/v1/databases/:databaseId/collections')
 
         $filterQueries = Query::groupByType($queries)['filters'];
 
-        $usage
-            ->setParam('databaseId', $databaseId)
-            ->setParam('databases.collections.read', 1);
-
         $response->dynamic(new Document([
             'collections' => $dbForProject->find('database_' . $database->getInternalId(), $queries),
             'total' => $dbForProject->count('database_' . $database->getInternalId(), $filterQueries, APP_LIMIT_COUNT),
@@ -1302,9 +1294,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,
@@ -1314,7 +1305,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);
@@ -1962,7 +1953,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('mode')
-    ->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Database $dbForProject, Stats $usage, string $mode) {
+    ->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Database $dbForProject, string $mode) {
 
         $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
 
diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index 2ff83bf269..2a77e9aef7 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -155,8 +155,7 @@ App::get('/v1/storage/buckets')
     ->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);
 
@@ -183,8 +182,6 @@ App::get('/v1/storage/buckets')
 
         $filterQueries = Query::groupByType($queries)['filters'];
 
-        $usage->setParam('storage.buckets.read', 1);
-
         $response->dynamic(new Document([
             'buckets' => $dbForProject->find('buckets', $queries),
             'total' => $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT),
@@ -655,7 +652,7 @@ App::get('/v1/storage/buckets/:bucketId/files')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('mode')
-    ->action(function (string $bucketId, array $queries, string $search, Response $response, Database $dbForProject, Stats $usage, string $mode) {
+    ->action(function (string $bucketId, array $queries, string $search, Response $response, Database $dbForProject, string $mode) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
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);
 
diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
index 2b204da304..bd4e8aa77b 100644
--- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
@@ -104,7 +104,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'orderDesc("$id")' ],
+            'queries' => [ 'orderDesc("")' ],
         ]);
 
         $this->assertEquals(2, $databases['body']['total']);
@@ -380,7 +380,7 @@ class DatabasesCustomServerTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'orderDesc("$id")' ],
+            'queries' => [ 'orderDesc("")' ],
         ]);
 
         $this->assertEquals(2, $collections['body']['total']);

From 99b95cfb74ab4718c29e14f13b54c88dee9b7536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Mon, 29 Aug 2022 10:05:11 +0000
Subject: [PATCH 30/33] Fix bug after merge conflict

---
 app/controllers/api/databases.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 861766df8a..04b6e4e9bd 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -1979,9 +1979,9 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
         }
 
         // Validate queries
-        $validator = new Documents($collection->getAttribute('attributes'), $collection->getAttribute('indexes'));
-        $valid = $validator->isValid($queries);
-        if (!$valid) {
+        $queriesValidator = new Documents($collection->getAttribute('attributes'), $collection->getAttribute('indexes'));
+        $validQueries = $queriesValidator->isValid($queries);
+        if (!$validQueries) {
             throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $validator->getDescription());
         }
 

From cdbfe4ae10dc5f4785aa8fd277993151a858a12d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Mon, 29 Aug 2022 10:27:56 +0000
Subject: [PATCH 31/33] Variabe name bug fix

---
 app/controllers/api/databases.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 04b6e4e9bd..6360a89363 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -1982,7 +1982,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
         $queriesValidator = new Documents($collection->getAttribute('attributes'), $collection->getAttribute('indexes'));
         $validQueries = $queriesValidator->isValid($queries);
         if (!$validQueries) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $validator->getDescription());
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $queriesValidator->getDescription());
         }
 
         $queries = Query::parseQueries($queries);

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

---
 app/controllers/api/databases.php              | 18 ++----------------
 app/controllers/api/functions.php              |  9 ---------
 app/controllers/api/storage.php                |  6 ------
 app/controllers/api/teams.php                  |  6 ------
 app/controllers/api/users.php                  |  3 ---
 composer.lock                                  |  8 ++++----
 .../Database/Validator/Queries/Buckets.php     |  2 --
 .../Database/Validator/Queries/Collections.php |  2 --
 .../Database/Validator/Queries/Databases.php   |  2 --
 .../Database/Validator/Queries/Deployments.php |  2 --
 .../Database/Validator/Queries/Executions.php  |  2 --
 .../Database/Validator/Queries/Files.php       |  2 --
 .../Database/Validator/Queries/Functions.php   |  2 --
 .../Database/Validator/Queries/Memberships.php |  2 --
 .../Database/Validator/Queries/Teams.php       |  2 --
 .../Database/Validator/Queries/Users.php       |  2 --
 16 files changed, 6 insertions(+), 64 deletions(-)

diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 6360a89363..76fcd9c0a3 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -36,17 +36,12 @@ 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\IndexedQueries;
-use Appwrite\Utopia\Database\Validator\Query\Cursor as Cursor;
-use Appwrite\Utopia\Database\Validator\Query\Filter as Filter;
-use Appwrite\Utopia\Database\Validator\Query\Limit as Limit;
-use Appwrite\Utopia\Database\Validator\Query\Offset as Offset;
-use Appwrite\Utopia\Database\Validator\Query\Order as Order;
+use Appwrite\Utopia\Database\Validator\Query\Limit;
+use Appwrite\Utopia\Database\Validator\Query\Offset;
 use Appwrite\Utopia\Response;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Stats\Stats;
 use Appwrite\Utopia\Database\Validator\Queries;
 use Appwrite\Utopia\Database\Validator\Queries\Collections;
 use Appwrite\Utopia\Database\Validator\Queries\Databases;
@@ -250,9 +245,6 @@ App::get('/v1/databases')
             $queries[] = Query::search('search', $search);
         }
 
-        // 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) {
@@ -573,9 +565,6 @@ App::get('/v1/databases/:databaseId/collections')
             $queries[] = Query::search('search', $search);
         }
 
-        // 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) {
@@ -1987,9 +1976,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
 
         $queries = Query::parseQueries($queries);
 
-        // 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) {
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index ddcfdb7ed5..313e20967b 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -117,9 +117,6 @@ App::get('/v1/functions')
             $queries[] = Query::search('search', $search);
         }
 
-        // 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) {
@@ -790,9 +787,6 @@ App::get('/v1/functions/:functionId/deployments')
             $queries[] = Query::search('search', $search);
         }
 
-        // Set default limit
-        $queries[] = Query::limit(25);
-
         // Set resource queries
         $queries[] = Query::equal('resourceId', [$function->getId()]);
         $queries[] = Query::equal('resourceType', ['functions']);
@@ -1147,9 +1141,6 @@ App::get('/v1/functions/:functionId/executions')
             $queries[] = Query::search('search', $search);
         }
 
-        // Set default limit
-        $queries[] = Query::limit(25);
-
         // Set internal queries
         $queries[] = Query::equal('functionId', [$function->getId()]);
 
diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index 5ab2e8450b..11fcb950f0 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -164,9 +164,6 @@ App::get('/v1/storage/buckets')
             $queries[] = Query::search('search', $search);
         }
 
-        // 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) {
@@ -678,9 +675,6 @@ App::get('/v1/storage/buckets/:bucketId/files')
             $queries[] = Query::search('search', $search);
         }
 
-        // 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) {
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index d5f7b88ca8..1811707aae 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -139,9 +139,6 @@ App::get('/v1/teams')
             $queries[] = Query::search('search', $search);
         }
 
-        // 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) {
@@ -484,9 +481,6 @@ App::get('/v1/teams/:teamId/memberships')
             $queries[] = Query::search('search', $search);
         }
 
-        // Set default limit
-        $queries[] = Query::limit(25);
-
         // Set internal queries
         $queries[] = Query::equal('teamId', [$teamId]);
 
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index a6d4c57f73..43373f954a 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -355,9 +355,6 @@ App::get('/v1/users')
             $queries[] = Query::search('search', $search);
         }
 
-        // 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) {
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/Buckets.php b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
index b52c0456a4..c4d187520f 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Buckets.php
@@ -2,8 +2,6 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Base;
-
 class Buckets extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php b/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php
index 579e80ceab..6e8fcb8339 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Collections.php
@@ -2,8 +2,6 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Base;
-
 class Collections extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php b/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php
index 3278b140bf..22f7ad9b82 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Databases.php
@@ -2,8 +2,6 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Base;
-
 class Databases extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php b/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
index a8323a8316..05b3326af1 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Deployments.php
@@ -2,8 +2,6 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Base;
-
 class Deployments extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php b/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php
index ae26b26337..74996936b9 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Executions.php
@@ -2,8 +2,6 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Base;
-
 class Executions extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Files.php b/src/Appwrite/Utopia/Database/Validator/Queries/Files.php
index 8c2cf653b8..1941eabcdb 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Files.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Files.php
@@ -2,8 +2,6 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Base;
-
 class Files extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php b/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php
index 6ecf76d7ab..ee4c311163 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Functions.php
@@ -2,8 +2,6 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Base;
-
 class Functions extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Memberships.php b/src/Appwrite/Utopia/Database/Validator/Queries/Memberships.php
index 2d90eeb0e6..5ff0098662 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Memberships.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Memberships.php
@@ -2,8 +2,6 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Base;
-
 class Memberships extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php b/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php
index e51c565190..67aba71598 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Teams.php
@@ -2,8 +2,6 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Base;
-
 class Teams extends Base
 {
     public const ALLOWED_ATTRIBUTES = [
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
index a19cbfc415..9b0dfe61e6 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Users.php
@@ -2,8 +2,6 @@
 
 namespace Appwrite\Utopia\Database\Validator\Queries;
 
-use Appwrite\Utopia\Database\Validator\Queries\Base;
-
 class Users extends Base
 {
     public const ALLOWED_ATTRIBUTES = [

From 63c02677a0111c9596dfa1311ddfdec18f40d35f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 30 Aug 2022 13:55:23 +0200
Subject: [PATCH 33/33] PR review changes

---
 app/controllers/api/account.php   |  2 +-
 app/controllers/api/databases.php | 18 +++++++++---------
 app/controllers/api/functions.php | 12 ++++++------
 app/controllers/api/storage.php   |  8 ++++----
 app/controllers/api/teams.php     | 10 +++++-----
 app/controllers/api/users.php     |  6 +++---
 6 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index a00d485bec..1309eade74 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1358,7 +1358,7 @@ App::get('/v1/account/logs')
 
         $queries = Query::parseQueries($queries);
         $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? 25;
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
         $offset = $grouped['offset'] ?? 0;
 
         $audit = new EventAudit($dbForProject);
diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 76fcd9c0a3..7d5dd4046b 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -246,8 +246,8 @@ App::get('/v1/databases')
         }
 
         // Get cursor document if there was a cursor query
-        $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null;
-        if ($cursor !== null) {
+        $cursor = reset(Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE));
+        if ($cursor) {
             /** @var Query $cursor */
             $databaseId = $cursor->getValue();
             $cursorDocument = $dbForProject->getDocument('databases', $databaseId);
@@ -320,7 +320,7 @@ App::get('/v1/databases/:databaseId/logs')
 
         $queries = Query::parseQueries($queries);
         $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? 25;
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
         $offset = $grouped['offset'] ?? 0;
 
         $audit = new Audit($dbForProject);
@@ -566,8 +566,8 @@ App::get('/v1/databases/:databaseId/collections')
         }
 
         // Get cursor document if there was a cursor query
-        $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null;
-        if ($cursor !== null) {
+        $cursor = reset(Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE));
+        if ($cursor) {
             /** @var Query $cursor */
             $collectionId = $cursor->getValue();
             $cursorDocument = $dbForProject->getDocument('database_' . $database->getInternalId(), $collectionId);
@@ -659,7 +659,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
 
         $queries = Query::parseQueries($queries);
         $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? 25;
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
         $offset = $grouped['offset'] ?? 0;
 
         $audit = new Audit($dbForProject);
@@ -1977,8 +1977,8 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
         $queries = Query::parseQueries($queries);
 
         // Get cursor document if there was a cursor query
-        $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null;
-        if ($cursor !== null) {
+        $cursor = reset(Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE));
+        if ($cursor) {
             /** @var Query $cursor */
             $documentId = $cursor->getValue();
 
@@ -2121,7 +2121,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
 
         $queries = Query::parseQueries($queries);
         $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? 25;
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
         $offset = $grouped['offset'] ?? 0;
 
         $audit = new Audit($dbForProject);
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 313e20967b..29a30ec54b 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -118,8 +118,8 @@ App::get('/v1/functions')
         }
 
         // Get cursor document if there was a cursor query
-        $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null;
-        if ($cursor !== null) {
+        $cursor = reset(Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE));
+        if ($cursor) {
             /** @var Query $cursor */
             $functionId = $cursor->getValue();
             $cursorDocument = $dbForProject->getDocument('functions', $functionId);
@@ -792,8 +792,8 @@ App::get('/v1/functions/:functionId/deployments')
         $queries[] = Query::equal('resourceType', ['functions']);
 
         // Get cursor document if there was a cursor query
-        $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null;
-        if ($cursor !== null) {
+        $cursor = reset(Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE));
+        if ($cursor) {
             /** @var Query $cursor */
             $deploymentId = $cursor->getValue();
             $cursorDocument = $dbForProject->getDocument('deployments', $deploymentId);
@@ -1145,8 +1145,8 @@ App::get('/v1/functions/:functionId/executions')
         $queries[] = Query::equal('functionId', [$function->getId()]);
 
         // Get cursor document if there was a cursor query
-        $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null;
-        if ($cursor !== null) {
+        $cursor = reset(Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE));
+        if ($cursor) {
             /** @var Query $cursor */
             $executionId = $cursor->getValue();
             $cursorDocument = $dbForProject->getDocument('executions', $executionId);
diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index 11fcb950f0..adada2f944 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -165,8 +165,8 @@ App::get('/v1/storage/buckets')
         }
 
         // Get cursor document if there was a cursor query
-        $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null;
-        if ($cursor !== null) {
+        $cursor = reset(Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE));
+        if ($cursor) {
             /** @var Query $cursor */
             $bucketId = $cursor->getValue();
             $cursorDocument = $dbForProject->getDocument('buckets', $bucketId);
@@ -676,8 +676,8 @@ App::get('/v1/storage/buckets/:bucketId/files')
         }
 
         // Get cursor document if there was a cursor query
-        $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null;
-        if ($cursor !== null) {
+        $cursor = reset(Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE));
+        if ($cursor) {
             /** @var Query $cursor */
             $fileId = $cursor->getValue();
 
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 1811707aae..80f01d62fe 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -140,8 +140,8 @@ App::get('/v1/teams')
         }
 
         // Get cursor document if there was a cursor query
-        $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null;
-        if ($cursor !== null) {
+        $cursor = reset(Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE));
+        if ($cursor) {
             /** @var Query $cursor */
             $teamId = $cursor->getValue();
             $cursorDocument = $dbForProject->getDocument('teams', $teamId);
@@ -485,8 +485,8 @@ App::get('/v1/teams/:teamId/memberships')
         $queries[] = Query::equal('teamId', [$teamId]);
 
         // Get cursor document if there was a cursor query
-        $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null;
-        if ($cursor !== null) {
+        $cursor = reset(Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE));
+        if ($cursor) {
             /** @var Query $cursor */
             $membershipId = $cursor->getValue();
             $cursorDocument = $dbForProject->getDocument('memberships', $membershipId);
@@ -866,7 +866,7 @@ App::get('/v1/teams/:teamId/logs')
 
         $queries = Query::parseQueries($queries);
         $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? 25;
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
         $offset = $grouped['offset'] ?? 0;
 
         $audit = new Audit($dbForProject);
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 43373f954a..04af50ceb0 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -356,8 +356,8 @@ App::get('/v1/users')
         }
 
         // Get cursor document if there was a cursor query
-        $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE)[0] ?? null;
-        if ($cursor !== null) {
+        $cursor = reset(Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE));
+        if ($cursor) {
             /** @var Query $cursor */
             $userId = $cursor->getValue();
             $cursorDocument = $dbForProject->getDocument('users', $userId);
@@ -541,7 +541,7 @@ App::get('/v1/users/:userId/logs')
 
         $queries = Query::parseQueries($queries);
         $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? 25;
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
         $offset = $grouped['offset'] ?? 0;
 
         $audit = new Audit($dbForProject);