From 0d79f19dcd2c4f4f22e1d5e8336ff9965fabecc4 Mon Sep 17 00:00:00 2001 From: shimon Date: Tue, 15 Nov 2022 18:14:52 +0200 Subject: [PATCH] addressing some comments --- app/controllers/api/functions.php | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php index 6f09e27385..fb688aaae3 100644 --- a/app/controllers/api/functions.php +++ b/app/controllers/api/functions.php @@ -90,7 +90,7 @@ App::post('/v1/functions') 'search' => implode(' ', [$functionId, $name, $runtime]) ])); - $log = Authorization::skip( + $schedule = Authorization::skip( fn() => $dbForConsole->createDocument('schedules', new Document([ 'region' => App::getEnv('_APP_REGION'), // Todo replace with projects region 'resourceType' => 'function', @@ -102,7 +102,7 @@ App::post('/v1/functions') ])) ); - $function->setAttribute('scheduleId', $log->getId()); + $function->setAttribute('scheduleId', $schedule->getId()); $dbForProject->updateDocument('functions', $function->getId(), $function); $eventsInstance->setParam('functionId', $function->getId()); @@ -470,21 +470,21 @@ App::put('/v1/functions/:functionId') 'search' => implode(' ', [$functionId, $name, $function->getAttribute('runtime')]), ]))); - $log = $dbForConsole->getDocument('schedules', $function['scheduleId']); + $schedule = $dbForConsole->getDocument('schedules', $function['scheduleId']); /** * In case we want to clear the schedule */ if (!empty($function->getAttribute('deployment'))) { - $log->setAttribute('resourceUpdatedAt', $function['scheduleUpdatedAt']); + $schedule->setAttribute('resourceUpdatedAt', $function['scheduleUpdatedAt']); } - $log + $schedule ->setAttribute('schedule', $function->getAttribute('schedule')) ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment'))); - $dbForConsole->updateDocument('schedules', $log->getId(), $log); + $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule); $eventsInstance->setParam('functionId', $function->getId()); @@ -538,18 +538,18 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId') 'deployment' => $deployment->getId() ]))); - $log = $dbForConsole->getDocument('schedules', $function['scheduleId']); + $schedule = $dbForConsole->getDocument('schedules', $function['scheduleId']); $active = !empty($function->getAttribute('schedule')); if ($active) { - $log->setAttribute('resourceUpdatedAt', datetime::now()); + $schedule->setAttribute('resourceUpdatedAt', datetime::now()); } - $log->setAttribute('active', $active); + $schedule->setAttribute('active', $active); - Authorization::skip(function () use ($dbForConsole, $log) { - $dbForConsole->updateDocument('schedules', $log->getId(), $log); + Authorization::skip(function () use ($dbForConsole, $schedule) { + $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule); }); $events @@ -591,15 +591,15 @@ App::delete('/v1/functions/:functionId') throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove function from DB'); } - $log = $dbForConsole->getDocument('schedules', $function['scheduleId']); + $schedule = $dbForConsole->getDocument('schedules', $function['scheduleId']); - $log + $schedule ->setAttribute('resourceUpdatedAt', DateTime::now()) ->setAttribute('active', false) ; - Authorization::skip(function () use ($dbForConsole, $log) { - $dbForConsole->updateDocument('schedules', $log->getId(), $log); + Authorization::skip(function () use ($dbForConsole, $schedule) { + $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule); }); $deletes @@ -795,18 +795,18 @@ App::post('/v1/functions/:functionId/deployments') * TODO Should we update also the function collection with the scheduleUpdatedAt attr? */ - $log = $dbForConsole->getDocument('schedules', $function['scheduleId']); + $schedule = $dbForConsole->getDocument('schedules', $function['scheduleId']); $active = !empty($function->getAttribute('schedule')); if ($active) { - $log->setAttribute('resourceUpdatedAt', datetime::now()); + $schedule->setAttribute('resourceUpdatedAt', datetime::now()); } - $log->setAttribute('active', $active); + $schedule->setAttribute('active', $active); - Authorization::skip(function () use ($dbForConsole, $log) { - $dbForConsole->updateDocument('schedules', $log->getId(), $log); + Authorization::skip(function () use ($dbForConsole, $schedule) { + $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule); }); $metadata = null;