CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-12 18:05:55 +12:00
Code Issues Projects Releases Wiki Activity

chore: matej review p1

Browse source
This commit is contained in:
loks0n 2024-06-26 11:01:43 +01:00
parent dab0a17082
commit 878f6c86df
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Appwrite/Platform/Tasks/ScheduleExecutions.php
View file

@ -42,6 +42,8 @@ class ScheduleExecutions extends ScheduleBase
$queueForFunctions $queueForFunctions
->setType('schedule') ->setType('schedule')
// Set functionId rather than function as we don't have access to $dbForProject
// TODO: Refactor to use function instead of functionId
->setFunctionId($schedule['resource']['functionId']) ->setFunctionId($schedule['resource']['functionId'])
->setExecution($schedule['resource']) ->setExecution($schedule['resource'])
->setProject($schedule['project']) ->setProject($schedule['project'])

21
tests/e2e/Services/Functions/FunctionsCustomClientTest.php
View file

@ -59,7 +59,6 @@ class FunctionsCustomClientTest extends Scope
'execute' => [Role::user($this->getUser()['$id'])->toString()], 'execute' => [Role::user($this->getUser()['$id'])->toString()],
'runtime' => 'php-8.0', 'runtime' => 'php-8.0',
'entrypoint' => 'index.php', 'entrypoint' => 'index.php',
'logging' => true,
'events' => [ 'events' => [
'users.*.create', 'users.*.create',
'users.*.delete', 'users.*.delete',
@ -256,7 +255,7 @@ class FunctionsCustomClientTest extends Scope
\sleep(1); \sleep(1);
} }
$this->assertEquals('ready', $deployment['body']['status'], \json_encode($deployment['body'])); $this->assertEquals('ready', $deployment['body']['status']);
$function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [ $function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [
'content-type' => 'application/json', 'content-type' => 'application/json',
@ -278,7 +277,7 @@ class FunctionsCustomClientTest extends Scope
]); ]);
$this->assertEquals(202, $execution['headers']['status-code']); $this->assertEquals(202, $execution['headers']['status-code']);
$this->assertEquals('scheduled', $execution['body']['status'], \json_encode($execution['body'])); $this->assertEquals('scheduled', $execution['body']['status']);
$executionId = $execution['body']['$id']; $executionId = $execution['body']['$id'];
@ -291,7 +290,21 @@ class FunctionsCustomClientTest extends Scope
]); ]);
$this->assertEquals(200, $execution['headers']['status-code']); $this->assertEquals(200, $execution['headers']['status-code']);
$this->assertEquals('completed', $execution['body']['status'], \json_encode($execution['body'])); $this->assertEquals('completed', $execution['body']['status']);
/* Test for FAILURE */
// Schedule synchronous execution
$execution = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/executions', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'async' => false,
'scheduledAt' => $futureTime,
]);
$this->assertEquals(400, $execution['headers']['status-code']);
// Cleanup : Delete function // Cleanup : Delete function
$response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $function['body']['$id'], [ $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $function['body']['$id'], [