From df9e06404765bf3359c68b3525fd1b285925410a Mon Sep 17 00:00:00 2001 From: Matej Baco Date: Tue, 4 Jan 2022 10:05:21 +0100 Subject: [PATCH] Fixed TODOs --- app/controllers/general.php | 1 - src/Appwrite/Utopia/Request/Filters/V12.php | 12 +++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index 15e58cec9..e972dccc3 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -47,7 +47,6 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons $requestFormat = $request->getHeader('x-appwrite-response-format', App::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', '')); if ($requestFormat) { switch($requestFormat) { - // TODO: For some reason console is still on 0.11. We dont want this filter logic in console, console uses 0.12 SDK case version_compare ($requestFormat , '0.11.0', '<=') : Request::setFilter(new V12()); break; diff --git a/src/Appwrite/Utopia/Request/Filters/V12.php b/src/Appwrite/Utopia/Request/Filters/V12.php index 392d62aee..4f8c4bc9d 100644 --- a/src/Appwrite/Utopia/Request/Filters/V12.php +++ b/src/Appwrite/Utopia/Request/Filters/V12.php @@ -134,18 +134,16 @@ class V12 extends Filter if(isset($usedOperator)) { [ $attributeKey, $filterValue ] = \explode($usedOperator, $filter); - // TODO: String or not? Any way to figure out? - $query = $attributeKey . '.' . $operators[$usedOperator] . '("' . $filterValue . '")'; + + $filterValue = \is_numeric($filterValue) ? $filterValue : '"' . $filterValue . '"'; + $query = $attributeKey . '.' . $operators[$usedOperator] . '(' . $filterValue . ')'; \array_push($queries, $query); } } } - // TODO: Can we even migrate search? Which key? Is $id key OK? - // TODO: What's difference between !empty and isset? - if(!empty($content['search'])) { - \array_push($queries, '$id.search("' . $content['search'] . '")'); - } + // We cannot migrate search properly + unset($content['search']); unset($content['filters']); unset($content['search']);