From 89b4d0026a7b2536a8c178ff70219577139b6909 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Fri, 28 Oct 2022 10:04:31 +1300 Subject: [PATCH] Move shutdown hook to graphql controller --- app/controllers/api/graphql.php | 19 ++++++++++++++----- app/controllers/shared/api.php | 8 -------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/controllers/api/graphql.php b/app/controllers/api/graphql.php index f1c8a6850f..63b0ec1076 100644 --- a/app/controllers/api/graphql.php +++ b/app/controllers/api/graphql.php @@ -2,16 +2,18 @@ use Appwrite\Extend\Exception; use Appwrite\GraphQL\Promises\Adapter; +use Appwrite\GraphQL\Schema; use Appwrite\Utopia\Request; use Appwrite\Utopia\Response; use GraphQL\Error\DebugFlag; use GraphQL\GraphQL; -use GraphQL\Type\Schema; +use GraphQL\Type\Schema as GQLSchema; use GraphQL\Validator\Rules\DisableIntrospection; use GraphQL\Validator\Rules\QueryComplexity; use GraphQL\Validator\Rules\QueryDepth; use Swoole\Coroutine\WaitGroup; use Utopia\App; +use Utopia\Database\Document; use Utopia\Validator\JSON; use Utopia\Validator\Text; @@ -35,7 +37,7 @@ App::get('/v1/graphql') ->inject('response') ->inject('schema') ->inject('promiseAdapter') - ->action(function (string $query, string $operationName, string $variables, Request $request, Response $response, Schema $schema, Adapter $promiseAdapter) { + ->action(function (string $query, string $operationName, string $variables, Request $request, Response $response, GQLSchema $schema, Adapter $promiseAdapter) { $query = [ 'query' => $query, ]; @@ -76,7 +78,7 @@ App::post('/v1/graphql') ->inject('response') ->inject('schema') ->inject('promiseAdapter') - ->action(function (Request $request, Response $response, Schema $schema, Adapter $promiseAdapter) { + ->action(function (Request $request, Response $response, GQLSchema $schema, Adapter $promiseAdapter) { $query = $request->getParams(); if ($request->getHeader('x-sdk-graphql') == 'true') { @@ -102,14 +104,14 @@ App::post('/v1/graphql') /** * Execute a GraphQL request * - * @param Schema $schema + * @param GQLSchema $schema * @param Adapter $promiseAdapter * @param array $query * @return array * @throws Exception */ function execute( - Schema $schema, + GQLSchema $schema, Adapter $promiseAdapter, array $query ): array { @@ -233,3 +235,10 @@ function processResult($result, $debugFlags): array $result ); } + +App::shutdown() + ->groups(['schema']) + ->inject('project') + ->action(function (Document $project) { + Schema::setDirty($project->getId()); + }); diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index 25c30f05dd..594906841c 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -7,7 +7,6 @@ use Appwrite\Event\Delete; use Appwrite\Event\Event; use Appwrite\Event\Mail; use Appwrite\Extend\Exception; -use Appwrite\GraphQL\Schema; use Appwrite\Messaging\Adapter\Realtime; use Appwrite\Usage\Stats; use Appwrite\Utopia\Response; @@ -435,10 +434,3 @@ App::shutdown() ->submit(); } }); - -App::shutdown() - ->groups(['schema']) - ->inject('project') - ->action(function (Document $project) { - Schema::setDirty($project->getId()); - });