CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-01 01:37:56 +13:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration

Browse source
This commit is contained in:
Khushboo Verma 2023-08-09 18:37:56 +05:30
commit 88ce493aa5
7 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/tests.yml vendored
View file

@ -46,7 +46,7 @@ jobs:
- name: Start Appwrite
run: |
docker compose up -d
sleep 30
sleep 60
- name: Doctor
run: |

14
docker-compose.yml
View file

@ -722,13 +722,13 @@ services:
- _APP_CONNECTIONS_QUEUE
- _APP_REGION
appwrite-assistant:
container_name: appwrite-assistant
image: appwrite/assistant:0.1.0
networks:
- appwrite
environment:
- OPENAI_API_KEY
# appwrite-assistant:
# container_name: appwrite-assistant
# image: appwrite/assistant:0.1.0
# networks:
# - appwrite
# environment:
# - OPENAI_API_KEY
openruntimes-executor:
container_name: openruntimes-executor

2
src/Appwrite/GraphQL/Resolvers.php
View file

@ -269,7 +269,7 @@ class Resolvers
try {
$route = $utopia->match($request, fresh: true);
$utopia->execute($route, $request);
$utopia->execute($route, $request, $response);
} catch (\Throwable $e) {
if ($beforeReject) {
$e = $beforeReject($e);

2
src/Appwrite/Utopia/Response/Filters/V12.php
View file

@ -81,7 +81,7 @@ class V12 extends Filter
case Response::MODEL_WEBHOOK_LIST:
case Response::MODEL_KEY_LIST:
case Response::MODEL_PLATFORM_LIST:
case Response::MODEL_DOMAIN_LIST:
// case Response::MODEL_DOMAIN_LIST:
case Response::MODEL_COUNTRY_LIST:
case Response::MODEL_CONTINENT_LIST:
case Response::MODEL_LANGUAGE_LIST:

8
src/Appwrite/Utopia/Response/Filters/V14.php
View file

@ -23,7 +23,7 @@ class V14 extends Filter
break;
case Response::MODEL_DOCUMENT:
case Response::MODEL_DOMAIN:
// case Response::MODEL_DOMAIN:
case Response::MODEL_FUNCTION:
case Response::MODEL_TEAM:
case Response::MODEL_MEMBERSHIP:
@ -38,10 +38,10 @@ class V14 extends Filter
$parsedResponse = $this->parseRemoveAttributesList($content, 'documents', ['$createdAt', '$updatedAt']);
break;
case Response::MODEL_DOMAIN_LIST:
$parsedResponse = $this->parseRemoveAttributesList($content, 'domains', ['$createdAt', '$updatedAt']);
// case Response::MODEL_DOMAIN_LIST:
// $parsedResponse = $this->parseRemoveAttributesList($content, 'domains', ['$createdAt', '$updatedAt']);
break;
// break;
case Response::MODEL_FUNCTION_LIST:
$parsedResponse = $this->parseRemoveAttributesList($content, 'functions', ['$createdAt', '$updatedAt']);

10
src/Appwrite/Utopia/Response/Filters/V15.php
View file

@ -50,7 +50,7 @@ class V15 extends Filter
break;
case Response::MODEL_DATABASE:
case Response::MODEL_DEPLOYMENT:
case Response::MODEL_DOMAIN:
// case Response::MODEL_DOMAIN:
case Response::MODEL_PLATFORM:
case Response::MODEL_PROJECT:
case Response::MODEL_TEAM:
@ -59,7 +59,7 @@ class V15 extends Filter
break;
case Response::MODEL_DATABASE_LIST:
case Response::MODEL_DEPLOYMENT_LIST:
case Response::MODEL_DOMAIN_LIST:
// case Response::MODEL_DOMAIN_LIST:
case Response::MODEL_PLATFORM_LIST:
case Response::MODEL_PROJECT_LIST:
case Response::MODEL_TEAM_LIST:
@ -72,9 +72,9 @@ class V15 extends Filter
case Response::MODEL_DEPLOYMENT_LIST:
$listKey = 'deployments';
break;
case Response::MODEL_DOMAIN_LIST:
$listKey = 'domains';
break;
// case Response::MODEL_DOMAIN_LIST:
// $listKey = 'domains';
// break;
case Response::MODEL_PLATFORM_LIST:
$listKey = 'platforms';
break;

52
tests/unit/Utopia/Response/Filters/V15Test.php
View file

@ -562,39 +562,39 @@ class V15Test extends TestCase
$this->assertEquals($expected, $result);
}
/**
* @dataProvider createdAtUpdatedAtProvider
*/
public function testDomain(array $content, array $expected): void
{
$model = Response::MODEL_DOMAIN;
// /**
// * @dataProvider createdAtUpdatedAtProvider
// */
// public function testDomain(array $content, array $expected): void
// {
// $model = Response::MODEL_DOMAIN;
$result = $this->filter->parse($content, $model);
// $result = $this->filter->parse($content, $model);
$this->assertEquals($expected, $result);
}
// $this->assertEquals($expected, $result);
// }
/**
* @dataProvider createdAtUpdatedAtProvider
*/
public function testDomainList(array $content, array $expected): void
{
$model = Response::MODEL_DOMAIN_LIST;
// /**
// * @dataProvider createdAtUpdatedAtProvider
// */
// public function testDomainList(array $content, array $expected): void
// {
// $model = Response::MODEL_DOMAIN_LIST;
$content = [
'domains' => [$content],
'total' => 1,
];
// $content = [
// 'domains' => [$content],
// 'total' => 1,
// ];
$expected = [
'domains' => [$expected],
'total' => 1,
];
// $expected = [
// 'domains' => [$expected],
// 'total' => 1,
// ];
$result = $this->filter->parse($content, $model);
// $result = $this->filter->parse($content, $model);
$this->assertEquals($expected, $result);
}
// $this->assertEquals($expected, $result);
// }
public function executionProvider(): array
{