Merge branch '1.6.x' of github.com:appwrite/appwrite into add-region-column

app/config/collections/platform.php

@@ -1066,7 +1066,18 @@ return [
                 'default' => null,
                 'array' => false,
                 'filters' => [],
-            ]
+            ],
+            [
+                '$id' => ID::custom('region'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
         ],
         'indexes' => [
             [
@@ -1111,6 +1122,13 @@ return [
                 'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
+            [
+                '$id' => ID::custom('_key_domain_region'),
+                'type' => Database::INDEX_UNIQUE,
+                'attributes' => ['domain', 'region'],
+                'lengths' => [Database::LENGTH_KEY],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ],
     ],
 

app/controllers/api/functions.php

@@ -387,6 +387,7 @@ App::post('/v1/functions')
                     'resourceInternalId' => $function->getInternalId(),
                     'status' => 'verified',
                     'certificateId' => '',
+                    'region' => $project->getAttribute('region')
                 ]))
             );
 

app/controllers/api/proxy.php

@@ -130,6 +130,7 @@ App::post('/v1/proxy/rules')
             'resourceId' => $resourceId,
             'resourceInternalId' => $resourceInternalId,
             'certificateId' => '',
+            'region' => $project->getAttribute('region')
         ]);
 
         $status = 'created';

app/controllers/general.php

@@ -590,7 +590,8 @@ App::init()
                             'resourceType' => 'api',
                             'status' => 'verifying',
                             'projectId' => 'console',
-                            'projectInternalId' => 'console'
+                            'projectInternalId' => 'console',
+                            'region' => System::getEnv('_APP_REGION', 'default'),
                         ]);
 
                         $domainDocument = $dbForPlatform->createDocument('rules', $domainDocument);