Merge pull request #5709 from appwrite/refactor-collections-config-db-pools

refactor collections config

app/cli.php

@@ -61,7 +61,7 @@ CLI::setResource('dbForConsole', function ($pools, $cache) {
             $dbForConsole->setNamespace('console');
 
             // Ensure tables exist
-            $collections = Config::getParam('collections', []);
+            $collections = Config::getParam('collections', [])['console'];
             $last = \array_key_last($collections);
 
             if (!($dbForConsole->exists($dbForConsole->getDefaultDatabase(), $last))) { /** TODO cache ready variable using registry */

app/controllers/api/databases.php

@@ -179,7 +179,7 @@ App::post('/v1/databases')
             ]));
             $database = $dbForProject->getDocument('databases', $databaseId);
 
-            $collections = Config::getParam('collections', [])['collections'] ?? [];
+            $collections = (Config::getParam('collections', [])['databases'] ?? [])['collections'] ?? [];
             if (empty($collections)) {
                 throw new Exception(Exception::GENERAL_SERVER_ERROR, 'The "collections" collection is not configured.');
             }

app/controllers/api/projects.php

@@ -172,7 +172,7 @@ App::post('/v1/projects')
         $adapter->setup();
 
         /** @var array $collections */
-        $collections = Config::getParam('collections', []);
+        $collections = Config::getParam('collections', [])['projects'] ?? [];
 
         foreach ($collections as $key => $collection) {
             if (($collection['$collection'] ?? '') !== Database::METADATA) {

app/controllers/api/storage.php

@@ -80,7 +80,7 @@ App::post('/v1/storage/buckets')
         $permissions = Permission::aggregate($permissions);
 
         try {
-            $files = Config::getParam('collections', [])['files'] ?? [];
+            $files = (Config::getParam('collections', [])['buckets'] ?? [])['files'] ?? [];
             if (empty($files)) {
                 throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Files collection is not configured.');
             }

app/http.php

@@ -84,9 +84,6 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
 
         Console::success('[Setup] - Server database init started...');
 
-        /** @var array $collections */
-        $collections = Config::getParam('collections', []);
-
         try {
             $cache = $app->getResource('cache'); /** @var Utopia\Cache\Cache $cache */
             Console::success('[Setup] - Creating database: appwrite...');
@@ -105,7 +102,10 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
             $adapter->setup();
         }
 
-        foreach ($collections as $key => $collection) {
+        /** @var array $collections */
+        $collections = Config::getParam('collections', []);
+        $consoleCollections = $collections['console'];
+        foreach ($consoleCollections as $key => $collection) {
             if (($collection['$collection'] ?? '') !== Database::METADATA) {
                 continue;
             }
@@ -177,7 +177,7 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
             $bucket = $dbForConsole->getDocument('buckets', 'default');
 
             Console::success('[Setup] - Creating files collection for default bucket...');
-            $files = $collections['files'] ?? [];
+            $files = $collections['buckets']['files'] ?? [];
             if (empty($files)) {
                 throw new Exception('Files collection is not configured.');
             }

src/Appwrite/Utopia/Database/Validator/Queries/Base.php

@@ -22,7 +22,9 @@ class Base extends Queries
      */
     public function __construct(string $collection, array $allowedAttributes)
     {
-        $collection = Config::getParam('collections', [])[$collection];
+        $config = Config::getParam('collections', []);
+        $collections = array_merge($config['console'], $config['projects'], $config['buckets'], $config['databases']);
+        $collection = $collections[$collection];
         // array for constant lookup time
         $allowedAttributesLookup = [];
         foreach ($allowedAttributes as $attribute) {

tests/unit/General/CollectionsTest.php

@@ -15,7 +15,8 @@ class CollectionsTest extends TestCase
 
     public function testDuplicateRules(): void
     {
-        foreach ($this->collections as $key => $collection) {
+        foreach ($this->collections as $key => $sections) {
+            foreach ($sections as $key => $collection) {
                 if (array_key_exists('attributes', $collection)) {
                     foreach ($collection['attributes'] as $check) {
                         $occurrences = 0;
@@ -30,3 +31,4 @@ class CollectionsTest extends TestCase
             }
         }
     }
+}