Merge branch 'master' of github.com:appwrite/appwrite into swoole

app/controllers/api/database.php

@@ -5,14 +5,15 @@ global $utopia, $register, $request, $response, $webhook, $audit, $projectDB;
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Response;
+use Utopia\Validator\Boolean;
 use Utopia\Validator\Range;
 use Utopia\Validator\WhiteList;
 use Utopia\Validator\Text;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\JSON;
-use Utopia\Locale\Locale;
-use Utopia\Audit\Audit;
-use Utopia\Audit\Adapters\MySQL as AuditAdapter;
+// use Utopia\Locale\Locale;
+// use Utopia\Audit\Audit;
+// use Utopia\Audit\Adapters\MySQL as AuditAdapter;
 use Appwrite\Database\Database;
 use Appwrite\Database\Document;
 use Appwrite\Database\Validator\UID;
@@ -22,8 +23,9 @@ use Appwrite\Database\Validator\Collection;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Database\Exception\Authorization as AuthorizationException;
 use Appwrite\Database\Exception\Structure as StructureException;
-use DeviceDetector\DeviceDetector;
-use GeoIp2\Database\Reader;
+
+// use DeviceDetector\DeviceDetector;
+// use GeoIp2\Database\Reader;
 
 $utopia->post('/v1/database/collections')
     ->desc('Create Collection')
@@ -462,10 +464,8 @@ $utopia->get('/v1/database/collections/:collectionId/documents')
     ->param('orderType', 'ASC', function () { return new WhiteList(array('DESC', 'ASC')); }, 'Order direction. Possible values are DESC for descending order, or ASC for ascending order.', true)
     ->param('orderCast', 'string', function () { return new WhiteList(array('int', 'string', 'date', 'time', 'datetime')); }, 'Order field type casting. Possible values are int, string, date, time or datetime. The database will attempt to cast the order field to the value you pass here. The default value is a string.', true)
     ->param('search', '', function () { return new Text(256); }, 'Search query. Enter any free text search. The database will try to find a match against all document attributes and children.', true)
-    ->param('first', 0, function () { return new Range(0, 1); }, 'Return only the first document. Pass 1 for true or 0 for false. The default value is 0.', true)
-    ->param('last', 0, function () { return new Range(0, 1); }, 'Return only the last document. Pass 1 for true or 0 for false. The default value is 0.', true)
     ->action(
-        function ($collectionId, $filters, $offset, $limit, $orderField, $orderType, $orderCast, $search, $first, $last) use ($response, $projectDB, $utopia) {
+        function ($collectionId, $filters, $offset, $limit, $orderField, $orderType, $orderCast, $search) use ($response, $projectDB, $utopia) {
             $collection = $projectDB->getDocument($collectionId, false);
 
             if (\is_null($collection->getId()) || Database::SYSTEM_COLLECTION_COLLECTIONS != $collection->getCollection()) {
@@ -479,38 +479,32 @@ $utopia->get('/v1/database/collections/:collectionId/documents')
                 'orderType' => $orderType,
                 'orderCast' => $orderCast,
                 'search' => $search,
-                'first' => (bool) $first,
-                'last' => (bool) $last,
                 'filters' => \array_merge($filters, [
                     '$collection='.$collectionId,
                 ]),
             ]);
 
-            if ($first || $last) {
-                $response->json((!empty($list) ? $list->getArrayCopy() : []));
-            } else {
-                if ($utopia->isDevelopment()) {
-                    $collection
-                        ->setAttribute('debug', $projectDB->getDebug())
-                        ->setAttribute('limit', $limit)
-                        ->setAttribute('offset', $offset)
-                        ->setAttribute('orderField', $orderField)
-                        ->setAttribute('orderType', $orderType)
-                        ->setAttribute('orderCast', $orderCast)
-                        ->setAttribute('filters', $filters)
-                    ;
-                }
-
+            if ($utopia->isDevelopment()) {
                 $collection
-                    ->setAttribute('sum', $projectDB->getSum())
-                    ->setAttribute('documents', $list)
+                    ->setAttribute('debug', $projectDB->getDebug())
+                    ->setAttribute('limit', $limit)
+                    ->setAttribute('offset', $offset)
+                    ->setAttribute('orderField', $orderField)
+                    ->setAttribute('orderType', $orderType)
+                    ->setAttribute('orderCast', $orderCast)
+                    ->setAttribute('filters', $filters)
                 ;
-
-                /*
-                 * View
-                 */
-                $response->json($collection->getArrayCopy(/*['$id', '$collection', 'name', 'documents']*/[], ['rules']));
             }
+
+            $collection
+                ->setAttribute('sum', $projectDB->getSum())
+                ->setAttribute('documents', $list)
+            ;
+
+            /*
+             * View
+             */
+            $response->json($collection->getArrayCopy(/*['$id', '$collection', 'name', 'documents']*/[], ['rules']));
         }
     );