From f08cf1286d350e0371fbc125a8dfd4babdbaa208 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Thu, 10 Sep 2020 09:52:14 +0300
Subject: [PATCH] Added database response models

---
 app/controllers/api/database.php | 43 +++++++++++---------------------
 src/Appwrite/Utopia/Response.php |  2 +-
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index e4aad46d03..5b2e435fb2 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -77,22 +77,14 @@ App::post('/v1/database/collections')
             throw new Exception('Failed saving collection to DB', 500);
         }
 
-        $data = $data->getArrayCopy();
-
-        $webhooks
-            ->setParam('payload', $data)
-        ;
-
         $audits
             ->setParam('event', 'database.collections.create')
-            ->setParam('resource', 'database/collection/'.$data['$id'])
-            ->setParam('data', $data)
+            ->setParam('resource', 'database/collection/'.$data->getId())
+            ->setParam('data', $data->getArrayCopy())
         ;
 
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->json($data)
-        ;
+        $response->setStatusCode(Response::STATUS_CODE_CREATED);
+        $response->dynamic($data, Response::MODEL_COLLECTION);
     }, ['response', 'projectDB', 'webhooks', 'audits']);
 
 App::get('/v1/database/collections')
@@ -123,7 +115,10 @@ App::get('/v1/database/collections')
             ],
         ]);
 
-        $response->json(['sum' => $projectDB->getSum(), 'collections' => $results]);
+        $response->dynamic(new Document([
+            'sum' => $projectDB->getSum(),
+            'collections' => $results
+        ]), Response::MODEL_COLLECTION_LIST);
     }, ['response', 'projectDB']);
 
 App::get('/v1/database/collections/:collectionId')
@@ -145,7 +140,7 @@ App::get('/v1/database/collections/:collectionId')
             throw new Exception('Collection not found', 404);
         }
 
-        $response->json($collection->getArrayCopy());
+        $response->dynamic($collection, Response::MODEL_COLLECTION);
     }, ['response', 'projectDB']);
 
 App::put('/v1/database/collections/:collectionId')
@@ -209,19 +204,13 @@ App::put('/v1/database/collections/:collectionId')
             throw new Exception('Failed saving collection to DB', 500);
         }
 
-        $data = $collection->getArrayCopy();
-
-        $webhooks
-            ->setParam('payload', $data)
-        ;
-
         $audits
             ->setParam('event', 'database.collections.update')
-            ->setParam('resource', 'database/collections/'.$data['$id'])
-            ->setParam('data', $data)
+            ->setParam('resource', 'database/collections/'.$collection->getId())
+            ->setParam('data', $collection->getArrayCopy())
         ;
 
-        $response->json($collection->getArrayCopy());
+        $response->dynamic($collection, Response::MODEL_COLLECTION);
     }, ['response', 'projectDB', 'webhooks', 'audits']);
 
 App::delete('/v1/database/collections/:collectionId')
@@ -250,16 +239,14 @@ App::delete('/v1/database/collections/:collectionId')
             throw new Exception('Failed to remove collection from DB', 500);
         }
         
-        $data = $collection->getArrayCopy();
-
         $webhooks
-            ->setParam('payload', $data)
+            ->setParam('payload', $collection->getArrayCopy())
         ;
 
         $audits
             ->setParam('event', 'database.collections.delete')
-            ->setParam('resource', 'database/collections/'.$data['$id'])
-            ->setParam('data', $data)
+            ->setParam('resource', 'database/collections/'.$collection->getId())
+            ->setParam('data', $collection->getArrayCopy())
         ;
 
         $response->noContent();
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index 3c8789cdf9..70b57c361f 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -118,7 +118,7 @@ class Response extends SwooleResponse
             ->setModel(new Error())
             ->setModel(new ErrorDev())
             // Lists
-            ->setModel(new BaseList('Collections List', self::MODEL_COLLECTION_LIST, 'users', self::MODEL_COLLECTION))
+            ->setModel(new BaseList('Collections List', self::MODEL_COLLECTION_LIST, 'collections', self::MODEL_COLLECTION))
             ->setModel(new BaseList('Users List', self::MODEL_USER_LIST, 'users', self::MODEL_USER))
             ->setModel(new BaseList('Sessions List', self::MODEL_SESSION_LIST, 'sessions', self::MODEL_SESSION))
             ->setModel(new BaseList('Logs List', self::MODEL_LOG_LIST, 'logs', self::MODEL_LOG, false))