From b09a254d3c3424af9b2ef5cc92c6f5b8e7e2845b Mon Sep 17 00:00:00 2001 From: shimon Date: Mon, 23 Oct 2023 10:46:15 +0300 Subject: [PATCH 1/4] fix mod condition --- app/controllers/api/projects.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index 43fbd43b74..b1ab7d5743 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -101,9 +101,9 @@ App::post('/v1/projects') $databases = Config::getParam('pools-database', []); $databaseSelfHosted = 'database_db_fra1_self_hosted_0_0'; - $index = array_search($databaseSelfHosted, $databases); - if ($index !== false) { - unset($databases[$index]); + $SelfHostedIndex = array_search($databaseSelfHosted, $databases); + if ($SelfHostedIndex !== false) { + unset($databases[$SelfHostedIndex]); } /** @@ -179,8 +179,7 @@ App::post('/v1/projects') * Update database with self-managed db every $mod projects */ $mod = 20; - $index = in_array($databaseSelfHosted, $databases); - if ($project->getInternalId() % $mod === 0 && $index !== false) { + if ($project->getInternalId() % $mod === 0 && $SelfHostedIndex !== false) { $project->setAttribute('database', $databaseSelfHosted); $dbForConsole->updateDocument('projects', $project); } From 2ef8490691117254154c71a365ac58cf84df422d Mon Sep 17 00:00:00 2001 From: shimon Date: Mon, 23 Oct 2023 11:22:28 +0300 Subject: [PATCH 2/4] fix mod condition --- app/controllers/api/projects.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index b1ab7d5743..dd152683a1 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -101,9 +101,9 @@ App::post('/v1/projects') $databases = Config::getParam('pools-database', []); $databaseSelfHosted = 'database_db_fra1_self_hosted_0_0'; - $SelfHostedIndex = array_search($databaseSelfHosted, $databases); - if ($SelfHostedIndex !== false) { - unset($databases[$SelfHostedIndex]); + $selfHostedIndex = array_search($databaseSelfHosted, $databases); + if ($selfHostedIndex !== false) { + unset($databases[$selfHostedIndex]); } /** @@ -179,7 +179,7 @@ App::post('/v1/projects') * Update database with self-managed db every $mod projects */ $mod = 20; - if ($project->getInternalId() % $mod === 0 && $SelfHostedIndex !== false) { + if ($project->getInternalId() % $mod === 0 && $selfHostedIndex !== false) { $project->setAttribute('database', $databaseSelfHosted); $dbForConsole->updateDocument('projects', $project); } From 808f682fa721c09540f2976f256e7729f187ff2e Mon Sep 17 00:00:00 2001 From: Shimon Newman Date: Mon, 23 Oct 2023 11:25:31 +0300 Subject: [PATCH 3/4] Update app/controllers/api/projects.php Co-authored-by: Christy Jacob --- app/controllers/api/projects.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index dd152683a1..4ae6d7b6cb 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -180,6 +180,7 @@ App::post('/v1/projects') */ $mod = 20; if ($project->getInternalId() % $mod === 0 && $selfHostedIndex !== false) { + $database = $databaseSelfHosted; $project->setAttribute('database', $databaseSelfHosted); $dbForConsole->updateDocument('projects', $project); } From 3dee8d6ecd3dbaea289f2a55bb404769ce0ce380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=B7=E5=8D=8E=20=E5=88=98?= Date: Mon, 23 Oct 2023 08:34:57 +0000 Subject: [PATCH 4/4] fix: update incorrect method call --- app/controllers/api/projects.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php index 4ae6d7b6cb..fe7759a6df 100644 --- a/app/controllers/api/projects.php +++ b/app/controllers/api/projects.php @@ -180,9 +180,9 @@ App::post('/v1/projects') */ $mod = 20; if ($project->getInternalId() % $mod === 0 && $selfHostedIndex !== false) { - $database = $databaseSelfHosted; - $project->setAttribute('database', $databaseSelfHosted); - $dbForConsole->updateDocument('projects', $project); + $database = $databaseSelfHosted; + $project->setAttribute('database', $database); + $dbForConsole->updateDocument('projects', $project->getId(), $project); } $dbForProject = new Database($pools->get($database)->pop()->getResource(), $cache);