Merge pull request #4907 from appwrite/refactor-internalId-collections-db-pools

Refactor internal id collections db pools
2024-07-04 06:00:53 +12:00 · 2023-02-10 17:05:28 +05:30 · 2023-02-10 17:05:28 +05:30 · 2ea619533c
parent 543246c50b bab2c02d56
commit 2ea619533c
7 changed files with 275 additions and 94 deletions
--- a/app/config/collections.php
+++ b/app/config/collections.php
@ -785,6 +785,17 @@ $collections = [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('resourceInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('resourceId'),
                'type' => Database::VAR_STRING,
@ -2223,6 +2234,17 @@ $collections = [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('deploymentInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('deployment'),
                'type' => Database::VAR_STRING,
@ -2256,6 +2278,17 @@ $collections = [
                'array' => true,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('scheduleInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('scheduleId'),
                'type' => Database::VAR_STRING,
@ -2370,6 +2403,17 @@ $collections = [
        '$id' => ID::custom('deployments'),
        'name' => 'Deployments',
        'attributes' => [
+            [
+                '$id' => ID::custom('resourceInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('resourceId'),
                'type' => Database::VAR_STRING,
@ -2392,6 +2436,17 @@ $collections = [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('buildInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('buildId'),
                'type' => Database::VAR_STRING,
@ -2572,6 +2627,17 @@ $collections = [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => 'deploymentInternalId',
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('deploymentId'),
                'type' => Database::VAR_STRING,
@ -2688,6 +2754,17 @@ $collections = [
        '$id' => ID::custom('executions'),
        'name' => 'Executions',
        'attributes' => [
+            [
+                '$id' => ID::custom('functionInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('functionId'),
                'type' => Database::VAR_STRING,
@ -2699,6 +2776,17 @@ $collections = [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('deploymentInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('deploymentId'),
                'type' => Database::VAR_STRING,
--- a/app/console
+++ b/app/console
@ -1 +1 @@
-Subproject commit 43891a526e061454617cbb13def3c4901d99a7f1
+Subproject commit fae048b91787d0b372c13caf27f14fc8b780ef60
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@ -81,6 +81,7 @@ App::post('/v1/functions')
            'enabled' => $enabled,
            'name' => $name,
            'runtime' => $runtime,
+            'deploymentInternalId' => '',
            'deployment' => '',
            'events' => $events,
            'schedule' => $schedule,
@ -102,6 +103,7 @@ App::post('/v1/functions')
        );

        $function->setAttribute('scheduleId', $schedule->getId());
+        $function->setAttribute('scheduleInternalId', $schedule->getInternalId());
        $dbForProject->updateDocument('functions', $function->getId(), $function);

        $eventsInstance->setParam('functionId', $function->getId());
@ -534,6 +536,7 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId')
        }

        $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
+            'deploymentInternalId' => $deployment->getInternalId(),
            'deployment' => $deployment->getId()
        ])));

@ -740,6 +743,7 @@ App::post('/v1/functions/:functionId/deployments')
                        Permission::update(Role::any()),
                        Permission::delete(Role::any()),
                    ],
+                    'resourceInternalId' => $function->getInternalId(),
                    'resourceId' => $function->getId(),
                    'resourceType' => 'functions',
                    'entrypoint' => $entrypoint,
@ -770,6 +774,7 @@ App::post('/v1/functions/:functionId/deployments')
                        Permission::update(Role::any()),
                        Permission::delete(Role::any()),
                    ],
+                    'resourceInternalId' => $function->getInternalId(),
                    'resourceId' => $function->getId(),
                    'resourceType' => 'functions',
                    'entrypoint' => $entrypoint,
@ -967,6 +972,7 @@ App::delete('/v1/functions/:functionId/deployments/:deploymentId')
        if ($function->getAttribute('deployment') === $deployment->getId()) { // Reset function deployment
            $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
                'deployment' => '',
+                'deploymentInternalId' => '',
            ])));
        }

@ -1116,7 +1122,9 @@ App::post('/v1/functions/:functionId/executions')
        $execution = Authorization::skip(fn () => $dbForProject->createDocument('executions', new Document([
            '$id' => $executionId,
            '$permissions' => !$user->isEmpty() ? [Permission::read(Role::user($user->getId()))] : [],
+            'functionInternalId' => $function->getInternalId(),
            'functionId' => $function->getId(),
+            'deploymentInternalId' => $deployment->getInternalId(),
            'deploymentId' => $deployment->getId(),
            'trigger' => 'http', // http / schedule / event
            'status' => $async ? 'waiting' : 'processing', // waiting / processing / completed / failed
--- a/app/workers/builds.php
+++ b/app/workers/builds.php
@ -97,6 +97,7 @@ class BuildsV1 extends Worker
                '$id' => $buildId,
                '$permissions' => [],
                'startTime' => $startTime,
+                'deploymentInternalId' => $deployment->getInternalId(),
                'deploymentId' => $deployment->getId(),
                'status' => 'processing',
                'path' => '',
@ -108,7 +109,8 @@ class BuildsV1 extends Worker
                'stderr' => '',
                'duration' => 0
            ]));
-            $deployment->setAttribute('buildId', $buildId);
+            $deployment->setAttribute('buildId', $build->getId());
+            $deployment->setAttribute('buildInternalId', $build->getInternalId());
            $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
        } else {
            $build = $dbForProject->getDocument('builds', $buildId);
@ -204,6 +206,7 @@ class BuildsV1 extends Worker

            /** Set auto deploy */
            if ($deployment->getAttribute('activate') === true) {
+                $function->setAttribute('deploymentInternalId', $deployment->getInternalId());
                $function->setAttribute('deployment', $deployment->getId());
                $function = $dbForProject->updateDocument('functions', $function->getId(), $function);
            }
--- a/app/workers/functions.php
+++ b/app/workers/functions.php
@ -209,7 +209,8 @@ Server::setResource('execute', function () {
            $usage
                ->setParam('projectId', $project->getId())
                ->setParam('projectInternalId', $project->getInternalId())
-                ->setParam('functionId', $function->getId()) // TODO: We should use functionInternalId in usage stats
+                ->setParam('functionId', $function->getId())
+                ->setParam('functionInternalId', $function->getInternalId())
                ->setParam('executions.{scope}.compute', 1)
                ->setParam('executionStatus', $execution->getAttribute('status', ''))
                ->setParam('executionTime', $execution->getAttribute('duration'))
--- a/composer.lock
+++ b/composer.lock
@ -801,20 +801,21 @@
                "issues": "https://github.com/influxdata/influxdb-php/issues",
                "source": "https://github.com/influxdata/influxdb-php/tree/1.15.2"
            },
+            "abandoned": true,
            "time": "2020-12-26T17:45:17+00:00"
        },
        {
            "name": "laravel/pint",
-            "version": "v1.2.0",
+            "version": "v1.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/pint.git",
-                "reference": "1d276e4c803397a26cc337df908f55c2a4e90d86"
+                "reference": "e60e2112ee779ce60f253695b273d1646a17d6f1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/1d276e4c803397a26cc337df908f55c2a4e90d86",
-                "reference": "1d276e4c803397a26cc337df908f55c2a4e90d86",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/e60e2112ee779ce60f253695b273d1646a17d6f1",
+                "reference": "e60e2112ee779ce60f253695b273d1646a17d6f1",
                "shasum": ""
            },
            "require": {
@ -826,10 +827,10 @@
            },
            "require-dev": {
                "friendsofphp/php-cs-fixer": "^3.11.0",
-                "illuminate/view": "^9.27",
-                "laravel-zero/framework": "^9.1.3",
-                "mockery/mockery": "^1.5.0",
-                "nunomaduro/larastan": "^2.2",
+                "illuminate/view": "^9.32.0",
+                "laravel-zero/framework": "^9.2.0",
+                "mockery/mockery": "^1.5.1",
+                "nunomaduro/larastan": "^2.2.0",
                "nunomaduro/termwind": "^1.14.0",
                "pestphp/pest": "^1.22.1"
            },
@ -867,7 +868,7 @@
                "issues": "https://github.com/laravel/pint/issues",
                "source": "https://github.com/laravel/pint"
            },
-            "time": "2022-09-13T15:07:15+00:00"
+            "time": "2022-11-29T16:25:20+00:00"
        },
        {
            "name": "matomo/device-detector",
@ -1461,16 +1462,16 @@
        },
        {
            "name": "symfony/deprecation-contracts",
-            "version": "v3.1.1",
+            "version": "v3.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918"
+                "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918",
-                "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3",
+                "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3",
                "shasum": ""
            },
            "require": {
@ -1479,7 +1480,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.1-dev"
+                    "dev-main": "3.3-dev"
                },
                "thanks": {
                    "name": "symfony/contracts",
@ -1508,7 +1509,7 @@
            "description": "A generic function and convention to trigger deprecation notices",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.1.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0"
            },
            "funding": [
                {
@ -1524,7 +1525,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-02-25T11:15:52+00:00"
+            "time": "2022-11-25T10:21:52+00:00"
        },
        {
            "name": "utopia-php/abuse",
@ -2574,16 +2575,16 @@
        },
        {
            "name": "utopia-php/storage",
-            "version": "0.13.0",
+            "version": "0.13.2",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/storage.git",
-                "reference": "f34c010e4f8394a6b4aff70b6de55041d9a145d3"
+                "reference": "ad1c00f24ca56e73888acc2af3deee4919b1194b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/storage/zipball/f34c010e4f8394a6b4aff70b6de55041d9a145d3",
-                "reference": "f34c010e4f8394a6b4aff70b6de55041d9a145d3",
+                "url": "https://api.github.com/repos/utopia-php/storage/zipball/ad1c00f24ca56e73888acc2af3deee4919b1194b",
+                "reference": "ad1c00f24ca56e73888acc2af3deee4919b1194b",
                "shasum": ""
            },
            "require": {
@ -2623,9 +2624,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/storage/issues",
-                "source": "https://github.com/utopia-php/storage/tree/0.13.0"
+                "source": "https://github.com/utopia-php/storage/tree/0.13.2"
            },
-            "time": "2022-11-17T15:10:18+00:00"
+            "time": "2022-12-20T11:11:35+00:00"
        },
        {
            "name": "utopia-php/swoole",
@ -2905,30 +2906,30 @@
        },
        {
            "name": "doctrine/instantiator",
-            "version": "1.4.1",
+            "version": "1.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
                "shasum": ""
            },
            "require": {
                "php": "^7.1 || ^8.0"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^9",
+                "doctrine/coding-standard": "^9 || ^11",
                "ext-pdo": "*",
                "ext-phar": "*",
                "phpbench/phpbench": "^0.16 || ^1",
                "phpstan/phpstan": "^1.4",
                "phpstan/phpstan-phpunit": "^1",
                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.22"
+                "vimeo/psalm": "^4.30 || ^5.4"
            },
            "type": "library",
            "autoload": {
@ -2955,7 +2956,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
            },
            "funding": [
                {
@ -2971,20 +2972,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-03-03T08:28:38+00:00"
+            "time": "2022-12-30T00:15:36+00:00"
        },
        {
            "name": "matthiasmullie/minify",
-            "version": "1.3.69",
+            "version": "1.3.70",
            "source": {
                "type": "git",
                "url": "https://github.com/matthiasmullie/minify.git",
-                "reference": "a61c949cccd086808063611ef9698eabe42ef22f"
+                "reference": "2807d9f9bece6877577ad44acb5c801bb3ae536b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/a61c949cccd086808063611ef9698eabe42ef22f",
-                "reference": "a61c949cccd086808063611ef9698eabe42ef22f",
+                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/2807d9f9bece6877577ad44acb5c801bb3ae536b",
+                "reference": "2807d9f9bece6877577ad44acb5c801bb3ae536b",
                "shasum": ""
            },
            "require": {
@ -2993,9 +2994,10 @@
                "php": ">=5.3.0"
            },
            "require-dev": {
-                "friendsofphp/php-cs-fixer": "~2.0",
-                "matthiasmullie/scrapbook": "dev-master",
-                "phpunit/phpunit": ">=4.8"
+                "friendsofphp/php-cs-fixer": ">=2.0",
+                "matthiasmullie/scrapbook": ">=1.3",
+                "phpunit/phpunit": ">=4.8",
+                "squizlabs/php_codesniffer": ">=3.0"
            },
            "suggest": {
                "psr/cache-implementation": "Cache implementation to use with Minify::cache"
@ -3018,12 +3020,12 @@
                {
                    "name": "Matthias Mullie",
                    "email": "minify@mullie.eu",
-                    "homepage": "http://www.mullie.eu",
+                    "homepage": "https://www.mullie.eu",
                    "role": "Developer"
                }
            ],
            "description": "CSS & JavaScript minifier, in PHP. Removes whitespace, strips comments, combines files (incl. @import statements and small assets in CSS files), and optimizes/shortens a few common programming patterns.",
-            "homepage": "http://www.minifier.org",
+            "homepage": "https://github.com/matthiasmullie/minify",
            "keywords": [
                "JS",
                "css",
@ -3033,7 +3035,7 @@
            ],
            "support": {
                "issues": "https://github.com/matthiasmullie/minify/issues",
-                "source": "https://github.com/matthiasmullie/minify/tree/1.3.69"
+                "source": "https://github.com/matthiasmullie/minify/tree/1.3.70"
            },
            "funding": [
                {
@ -3041,7 +3043,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-08-01T09:00:18+00:00"
+            "time": "2022-12-09T12:56:44+00:00"
        },
        {
            "name": "matthiasmullie/path-converter",
@ -3157,16 +3159,16 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v4.15.2",
+            "version": "v4.15.3",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
                "shasum": ""
            },
            "require": {
@ -3207,9 +3209,9 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
            },
-            "time": "2022-11-12T15:38:23+00:00"
+            "time": "2023-01-16T22:05:37+00:00"
        },
        {
            "name": "phar-io/manifest",
@ -3489,27 +3491,28 @@
        },
        {
            "name": "phpspec/prophecy",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
+                "reference": "15873c65b207b07765dbc3c95d20fdf4a320cbe2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/15873c65b207b07765dbc3c95d20fdf4a320cbe2",
+                "reference": "15873c65b207b07765dbc3c95d20fdf4a320cbe2",
                "shasum": ""
            },
            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
+                "doctrine/instantiator": "^1.2 || ^2.0",
+                "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*",
                "phpdocumentor/reflection-docblock": "^5.2",
                "sebastian/comparator": "^3.0 || ^4.0",
                "sebastian/recursion-context": "^3.0 || ^4.0"
            },
            "require-dev": {
                "phpspec/phpspec": "^6.0 || ^7.0",
+                "phpstan/phpstan": "^1.9",
                "phpunit/phpunit": "^8.0 || ^9.0"
            },
            "type": "library",
@ -3550,22 +3553,22 @@
            ],
            "support": {
                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
+                "source": "https://github.com/phpspec/prophecy/tree/v1.17.0"
            },
-            "time": "2021-12-08T12:19:24+00:00"
+            "time": "2023-02-02T15:41:36+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "9.2.19",
+            "version": "9.2.24",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559"
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559",
-                "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2cf940ebc6355a9d430462811b5aaa308b174bed",
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed",
                "shasum": ""
            },
            "require": {
@ -3621,7 +3624,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.24"
            },
            "funding": [
                {
@ -3629,7 +3632,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-11-18T07:47:47+00:00"
+            "time": "2023-01-26T08:26:55+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@ -4341,16 +4344,16 @@
        },
        {
            "name": "sebastian/environment",
-            "version": "5.1.4",
+            "version": "5.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
                "shasum": ""
            },
            "require": {
@ -4392,7 +4395,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
            },
            "funding": [
                {
@ -4400,7 +4403,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-04-03T09:37:03+00:00"
+            "time": "2023-02-03T06:03:51+00:00"
        },
        {
            "name": "sebastian/exporter",
@ -4714,16 +4717,16 @@
        },
        {
            "name": "sebastian/recursion-context",
-            "version": "4.0.4",
+            "version": "4.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
                "shasum": ""
            },
            "require": {
@ -4762,10 +4765,10 @@
                }
            ],
            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
            "support": {
                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
            },
            "funding": [
                {
@ -4773,7 +4776,7 @@
                    "type": "github"
                }
            ],
-            "time": "2020-10-26T13:17:30+00:00"
+            "time": "2023-02-03T06:07:39+00:00"
        },
        {
            "name": "sebastian/resource-operations",
@ -4832,16 +4835,16 @@
        },
        {
            "name": "sebastian/type",
-            "version": "3.2.0",
+            "version": "3.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
                "shasum": ""
            },
            "require": {
@ -4876,7 +4879,7 @@
            "homepage": "https://github.com/sebastianbergmann/type",
            "support": {
                "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
            },
            "funding": [
                {
@ -4884,7 +4887,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-09-12T14:47:03+00:00"
+            "time": "2023-02-03T06:13:03+00:00"
        },
        {
            "name": "sebastian/version",
@ -5303,16 +5306,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.4.3",
+            "version": "v3.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58"
+                "reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/c38fd6b0b7f370c198db91ffd02e23b517426b58",
-                "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3ffcf4b7d890770466da3b2666f82ac054e7ec72",
+                "reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72",
                "shasum": ""
            },
            "require": {
@ -5327,7 +5330,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "3.5-dev"
                }
            },
            "autoload": {
@ -5363,7 +5366,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.4.3"
+                "source": "https://github.com/twigphp/Twig/tree/v3.5.0"
            },
            "funding": [
                {
@ -5375,7 +5378,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-09-28T08:42:51+00:00"
+            "time": "2022-12-27T12:28:18+00:00"
        }
    ],
    "aliases": [],
@ -5404,5 +5407,5 @@
    "platform-overrides": {
        "php": "8.0"
    },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
--- a/src/Appwrite/Migration/Version/V17.php
+++ b/src/Appwrite/Migration/Version/V17.php
@ -90,12 +90,90 @@ class V17 extends Migration

                    try {
                        /**
-                         * Create 'size'
+                         * Create 'deploymentInternalId' attribute
                         */
-                        $this->createAttributeFromCollection($this->projectDB, $id, 'size');
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'deploymentInternalId');
                        $this->projectDB->deleteCachedCollection($id);
                    } catch (\Throwable $th) {
-                        Console::warning("'size' from {$id}: {$th->getMessage()}");
+                        Console::warning("'deploymentInternalId' from {$id}: {$th->getMessage()}");
+                    }
+                    break;
+
+                case 'schedules':
+                    try {
+                        /**
+                         * Create 'resourceInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'resourceInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'resourceInternalId' from {$id}: {$th->getMessage()}");
+                    }
+                    break;
+
+                case 'functions':
+                    try {
+                        /**
+                         * Create 'deploymentInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'deploymentInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'deploymentInternalId' from {$id}: {$th->getMessage()}");
+                    }
+
+                    try {
+                        /**
+                         * Create 'scheduleInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'scheduleInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'scheduleInternalId' from {$id}: {$th->getMessage()}");
+                    }
+                    break;
+
+                case 'deployments':
+                    try {
+                        /**
+                         * Create 'resourceInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'resourceInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'resourceInternalId' from {$id}: {$th->getMessage()}");
+                    }
+
+                    try {
+                        /**
+                         * Create 'buildInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'buildInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'buildInternalId' from {$id}: {$th->getMessage()}");
+                    }
+                    break;
+
+                case 'executions':
+                    try {
+                        /**
+                         * Create 'functionInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'functionInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'functionInternalId' from {$id}: {$th->getMessage()}");
+                    }
+
+                    try {
+                        /**
+                         * Create 'deploymentInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'deploymentInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'deploymentInternalId' from {$id}: {$th->getMessage()}");
                    }
                    break;
                default: