Merge branches 'feat-database-indexing' and '0.8.x' of github.com:appwrite/appwrite into feat-database-indexing

This commit is contained in:
Eldad Fux committed 2021-05-15 14:11:14 +03:00
commit 00d95cb533
5 files changed
+87 -4

No files matched your search

+2 -2
View File
@@ -21,7 +21,7 @@ class V06 extends Filter {
$parsedResponse = [];
switch($model) {
switch($model) {
case Response::MODEL_DOCUMENT_LIST:
$parsedResponse = $content;
@@ -114,7 +114,7 @@ class V06 extends Filter {
break;
default:
throw new Exception('Recevied invalid model : '.$model);
throw new Exception('Received invalid model : '.$model);
}
return $parsedResponse;
@@ -0,0 +1,67 @@
<?php
namespace Appwrite\Utopia\Response\Filters;
use Appwrite\Auth\Auth;
use Appwrite\Database\Database;
use Appwrite\Database\Validator\Authorization;
use Appwrite\OpenSSL\OpenSSL;
use Appwrite\Utopia\Response;
use Appwrite\Utopia\Response\Filter;
use Exception;
use Utopia\Config\Config;
use Utopia\Locale\Locale as Locale;
use function PHPSTORM_META\map;
class V07 extends Filter {
// Convert 0.8 Data format to 0.7 format
public function parse(array $content, string $model): array {
$parsedResponse = [];
switch($model) {
case Response::MODEL_DOCUMENT_LIST: /** ANY was replaced by DOCUMENT in 0.8.x but this is backward compatible with 0.7.x */
case Response::MODEL_DOCUMENT: /** ANY was replaced by DOCUMENT in 0.8.x but this is backward compatible with 0.7.x */
case Response::MODEL_USER_LIST: /** [FIELDS ADDED in 0.8.x] passwordUpdate */
case Response::MODEL_USER: /** [FIELDS ADDED in 0.8.x] passwordUpdate */
case Response::MODEL_COLLECTION_LIST:
case Response::MODEL_COLLECTION:
case Response::MODEL_FILE_LIST:
case Response::MODEL_FILE:
case Response::MODEL_FUNCTION_LIST:
case Response::MODEL_FUNCTION:
case Response::MODEL_TAG_LIST:
case Response::MODEL_TAG:
case Response::MODEL_EXECUTION_LIST:
case Response::MODEL_EXECUTION:
case Response::MODEL_TEAM_LIST:
case Response::MODEL_TEAM:
case Response::MODEL_MEMBERSHIP_LIST:
case Response::MODEL_MEMBERSHIP:
case Response::MODEL_SESSION_LIST: /** [FIELDS ADDED in 0.8.x] provider, providerUid, providerToken */
case Response::MODEL_SESSION: /** [FIELDS ADDED in 0.8.x] provider, providerUid, providerToken */
case Response::MODEL_JWT:
case Response::MODEL_LOG_LIST:
case Response::MODEL_TOKEN:
case Response::MODEL_LOCALE:
case Response::MODEL_COUNTRY_LIST:
case Response::MODEL_PHONE_LIST:
case Response::MODEL_CONTINENT_LIST:
case Response::MODEL_CURRENCY_LIST:
case Response::MODEL_LANGUAGE_LIST:
case Response::MODEL_ANY:
case Response::MODEL_PREFERENCES: /** ANY was replaced by PREFERENCES in 0.8.x but this is backward compatible with 0.7.x */
case Response::MODEL_NONE:
$parsedResponse = $content;
break;
default:
throw new Exception('Received invalid model : '.$model);
}
return $parsedResponse;
}
}