Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Reports

Browse Source
This commit is contained in:
Bradley Schofield
2023-07-14 12:05:16 +01:00
parent 79426088df
commit 94fe4f7189
2 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/migrations.php
+34 -14
View File
@@ -403,12 +403,11 @@ App::post('/v1/migrations/supabase')
->dynamic($migration, Response::MODEL_MIGRATION);
});
App::post('/v1/migrations/supabase/report')
->groups(['api', 'migrations'])
->desc('Generate a report on Supabase Data')
->label('scope', 'migrations.write')
->label('event', 'migrations.report')
->label('audits.event', 'migration.report')
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'migrations')
->label('sdk.method', 'generateSupabaseReport')
@@ -416,7 +415,7 @@ App::post('/v1/migrations/supabase/report')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_MIGRATION_REPORT)
->param('resources', [], new ArrayList(new WhiteList(Supabase::getSupportedResources(), true)), 'List of resources to migrate')
->param('resources', [], new ArrayList(new Text(100)), 'List of resources to migrate')
->param('endpoint', '', new URL(), "Source's Supabase Endpoint")
->param('apiKey', '', new Text(512), "Source's API Key")
->param('databaseHost', '', new Text(512), "Source's Database Host")
@@ -429,12 +428,22 @@ App::post('/v1/migrations/supabase/report')
->inject('user')
->inject('events')
->action(function (array $resources, string $endpoint, string $apiKey, string $databaseHost, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, Document $user, Event $eventsInstance) {
try {
$supabase = new Supabase($endpoint, $apiKey, $databaseHost, 'postgres', $username, $password, $port);
$supabase = new Supabase($endpoint, $apiKey, $databaseHost, $username, $password, $port);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic(new Document($supabase->report($resources)), Response::MODEL_MIGRATION_REPORT);
} catch (\Exception $e) {
var_dump($e->getMessage());
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic(new Document($supabase->report($resources)), Response::MODEL_MIGRATION_REPORT);
$response
->setStatusCode(Response::STATUS_CODE_BAD_REQUEST)
->json([
'status' => 'error',
'message' => $e->getMessage()
]);
}
});
App::post('/v1/migrations/nhost')
@@ -503,8 +512,8 @@ App::post('/v1/migrations/nhost/report')
->groups(['api', 'migrations'])
->desc('Generate a report on NHost Data')
->label('scope', 'migrations.write')
->label('event', 'migrations.report')
->label('audits.event', 'migration.report')
// ->label('event', 'migrations.report')
// ->label('audits.event', 'migration.report')
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'migrations')
->label('sdk.method', 'generateNHostReport')
@@ -512,7 +521,8 @@ App::post('/v1/migrations/nhost/report')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_MIGRATION_REPORT)
->param('resources', [], new ArrayList(new WhiteList(NHost::getSupportedResources())), 'List of resources to migrate')
// ->param('resources', [], new ArrayList(new WhiteList(NHost::getSupportedResources())), 'List of resources to migrate')
->param('resources', [], new ArrayList(new Text(256)), 'List of resources to migrate')
->param('subdomain', '', new URL(), "Source's Subdomain")
->param('region', '', new Text(512), "Source's Region")
->param('adminSecret', '', new Text(512), "Source's Admin Secret")
@@ -526,10 +536,20 @@ App::post('/v1/migrations/nhost/report')
->inject('user')
->inject('events')
->action(function (array $resources, string $subdomain, string $region, string $adminSecret, string $database, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, Document $user, Event $eventsInstance) {
try {
$nhost = new NHost($subdomain, $region, $adminSecret, $database, $username, $password, $port);
$nhost = new NHost($subdomain, $region, $adminSecret, $database, $username, $password, $port);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic(new Document($nhost->report($resources)), Response::MODEL_MIGRATION_REPORT);
} catch (\Exception $e) {
var_dump($e->getMessage());
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic(new Document($nhost->report($resources)), Response::MODEL_MIGRATION_REPORT);
$response
->setStatusCode(Response::STATUS_CODE_BAD_REQUEST)
->json([
'status' => 'error',
'message' => $e->getMessage()
]);
}
});
app/workers/migrations.php
+12 -11
View File
@@ -116,17 +116,6 @@ class MigrationsV1 extends Worker
protected function updateMigrationDocument(Document $migration, Document $project): Document
{
// // Trigger Webhook
// $migrationModel = new Migration();
// $migrationUpdate = new Event(Event::MIGRATIONS_QUEUE_NAME, Event::MIGRATIONS_CLASS_NAME);
// $migrationUpdate
// ->setProject($project)
// ->setEvent('migrations.[migrationId].update')
// ->setParam('migrationId', $migration->getId())
// ->setPayload($migration->getArrayCopy(array_keys($migrationModel->getRules())))
// ->trigger();
/** Trigger Realtime */
$allEvents = Event::generateEvents('migrations.[migrationId].update', [
'migrationId' => $migration->getId(),
@@ -263,6 +252,7 @@ class MigrationsV1 extends Worker
$errors = $transfer->getReport(Resource::STATUS_ERROR);
if (count($errors) > 0) {
var_dump($errors);
$migrationDocument->setAttribute('status', 'failed');
$migrationDocument->setAttribute('stage', 'finished');
$migrationDocument->setAttribute('reason', $errors[0]['message']);
@@ -283,6 +273,17 @@ class MigrationsV1 extends Worker
$migrationDocument->setAttribute('reason', $th->getMessage());
return;
}
if ($transfer) {
$errors = $transfer->getReport(Resource::STATUS_ERROR);
if (count($errors) > 0) {
var_dump($errors);
$migrationDocument->setAttribute('status', 'failed');
$migrationDocument->setAttribute('stage', 'finished');
$migrationDocument->setAttribute('reason', $errors[0]['message']);
}
}
} finally {
if ($migrationDocument) {
$this->updateMigrationDocument($migrationDocument, $projectDocument);