CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-09-28 15:31:43 +12:00
Code Issues Projects Releases Wiki Activity

refactor: import instead of FQDN

Browse source
This commit is contained in:
Binyamin Yawitz 2024-09-05 13:26:26 -04:00
parent 41bffa0165
commit 0ecc61fe9e
No known key found for this signature in database
5 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Appwrite/GraphQL/Schema.php
View file

@ -3,7 +3,7 @@
namespace Appwrite\GraphQL;
use Appwrite\GraphQL\Types\Mapper;
use Appwrite\Utopia\Response;
use Appwrite\Utopia\Response\Models;
use GraphQL\Type\Definition\ObjectType;
use GraphQL\Type\Definition\Type;
use GraphQL\Type\Schema as GQLSchema;
@ -98,7 +98,7 @@ class Schema
*/
protected function api(Http $http, Request $request, UtopiaHttpResponse $response, Container $container, callable $complexity): array
{
Mapper::init(Response\Models::getModels());
Mapper::init(Models::getModels());
$mapper = new Mapper();

3
src/Appwrite/Platform/Tasks/Specs.php
View file

@ -6,6 +6,7 @@ use Appwrite\Specification\Format\OpenAPI3;
use Appwrite\Specification\Format\Swagger2;
use Appwrite\Specification\Specification;
use Appwrite\Utopia\Response;
use Appwrite\Utopia\Response\Models;
use Exception;
use Swoole\Http\Request as SwooleHttpRequest;
use Swoole\Http\Response as SwooleHttpResponse;
@ -256,7 +257,7 @@ class Specs extends Action
];
}
$models = Response\Models::getModels();
$models = Models::getModels();
foreach ($models as $key => $value) {
if ($platform !== APP_PLATFORM_CONSOLE && !$value->isPublic()) {

7
src/Appwrite/Utopia/Response.php
View file

@ -4,6 +4,7 @@ namespace Appwrite\Utopia;
use Appwrite\Utopia\Fetch\BodyMultipart;
use Appwrite\Utopia\Response\Filter;
use Appwrite\Utopia\Response\Models;
use Exception;
use JsonException;
// Keep last
@ -306,7 +307,7 @@ class Response extends HttpResponse
public function output(Document $document, string $model): array
{
$data = clone $document;
$model = Response\Models::getModel($model);
$model = Models::getModel($model);
$output = [];
$data = $model->filter($data);
@ -336,7 +337,7 @@ class Response extends HttpResponse
if (\is_array($rule['type'])) {
foreach ($rule['type'] as $type) {
$condition = false;
foreach (Response\Models::getModel($type)->conditions as $attribute => $val) {
foreach (Models::getModel($type)->conditions as $attribute => $val) {
$condition = $item->getAttribute($attribute) === $val;
if (!$condition) {
break;
@ -351,7 +352,7 @@ class Response extends HttpResponse
$ruleType = $rule['type'];
}
if (!array_key_exists($ruleType, Response\Models::getModels())) {
if (!array_key_exists($ruleType, Models::getModels())) {
throw new Exception('Missing model for rule: ' . $ruleType);
}

7
tests/unit/GraphQL/BuilderTest.php
View file

@ -4,6 +4,7 @@ namespace Tests\Unit\GraphQL;
use Appwrite\GraphQL\Types\Mapper;
use Appwrite\Utopia\Response;
use Appwrite\Utopia\Response\Models;
use PHPUnit\Framework\TestCase;
use Swoole\Http\Response as SwooleResponse;
use Utopia\Http\Adapter\Swoole\Response as UtopiaSwooleResponse;
@ -14,9 +15,9 @@ class BuilderTest extends TestCase
public function setUp(): void
{
Response\Models::init();
Models::init();
$this->response = new Response(new UtopiaSwooleResponse(new SwooleResponse()));
Mapper::init(Response\Models::getModels());
Mapper::init(Models::getModels());
}
/**
@ -24,7 +25,7 @@ class BuilderTest extends TestCase
*/
public function testCreateTypeMapping()
{
$model = Response\Models::getModel(Response::MODEL_COLLECTION);
$model = Models::getModel(Response::MODEL_COLLECTION);
$type = Mapper::model(\ucfirst($model->getType()));
$this->assertEquals('Collection', $type->name);
}

7
tests/unit/Utopia/ResponseTest.php
View file

@ -3,6 +3,7 @@
namespace Tests\Unit\Utopia;
use Appwrite\Utopia\Response;
use Appwrite\Utopia\Response\Models;
use Exception;
use PHPUnit\Framework\TestCase;
use Swoole\Http\Response as SwooleResponse;
@ -18,9 +19,9 @@ class ResponseTest extends TestCase
public function setUp(): void
{
$this->response = new Response(new UtopiaSwooleResponse(new SwooleResponse()));
Response\Models::setModel(new Single());
Response\Models::setModel(new Lists());
Response\Models::setModel(new Nested());
Models::setModel(new Single());
Models::setModel(new Lists());
Models::setModel(new Nested());
}
public function testFilters(): void