Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Datetime queries #380

Merged
merged 5 commits into from
Jan 19, 2024
Merged

Datetime queries #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d230e5f
Datetime queries
fogelito Jan 17, 2024
7f8a184
Change validations
fogelito Jan 18, 2024
1d07cb7
Remove redundant tests
fogelito Jan 18, 2024
4f104ee
Apply suggestions from code review
abnegate Jan 19, 2024
77a6098
Update query value validation failure message
abnegate Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 38 additions & 9 deletions src/Database/Validator/Query/Filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Query;
use Utopia\Database\Validator\Datetime as DatetimeValidator;
use Utopia\Validator\Boolean;
use Utopia\Validator\FloatValidator;
use Utopia\Validator\Integer;
use Utopia\Validator\Text;

class Filter extends Base
{
Expand Down Expand Up @@ -88,15 +93,39 @@ protected function isValidAttributeAndValues(string $attribute, array $values):
$attributeType = $attributeSchema['type'];

foreach ($values as $value) {
$condition = match ($attributeType) {
Database::VAR_RELATIONSHIP => true,
Database::VAR_DATETIME => gettype($value) === Database::VAR_STRING,
Database::VAR_FLOAT => (gettype($value) === Database::VAR_FLOAT || gettype($value) === Database::VAR_INTEGER),
default => gettype($value) === $attributeType
};

if (!$condition) {
$this->message = 'Query type does not match expected: ' . $attributeType;

$validator = null;

switch ($attributeType) {
case Database::VAR_STRING:
$validator = new Text(0, 0);
break;

case Database::VAR_INTEGER:
$validator = new Integer();
break;

case Database::VAR_FLOAT:
$validator = new FloatValidator();
break;

case Database::VAR_BOOLEAN:
$validator = new Boolean();
break;

case Database::VAR_DATETIME:
$validator = new DatetimeValidator();
break;

case Database::VAR_RELATIONSHIP:
break;
default:
$this->message = 'Unknown Data type';
return false;
}

if (!\is_null($validator) && !$validator->isValid($value)) {
$this->message = 'Query value is invalid for attribute "' . $attribute . '"';
return false;
}
}
Expand Down
39 changes: 29 additions & 10 deletions tests/e2e/Adapter/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4534,18 +4534,37 @@ public function testCreateDatetime(): void
Query::greaterThan('date', '1975-12-06 10:00:00+01:00'),
Query::lessThan('date', '2030-12-06 10:00:00-01:00'),
]);

$this->assertEquals(1, count($documents));

$this->expectException(StructureException::class);
static::getDatabase()->createDocument('datetime', new Document([
'$permissions' => [
Permission::create(Role::any()),
Permission::update(Role::any()),
Permission::delete(Role::any()),
],
'date' => "1975-12-06 00:00:61"
]));
$documents = static::getDatabase()->find('datetime', [
Query::greaterThan('$createdAt', '1975-12-06 11:00:00.000'),
]);
$this->assertCount(1, $documents);

try {
static::getDatabase()->createDocument('datetime', new Document([
'date' => "1975-12-06 00:00:61" // 61 seconds is invalid
]));
$this->fail('Failed to throw exception');
} catch (Exception $e) {
$this->assertInstanceOf(StructureException::class, $e);
}

$invalidDates = [
'1975-12-06 00:00:61',
'16/01/2024 12:00:00AM'
];

foreach ($invalidDates as $date) {
try {
static::getDatabase()->find('datetime', [
Query::equal('date', [$date])
]);
$this->fail('Failed to throw exception');
} catch (Exception $e) {
$this->assertEquals('Invalid query: Query value is invalid for attribute "date"', $e->getMessage());
}
}
}

public function testCreateDateTimeAttributeFailure(): void
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Validator/QueryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public function testAttributeWrongType(): void

$response = $validator->isValid([Query::equal('title', [1776])]);
$this->assertEquals(false, $response);
$this->assertEquals('Invalid query: Query type does not match expected: string', $validator->getDescription());
$this->assertEquals('Invalid query: Query value is invalid for attribute "title"', $validator->getDescription());
}

/**
Expand Down
Loading