PR review changes

This commit is contained in:
Matej Bačo
2022-08-23 15:01:57 +00:00
parent 531d57feff
commit 11c8fccd88
13 changed files with 28 additions and 72 deletions
Generated
+1 -1
View File
@@ -2874,7 +2874,7 @@
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
"support": {
"issues": "https://github.com/appwrite/sdk-generator/issues",
"source": "https://github.com/appwrite/sdk-generator/tree/master"
"source": "https://github.com/appwrite/sdk-generator/tree/feat-change-default-functionID"
},
"time": "2022-08-19T10:03:22+00:00"
},
@@ -12,7 +12,7 @@ use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document;
class Collection extends IndexedQueries
class Base extends IndexedQueries
{
/**
* Expression constructor
@@ -49,12 +49,12 @@ class Collection extends IndexedQueries
'array' => false,
]);
$attributes[] = new Document([
'$id' => '$createdAt',
'key' => '$createdAt',
'type' => Database::VAR_DATETIME,
'array' => false,
]);
$attributes[] = new Document([
'$id' => '$updatedAt',
'key' => '$updatedAt',
'type' => Database::VAR_DATETIME,
'array' => false,
]);
@@ -2,15 +2,11 @@
namespace Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\Queries\Collection;
use Appwrite\Utopia\Database\Validator\Queries\Base;
class Buckets extends Collection
class Buckets extends Base
{
public const ALLOWED_ATTRIBUTES = [
'$id',
'$createdAt',
'$updatedAt',
'enabled',
'name',
'fileSecurity',
@@ -2,15 +2,11 @@
namespace Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\Queries\Collection;
use Appwrite\Utopia\Database\Validator\Queries\Base;
class Collections extends Collection
class Collections extends Base
{
public const ALLOWED_ATTRIBUTES = [
'$id',
'$createdAt',
'$updatedAt',
'name',
'enabled',
'documentSecurity'
@@ -2,15 +2,11 @@
namespace Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\Queries\Collection;
use Appwrite\Utopia\Database\Validator\Queries\Base;
class Databases extends Collection
class Databases extends Base
{
public const ALLOWED_ATTRIBUTES = [
'$id',
'$createdAt',
'$updatedAt',
'name'
];
@@ -2,15 +2,11 @@
namespace Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\Queries\Collection;
use Appwrite\Utopia\Database\Validator\Queries\Base;
class Deployments extends Collection
class Deployments extends Base
{
public const ALLOWED_ATTRIBUTES = [
'$id',
'$createdAt',
'$updatedAt',
'entrypoint',
'size',
'buildId',
@@ -2,15 +2,11 @@
namespace Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\Queries\Collection;
use Appwrite\Utopia\Database\Validator\Queries\Base;
class Executions extends Collection
class Executions extends Base
{
public const ALLOWED_ATTRIBUTES = [
'$id',
'$createdAt',
'$updatedAt',
'trigger',
'status',
'statusCode',
@@ -2,15 +2,11 @@
namespace Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\Queries\Collection;
use Appwrite\Utopia\Database\Validator\Queries\Base;
class Files extends Collection
class Files extends Base
{
public const ALLOWED_ATTRIBUTES = [
'$id',
'$createdAt',
'$updatedAt',
'name',
'signature',
'mimeType',
@@ -2,15 +2,11 @@
namespace Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\Queries\Collection;
use Appwrite\Utopia\Database\Validator\Queries\Base;
class Functions extends Collection
class Functions extends Base
{
public const ALLOWED_ATTRIBUTES = [
'$id',
'$createdAt',
'$updatedAt',
'name',
'status',
'runtime',
@@ -2,21 +2,13 @@
namespace Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\Queries\Collection;
use Appwrite\Utopia\Database\Validator\Queries\Base;
class TeamMemberships extends Collection
class TeamMemberships extends Base
{
public const ALLOWED_ATTRIBUTES = [
'$id',
'$createdAt',
'$updatedAt',
'userId',
'userName',
'userName',
'userEmail',
'teamId',
'teamName',
'invited',
'joined',
'confirm'
@@ -2,15 +2,11 @@
namespace Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\Queries\Collection;
use Appwrite\Utopia\Database\Validator\Queries\Base;
class Teams extends Collection
class Teams extends Base
{
public const ALLOWED_ATTRIBUTES = [
'$id',
'$createdAt',
'$updatedAt',
'name',
'total'
];
@@ -2,15 +2,11 @@
namespace Appwrite\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\Queries\Collection;
use Appwrite\Utopia\Database\Validator\Queries\Base;
class Users extends Collection
class Users extends Base
{
public const ALLOWED_ATTRIBUTES = [
'$id',
'$createdAt',
'$updatedAt',
'name',
'email',
'phone',
@@ -2,7 +2,7 @@
namespace Tests\Unit\Utopia\Database\Validator\Queries;
use Appwrite\Utopia\Database\Validator\Queries\Collection;
use Appwrite\Utopia\Database\Validator\Queries\Base;
use PHPUnit\Framework\TestCase;
class CollectionTest extends TestCase
@@ -17,14 +17,14 @@ class CollectionTest extends TestCase
public function testEmptyQueries(): void
{
$validator = new Collection('users', []);
$validator = new Base('users', []);
$this->assertEquals($validator->isValid([]), true);
}
public function testValid(): void
{
$validator = new Collection('users', ['name', 'search']);
$validator = new Base('users', ['name', 'search']);
$this->assertEquals(true, $validator->isValid(['cursorAfter("asdf")']), $validator->getDescription());
$this->assertEquals(true, $validator->isValid(['equal("name", "value")']), $validator->getDescription());
$this->assertEquals(true, $validator->isValid(['limit(10)']), $validator->getDescription());
@@ -35,7 +35,7 @@ class CollectionTest extends TestCase
public function testMissingIndex(): void
{
$validator = new Collection('users', ['name']);
$validator = new Base('users', ['name']);
$this->assertEquals(false, $validator->isValid(['equal("dne", "value")']), $validator->getDescription());
$this->assertEquals(false, $validator->isValid(['orderAsc("dne")']), $validator->getDescription());
$this->assertEquals(false, $validator->isValid(['search("search", "value")']), $validator->getDescription());