appwrite · christyjacob4 · Nov 16, 2022 · Nov 4, 2022 · Nov 6, 2022 · Nov 6, 2022
diff --git a/.env b/.env
@@ -87,5 +87,6 @@ _APP_USAGE_DATABASE_INTERVAL=15
 _APP_USAGE_STATS=enabled
 _APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
+_APP_REGION=default
 _APP_DOCKER_HUB_USERNAME=
-_APP_DOCKER_HUB_PASSWORD=
+_APP_DOCKER_HUB_PASSWORD=
diff --git a/app/cli.php b/app/cli.php
@@ -3,6 +3,7 @@
 require_once __DIR__ . '/init.php';
 require_once __DIR__ . '/controllers/general.php';
 
+use Appwrite\Event\Func;
 use Appwrite\Platform\Appwrite;
 use Utopia\CLI\CLI;
 use Utopia\Database\Validator\Authorization;
@@ -56,20 +57,29 @@
 }, ['pools', 'cache']);
 
 CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $cache) {
-    $getProjectDB = function (Document $project) use ($pools, $dbForConsole, $cache) {
+    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
+
+    $getProjectDB = function (Document $project) use ($pools, $dbForConsole, $cache, &$databases) {
         if ($project->isEmpty() || $project->getId() === 'console') {
             return $dbForConsole;
         }
 
+        $databaseName = $project->getAttribute('database');
+
+        if (isset($databases[$databaseName])) {
+            return $databases[$databaseName];
+        }
+
         $dbAdapter = $pools
-            ->get($project->getAttribute('database'))
+            ->get($databaseName)
             ->pop()
-            ->getResource()
-        ;
+            ->getResource();
 
         $database = new Database($dbAdapter, $cache);
         $database->setNamespace('_' . $project->getInternalId());
 
+        $databases[$databaseName] = $database;
+
         return $database;
     };
 
@@ -100,6 +110,10 @@
     return $database;
 }, ['register']);
 
+CLI::setResource('queueForFunctions', function (Group $pools) {
+    return new Func($pools->get('queue')->pop()->getResource());
+}, ['pools']);
+
 CLI::setResource('logError', function (Registry $register) {
     return function (Throwable $error, string $namespace, string $action) use ($register) {
         $logger = $register->get('logger');

diff --git a/app/config/collections.php b/app/config/collections.php
@@ -751,6 +751,107 @@
         ],
     ],
 
+    'schedules' => [
+        '$collection' => ID::custom(Database::METADATA),
+        '$id' => ID::custom('schedules'),
+        'name' => 'schedules',
+        'attributes' => [
+            [
+                '$id' => ID::custom('resourceType'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 100,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('resourceId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('resourceUpdatedAt'),
+                'type' => Database::VAR_DATETIME,
+                'format' => '',
+                'size' => 0,
+                'signed' => false,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => ['datetime'],
+            ],
+            [
+                '$id' => ID::custom('projectId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('schedule'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 100,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('active'),
+                'type' => Database::VAR_BOOLEAN,
+                'signed' => true,
+                'size' => 0,
+                'format' => '',
+                'filters' => [],
+                'required' => false,
+                'default' => null,
+                'array' => false,
+            ],
+            [
+                '$id' => ID::custom('region'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 10,
+                'signed' => true,
+                'required' => true,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+        ],
+        'indexes' => [
+            [
+                '$id' => ID::custom('_key_region_resourceType_resourceUpdatedAt'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['region', 'resourceType','resourceUpdatedAt'],
+                'lengths' => [],
+                'orders' => [],
+            ],
+            [
+                '$id' => ID::custom('_key_region_resourceType_projectId_resourceId'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['region', 'resourceType', 'projectId', 'resourceId'],
+                'lengths' => [],
+                'orders' => [],
+            ],
+        ],
+    ],
+
     'platforms' => [
         '$collection' => ID::custom(Database::METADATA),
         '$id' => ID::custom('platforms'),
@@ -2149,40 +2250,29 @@
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('schedule'),
+                '$id' => ID::custom('scheduleId'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 128,
+                'size' => Database::LENGTH_KEY,
                 'signed' => true,
                 'required' => false,
                 'default' => null,
                 'array' => false,
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('scheduleUpdatedAt'), // Used to fix duplicate executions bug. Can be removed once new queue library is used
-                'type' => Database::VAR_DATETIME,
-                'format' => '',
-                'size' => 0,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['datetime'],
-            ],
-            [
-                '$id' => ID::custom('schedulePrevious'),
-                'type' => Database::VAR_DATETIME,
+                '$id' => ID::custom('schedule'),
+                'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 0,
-                'signed' => false,
+                'size' => 128,
+                'signed' => true,
                 'required' => false,
                 'default' => null,
                 'array' => false,
-                'filters' => ['datetime'],
+                'filters' => [],
             ],
             [
-                '$id' => ID::custom('scheduleNext'),
+                '$id' => ID::custom('scheduleUpdatedAt'),
                 'type' => Database::VAR_DATETIME,
                 'format' => '',
                 'size' => 0,
@@ -2258,20 +2348,6 @@
                 'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
-            [
-                '$id' => ID::custom('_key_scheduleNext'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['scheduleNext'],
-                'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_schedulePrevious'),
-                'type' => Database::INDEX_KEY,
-                    'attributes' => ['schedulePrevious'],
-                'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
-            ],
             [
                 '$id' => ID::custom('_key_timeout'),
                 'type' => Database::INDEX_KEY,