From 2d974edce9943f3c6ee2119f592017bf06839e48 Mon Sep 17 00:00:00 2001 From: kodumbeats Date: Thu, 10 Jun 2021 14:19:10 -0400 Subject: [PATCH] Update document and collection response models --- .../Utopia/Response/Model/Collection.php | 63 ++++++++++++------- .../Utopia/Response/Model/Document.php | 22 ++++--- 2 files changed, 55 insertions(+), 30 deletions(-) diff --git a/src/Appwrite/Utopia/Response/Model/Collection.php b/src/Appwrite/Utopia/Response/Model/Collection.php index 9b1f184b97..725267c0a1 100644 --- a/src/Appwrite/Utopia/Response/Model/Collection.php +++ b/src/Appwrite/Utopia/Response/Model/Collection.php @@ -14,38 +14,55 @@ class Collection extends Model 'type' => self::TYPE_STRING, 'description' => 'Collection ID.', 'default' => '', - 'example' => '5e5ea5c16897e', + 'example' => '', ]) - ->addRule('$permissions', [ - 'type' => Response::MODEL_PERMISSIONS, - 'description' => 'Collection permissions.', - 'default' => new \stdClass, - 'example' => new \stdClass, - 'array' => false, + ->addRule('$read', [ + 'type' => self::TYPE_STRING, + 'description' => 'Collection read permissions.', + 'default' => '', + 'example' => '', + 'array' => true + ]) + ->addRule('$write', [ + 'type' => self::TYPE_STRING, + 'description' => 'Collection write permissions.', + 'default' => '', + 'example' => '', + 'array' => true ]) ->addRule('name', [ 'type' => self::TYPE_STRING, 'description' => 'Collection name.', 'default' => '', - 'example' => 'Movies', + 'example' => '', ]) - ->addRule('dateCreated', [ - 'type' => self::TYPE_INTEGER, - 'description' => 'Collection creation date in Unix timestamp.', - 'default' => 0, - 'example' => 1592981250, + ->addRule('attributes', [ + 'type' => self::TYPE_STRING, + 'description' => 'Collection attributes.', + 'default' => '', + 'example' => '', + 'array' => true ]) - ->addRule('dateUpdated', [ - 'type' => self::TYPE_INTEGER, - 'description' => 'Collection creation date in Unix timestamp.', - 'default' => 0, - 'example' => 1592981550, + ->addRule('indexes', [ + 'type' => self::TYPE_STRING, + 'description' => 'Collection indexes.', + 'default' => '', + 'example' => '', + 'array' => true ]) - ->addRule('rules', [ - 'type' => Response::MODEL_RULE, - 'description' => 'Collection rules.', - 'default' => [], - 'array' => true, + ->addRule('attributesInQueue', [ + 'type' => self::TYPE_STRING, + 'description' => 'Collection attributes in creation queue.', + 'default' => '', + 'example' => '', + 'array' => true + ]) + ->addRule('indexesInQueue', [ + 'type' => self::TYPE_STRING, + 'description' => 'Collection indexes in creation queue.', + 'default' => '', + 'example' => '', + 'array' => true ]) ; } diff --git a/src/Appwrite/Utopia/Response/Model/Document.php b/src/Appwrite/Utopia/Response/Model/Document.php index a8a9f80970..ba90921379 100644 --- a/src/Appwrite/Utopia/Response/Model/Document.php +++ b/src/Appwrite/Utopia/Response/Model/Document.php @@ -41,12 +41,20 @@ class Document extends Any 'default' => '', 'example' => '5e5ea5c15117e', ]) - ->addRule('$permissions', [ - 'type' => Response::MODEL_PERMISSIONS, - 'description' => 'Document permissions.', - 'default' => new \stdClass, - 'example' => new \stdClass, - 'array' => false, - ]); + ->addRule('$read', [ + 'type' => self::TYPE_STRING, + 'description' => 'Document read permissions.', + 'default' => '', + 'example' => '', + 'array' => true, + ]) + ->addRule('$write', [ + 'type' => self::TYPE_STRING, + 'description' => 'Document write permissions.', + 'default' => '', + 'example' => '', + 'array' => true, + ]) + ; } }