feat(usage): rename all usage response models

app/controllers/api/database.php

@@ -1376,7 +1376,6 @@ App::post('/v1/database/collections/:collectionId/documents')
         $data['$read'] = (is_null($read) && !$user->isEmpty()) ? ['user:'.$user->getId()] : $read ?? []; //  By default set read permissions for user
         $data['$write'] = (is_null($write) && !$user->isEmpty()) ? ['user:'.$user->getId()] : $write ?? []; //  By default set write permissions for user
 
-        var_dump($collectionId);
         try {
             $document = $dbForExternal->createDocument($collectionId, new Document($data));
         }

docker-compose.yml

@@ -63,7 +63,7 @@ services:
       - ./psalm.xml:/usr/src/code/psalm.xml
       - ./tests:/usr/src/code/tests
       - ./app:/usr/src/code/app
-      - ./vendor/utopia-php/database:/usr/src/code/vendor/utopia-php/database
+      # - ./vendor/utopia-php/database:/usr/src/code/vendor/utopia-php/database
       - ./docs:/usr/src/code/docs
       - ./public:/usr/src/code/public
       - ./src:/usr/src/code/src

src/Appwrite/Utopia/Response.php

@@ -12,13 +12,10 @@ use Appwrite\Utopia\Response\Model\None;
 use Appwrite\Utopia\Response\Model\Any;
 use Appwrite\Utopia\Response\Model\Attribute;
 use Appwrite\Utopia\Response\Model\BaseList;
-use Appwrite\Utopia\Response\Model\BucketsUsage;
 use Appwrite\Utopia\Response\Model\Collection;
-use Appwrite\Utopia\Response\Model\CollectionUsage;
 use Appwrite\Utopia\Response\Model\Continent;
 use Appwrite\Utopia\Response\Model\Country;
 use Appwrite\Utopia\Response\Model\Currency;
-use Appwrite\Utopia\Response\Model\DatabaseUsage;
 use Appwrite\Utopia\Response\Model\Document as ModelDocument;
 use Appwrite\Utopia\Response\Model\Domain;
 use Appwrite\Utopia\Response\Model\Error;
@@ -26,7 +23,6 @@ use Appwrite\Utopia\Response\Model\ErrorDev;
 use Appwrite\Utopia\Response\Model\Execution;
 use Appwrite\Utopia\Response\Model\File;
 use Appwrite\Utopia\Response\Model\Func;
-use Appwrite\Utopia\Response\Model\FunctionsUsage;
 use Appwrite\Utopia\Response\Model\Index;
 use Appwrite\Utopia\Response\Model\JWT;
 use Appwrite\Utopia\Response\Model\Key;
@@ -47,8 +43,13 @@ use Appwrite\Utopia\Response\Model\Token;
 use Appwrite\Utopia\Response\Model\Webhook;
 use Appwrite\Utopia\Response\Model\Preferences;
 use Appwrite\Utopia\Response\Model\Mock; // Keep last
-use Appwrite\Utopia\Response\Model\ProjectUsage;
-use Appwrite\Utopia\Response\Model\StorageUsage;
+use Appwrite\Utopia\Response\Model\UsageBuckets;
+use Appwrite\Utopia\Response\Model\UsageCollection;
+use Appwrite\Utopia\Response\Model\UsageDatabase;
+use Appwrite\Utopia\Response\Model\UsageFunctions;
+use Appwrite\Utopia\Response\Model\UsageProject;
+use Appwrite\Utopia\Response\Model\UsageStorage;
+use Appwrite\Utopia\Response\Model\UsageUsers;
 use Appwrite\Utopia\Response\Model\UsersUsage;
 use stdClass;
 
@@ -67,6 +68,13 @@ class Response extends SwooleResponse
     const MODEL_METRIC_LIST = 'metricList';
     const MODEL_ERROR_DEV = 'errorDev';
     const MODEL_BASE_LIST = 'baseList';
+    const MODEL_USAGE_DATABASE = 'usageDatabase';
+    const MODEL_USAGE_COLLECTION = 'usageCollection';
+    const MODEL_USAGE_USERS = 'usageUsers';
+    const MODEL_USAGE_BUCKETS = 'usageBuckets';
+    const MODEL_USAGE_STORAGE = 'usageStorage';
+    const MODEL_USAGE_FUNCTIONS = 'usageFunctions';
+    const MODEL_USAGE_PROJECT = 'usageProject';
     
     // Database
     const MODEL_COLLECTION = 'collection';
@@ -77,13 +85,10 @@ class Response extends SwooleResponse
     const MODEL_INDEX_LIST = 'indexList';
     const MODEL_DOCUMENT = 'document';
     const MODEL_DOCUMENT_LIST = 'documentList';
-    const MODEL_DATABASE_USAGE = 'databaseUsage';
-    const MODEL_COLLECTION_USAGE = 'collectionUsage';
 
     // Users
     const MODEL_USER = 'user';
     const MODEL_USER_LIST = 'userList';
-    const MODEL_USERS_USAGE = 'usersUsage';
     const MODEL_SESSION = 'session';
     const MODEL_SESSION_LIST = 'sessionList';
     const MODEL_TOKEN = 'token';
@@ -94,8 +99,6 @@ class Response extends SwooleResponse
     const MODEL_FILE = 'file';
     const MODEL_FILE_LIST = 'fileList';
     const MODEL_BUCKET = 'bucket'; // - Missing
-    const MODEL_BUCKETS_USAGE = 'bucketsUsage';
-    const MODEL_STORAGE_USAGE = 'storageUsage';
 
     // Locale
     const MODEL_LOCALE = 'locale';
@@ -119,7 +122,6 @@ class Response extends SwooleResponse
     // Functions
     const MODEL_FUNCTION = 'function';
     const MODEL_FUNCTION_LIST = 'functionList';
-    const MODEL_FUNCTIONS_USAGE = 'functionsUsage';
     const MODEL_TAG = 'tag';
     const MODEL_TAG_LIST = 'tagList';
     const MODEL_EXECUTION = 'execution';
@@ -128,7 +130,6 @@ class Response extends SwooleResponse
     // Project
     const MODEL_PROJECT = 'project';
     const MODEL_PROJECT_LIST = 'projectList';
-    const MODEL_PROJECT_USAGE = 'projectUsage';
     const MODEL_WEBHOOK = 'webhook';
     const MODEL_WEBHOOK_LIST = 'webhookList';
     const MODEL_KEY = 'key';
@@ -198,27 +199,20 @@ class Response extends SwooleResponse
             ->setModel(new Attribute())
             ->setModel(new Index())
             ->setModel(new ModelDocument())
-            ->setModel(new DatabaseUsage())
-            ->setModel(new CollectionUsage())
             ->setModel(new Log())
             ->setModel(new User())
-            ->setModel(new UsersUsage())
             ->setModel(new Preferences())
             ->setModel(new Session())
             ->setModel(new Token())
             ->setModel(new JWT())
             ->setModel(new Locale())
             ->setModel(new File())
-            ->setModel(new StorageUsage())
-            ->setModel(new BucketsUsage())
             ->setModel(new Team())
             ->setModel(new Membership())
             ->setModel(new Func())
-            ->setModel(new FunctionsUsage())
             ->setModel(new Tag())
             ->setModel(new Execution())
             ->setModel(new Project())
-            ->setModel(new ProjectUsage())
             ->setModel(new Webhook())
             ->setModel(new Key())
             ->setModel(new Domain())
@@ -228,6 +222,13 @@ class Response extends SwooleResponse
             ->setModel(new Language())
             ->setModel(new Currency())
             ->setModel(new Phone())
+            ->setModel(new UsageDatabase())
+            ->setModel(new UsageCollection())
+            ->setModel(new UsageUsers())
+            ->setModel(new UsageStorage())
+            ->setModel(new UsageBuckets())
+            ->setModel(new UsageFunctions())
+            ->setModel(new UsageProject())
             // Verification
             // Recovery
             // Tests (keep last)

src/Appwrite/Utopia/Response/Model/UsageBuckets.php

@@ -6,7 +6,7 @@ use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Model;
 use stdClass;
 
-class BucketsUsage extends Model
+class UsageBuckets extends Model
 {
     public function __construct()
     {
@@ -55,16 +55,16 @@ class BucketsUsage extends Model
      */
     public function getName():string
     {
-        return 'BucketsUsage';
+        return 'UsageBuckets';
     }
 
     /**
-     * Get Collection
+     * Get Type
      * 
      * @return string
      */
     public function getType():string
     {
-        return Response::MODEL_BUCKETS_USAGE;
+        return Response::MODEL_USAGE_BUCKETS;
     }
 }

src/Appwrite/Utopia/Response/Model/UsageCollection.php

@@ -6,7 +6,7 @@ use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Model;
 use stdClass;
 
-class CollectionUsage extends Model
+class UsageCollection extends Model
 {
     public function __construct()
     {
@@ -62,16 +62,16 @@ class CollectionUsage extends Model
      */
     public function getName():string
     {
-        return 'CollectionUsage';
+        return 'UsageCollection';
     }
 
     /**
-     * Get Collection
+     * Get Type
      * 
      * @return string
      */
     public function getType():string
     {
-        return Response::MODEL_COLLECTION_USAGE;
+        return Response::MODEL_USAGE_COLLECTION;
     }
 }

src/Appwrite/Utopia/Response/Model/UsageDatabase.php

@@ -6,7 +6,7 @@ use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Model;
 use stdClass;
 
-class DatabaseUsage extends Model
+class UsageDatabase extends Model
 {
     public function __construct()
     {
@@ -97,16 +97,16 @@ class DatabaseUsage extends Model
      */
     public function getName():string
     {
-        return 'DatabaseUsage';
+        return 'UsageDatabase';
     }
 
     /**
-     * Get Collection
+     * Get Type
      * 
      * @return string
      */
     public function getType():string
     {
-        return Response::MODEL_DATABASE_USAGE;
+        return Response::MODEL_USAGE_DATABASE;
     }
 }

src/Appwrite/Utopia/Response/Model/UsageFunctions.php

@@ -6,7 +6,7 @@ use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Model;
 use stdClass;
 
-class FunctionsUsage extends Model
+class UsageFunctions extends Model
 {
     public function __construct()
     {
@@ -48,16 +48,16 @@ class FunctionsUsage extends Model
      */
     public function getName():string
     {
-        return 'FunctionsUsage';
+        return 'UsageFunctions';
     }
 
     /**
-     * Get Collection
+     * Get Type
      * 
      * @return string
      */
     public function getType():string
     {
-        return Response::MODEL_FUNCTIONS_USAGE;
+        return Response::MODEL_USAGE_FUNCTIONS;
     }
 }

src/Appwrite/Utopia/Response/Model/UsageProject.php

@@ -6,7 +6,7 @@ use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Model;
 use stdClass;
 
-class ProjectUsage extends Model
+class UsageProject extends Model
 {
     public function __construct()
     {
@@ -76,16 +76,16 @@ class ProjectUsage extends Model
      */
     public function getName():string
     {
-        return 'ProjectUsage';
+        return 'UsageProject';
     }
 
     /**
-     * Get Collection
+     * Get Type
      * 
      * @return string
      */
     public function getType():string
     {
-        return Response::MODEL_PROJECT_USAGE;
+        return Response::MODEL_USAGE_PROJECT;
     }
 }

src/Appwrite/Utopia/Response/Model/UsageStorage.php

@@ -6,7 +6,7 @@ use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Model;
 use stdClass;
 
-class StorageUsage extends Model
+class UsageStorage extends Model
 {
     public function __construct()
     {
@@ -45,12 +45,12 @@ class StorageUsage extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      * 
      * @return string
      */
     public function getType():string
     {
-        return Response::MODEL_STORAGE_USAGE;
+        return Response::MODEL_USAGE_STORAGE;
     }
 }

src/Appwrite/Utopia/Response/Model/UsageUsers.php

@@ -6,7 +6,7 @@ use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Model;
 use stdClass;
 
-class UsersUsage extends Model
+class UsageUsers extends Model
 {
     public function __construct()
     {
@@ -76,7 +76,7 @@ class UsersUsage extends Model
      */
     public function getName():string
     {
-        return 'UsersUsage';
+        return 'UsageUsers';
     }
 
     /**
@@ -86,6 +86,6 @@ class UsersUsage extends Model
      */
     public function getType():string
     {
-        return Response::MODEL_USERS_USAGE;
+        return Response::MODEL_USAGE_USERS;
     }
 }