addressing some comments
This commit is contained in:
parent
3682c1d05b
commit
0d79f19dcd
1 changed files with 20 additions and 20 deletions
|
@ -90,7 +90,7 @@ App::post('/v1/functions')
|
||||||
'search' => implode(' ', [$functionId, $name, $runtime])
|
'search' => implode(' ', [$functionId, $name, $runtime])
|
||||||
]));
|
]));
|
||||||
|
|
||||||
$log = Authorization::skip(
|
$schedule = Authorization::skip(
|
||||||
fn() => $dbForConsole->createDocument('schedules', new Document([
|
fn() => $dbForConsole->createDocument('schedules', new Document([
|
||||||
'region' => App::getEnv('_APP_REGION'), // Todo replace with projects region
|
'region' => App::getEnv('_APP_REGION'), // Todo replace with projects region
|
||||||
'resourceType' => 'function',
|
'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);
|
$dbForProject->updateDocument('functions', $function->getId(), $function);
|
||||||
|
|
||||||
$eventsInstance->setParam('functionId', $function->getId());
|
$eventsInstance->setParam('functionId', $function->getId());
|
||||||
|
@ -470,21 +470,21 @@ App::put('/v1/functions/:functionId')
|
||||||
'search' => implode(' ', [$functionId, $name, $function->getAttribute('runtime')]),
|
'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
|
* In case we want to clear the schedule
|
||||||
*/
|
*/
|
||||||
if (!empty($function->getAttribute('deployment'))) {
|
if (!empty($function->getAttribute('deployment'))) {
|
||||||
$log->setAttribute('resourceUpdatedAt', $function['scheduleUpdatedAt']);
|
$schedule->setAttribute('resourceUpdatedAt', $function['scheduleUpdatedAt']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$log
|
$schedule
|
||||||
->setAttribute('schedule', $function->getAttribute('schedule'))
|
->setAttribute('schedule', $function->getAttribute('schedule'))
|
||||||
->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
|
->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());
|
$eventsInstance->setParam('functionId', $function->getId());
|
||||||
|
|
||||||
|
@ -538,18 +538,18 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId')
|
||||||
'deployment' => $deployment->getId()
|
'deployment' => $deployment->getId()
|
||||||
])));
|
])));
|
||||||
|
|
||||||
$log = $dbForConsole->getDocument('schedules', $function['scheduleId']);
|
$schedule = $dbForConsole->getDocument('schedules', $function['scheduleId']);
|
||||||
|
|
||||||
$active = !empty($function->getAttribute('schedule'));
|
$active = !empty($function->getAttribute('schedule'));
|
||||||
|
|
||||||
if ($active) {
|
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) {
|
Authorization::skip(function () use ($dbForConsole, $schedule) {
|
||||||
$dbForConsole->updateDocument('schedules', $log->getId(), $log);
|
$dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule);
|
||||||
});
|
});
|
||||||
|
|
||||||
$events
|
$events
|
||||||
|
@ -591,15 +591,15 @@ App::delete('/v1/functions/:functionId')
|
||||||
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove function from DB');
|
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('resourceUpdatedAt', DateTime::now())
|
||||||
->setAttribute('active', false)
|
->setAttribute('active', false)
|
||||||
;
|
;
|
||||||
|
|
||||||
Authorization::skip(function () use ($dbForConsole, $log) {
|
Authorization::skip(function () use ($dbForConsole, $schedule) {
|
||||||
$dbForConsole->updateDocument('schedules', $log->getId(), $log);
|
$dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule);
|
||||||
});
|
});
|
||||||
|
|
||||||
$deletes
|
$deletes
|
||||||
|
@ -795,18 +795,18 @@ App::post('/v1/functions/:functionId/deployments')
|
||||||
* TODO Should we update also the function collection with the scheduleUpdatedAt attr?
|
* 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'));
|
$active = !empty($function->getAttribute('schedule'));
|
||||||
|
|
||||||
if ($active) {
|
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) {
|
Authorization::skip(function () use ($dbForConsole, $schedule) {
|
||||||
$dbForConsole->updateDocument('schedules', $log->getId(), $log);
|
$dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule);
|
||||||
});
|
});
|
||||||
|
|
||||||
$metadata = null;
|
$metadata = null;
|
||||||
|
|
Loading…
Reference in a new issue