From 07c383e17a858113d689ee59573d1b4f227cf59b Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Sat, 25 Mar 2023 16:36:20 +1300
Subject: [PATCH] Review updates

---
 app/workers/databases.php                     | 16 ++---
 .../Utopia/Database/Validator/Queries.php     | 58 +++++++------------
 2 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/app/workers/databases.php b/app/workers/databases.php
index c5743cc56b..c073bf3b95 100644
--- a/app/workers/databases.php
+++ b/app/workers/databases.php
@@ -182,16 +182,12 @@ class DatabaseV1 extends Worker
 
         try {
             if ($status !== 'failed') {
-                switch ($type) {
-                    case Database::VAR_RELATIONSHIP:
-                        if (!$dbForProject->deleteRelationship('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $key)) {
-                            throw new Exception('Failed to delete Attribute');
-                        }
-                        break;
-                    default:
-                        if (!$dbForProject->deleteAttribute('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $key)) {
-                            throw new Exception('Failed to delete Attribute');
-                        }
+                if ($type ===  Database::VAR_RELATIONSHIP) {
+                    if (!$dbForProject->deleteRelationship('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $key)) {
+                        throw new Exception('Failed to delete Attribute');
+                    }
+                } elseif (!$dbForProject->deleteAttribute('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $key)) {
+                    throw new Exception('Failed to delete Attribute');
                 }
             }
             $dbForProject->deleteDocument('attributes', $attribute->getId());
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries.php b/src/Appwrite/Utopia/Database/Validator/Queries.php
index 4de06e58dd..c43c15eedf 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries.php
@@ -64,42 +64,28 @@ class Queries extends Validator
             }
 
             $method = $query->getMethod();
-            $methodType = '';
-            switch ($method) {
-                case Query::TYPE_SELECT:
-                    $methodType = Base::METHOD_TYPE_SELECT;
-                    break;
-                case Query::TYPE_LIMIT:
-                    $methodType = Base::METHOD_TYPE_LIMIT;
-                    break;
-                case Query::TYPE_OFFSET:
-                    $methodType = Base::METHOD_TYPE_OFFSET;
-                    break;
-                case Query::TYPE_CURSORAFTER:
-                case Query::TYPE_CURSORBEFORE:
-                    $methodType = Base::METHOD_TYPE_CURSOR;
-                    break;
-                case Query::TYPE_ORDERASC:
-                case Query::TYPE_ORDERDESC:
-                    $methodType = Base::METHOD_TYPE_ORDER;
-                    break;
-                case Query::TYPE_EQUAL:
-                case Query::TYPE_NOTEQUAL:
-                case Query::TYPE_LESSER:
-                case Query::TYPE_LESSEREQUAL:
-                case Query::TYPE_GREATER:
-                case Query::TYPE_GREATEREQUAL:
-                case Query::TYPE_SEARCH:
-                case Query::TYPE_IS_NULL:
-                case Query::TYPE_IS_NOT_NULL:
-                case Query::TYPE_BETWEEN:
-                case Query::TYPE_STARTS_WITH:
-                case Query::TYPE_ENDS_WITH:
-                    $methodType = Base::METHOD_TYPE_FILTER;
-                    break;
-                default:
-                    break;
-            }
+            $methodType = match ($method) {
+                Query::TYPE_SELECT => Base::METHOD_TYPE_SELECT,
+                Query::TYPE_LIMIT => Base::METHOD_TYPE_LIMIT,
+                Query::TYPE_OFFSET => Base::METHOD_TYPE_OFFSET,
+                Query::TYPE_CURSORAFTER,
+                Query::TYPE_CURSORBEFORE => Base::METHOD_TYPE_CURSOR,
+                Query::TYPE_ORDERASC,
+                Query::TYPE_ORDERDESC => Base::METHOD_TYPE_ORDER,
+                Query::TYPE_EQUAL,
+                Query::TYPE_NOTEQUAL,
+                Query::TYPE_LESSER,
+                Query::TYPE_LESSEREQUAL,
+                Query::TYPE_GREATER,
+                Query::TYPE_GREATEREQUAL,
+                Query::TYPE_SEARCH,
+                Query::TYPE_IS_NULL,
+                Query::TYPE_IS_NOT_NULL,
+                Query::TYPE_BETWEEN,
+                Query::TYPE_STARTS_WITH,
+                Query::TYPE_ENDS_WITH => Base::METHOD_TYPE_FILTER,
+                default => '',
+            };
 
             $methodIsValid = false;
             foreach ($this->validators as $validator) {