Skip to content

Add time between queries #684

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

Merged
abnegate merged 1 commit into from
Sep 4, 2025
Merged

Add time between queries #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 24 additions & 0 deletions src/Database/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,30 @@ public static function updatedAfter(string $value): self
return self::greaterThan('$updatedAt', $value);
}

/**
* Helper method to create Query for documents created between two dates
*
* @param string $start
* @param string $end
* @return Query
*/
public static function createdBetween(string $start, string $end): self
{
return self::between('$createdAt', $start, $end);
}

/**
* Helper method to create Query for documents updated between two dates
*
* @param string $start
* @param string $end
* @return Query
*/
public static function updatedBetween(string $start, string $end): self
{
return self::between('$updatedAt', $start, $end);
}

/**
* @param array<Query> $queries
* @return Query
Expand Down
92 changes: 92 additions & 0 deletions tests/e2e/Adapter/Scopes/DocumentTests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2745,6 +2745,98 @@ public function testFindUpdatedAfter(): void
$this->assertEquals(0, count($documents));
}

public function testFindCreatedBetween(): void
{
/** @var Database $database */
$database = static::getDatabase();

/**
* Test Query::createdBetween wrapper
*/
$pastDate = '1900-01-01T00:00:00.000Z';
$futureDate = '2050-01-01T00:00:00.000Z';
$recentPastDate = '2020-01-01T00:00:00.000Z';
$nearFutureDate = '2025-01-01T00:00:00.000Z';

// All documents should be between past and future
$documents = $database->find('movies', [
Query::createdBetween($pastDate, $futureDate),
Query::limit(25)
]);

$this->assertGreaterThan(0, count($documents));

// No documents should exist in this range
$documents = $database->find('movies', [
Query::createdBetween($pastDate, $pastDate),
Query::limit(25)
]);

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

// Documents created between recent past and near future
$documents = $database->find('movies', [
Query::createdBetween($recentPastDate, $nearFutureDate),
Query::limit(25)
]);

$count = count($documents);

// Same count should be returned with expanded range
$documents = $database->find('movies', [
Query::createdBetween($pastDate, $nearFutureDate),
Query::limit(25)
]);

$this->assertGreaterThanOrEqual($count, count($documents));
}

public function testFindUpdatedBetween(): void
{
/** @var Database $database */
$database = static::getDatabase();

/**
* Test Query::updatedBetween wrapper
*/
$pastDate = '1900-01-01T00:00:00.000Z';
$futureDate = '2050-01-01T00:00:00.000Z';
$recentPastDate = '2020-01-01T00:00:00.000Z';
$nearFutureDate = '2025-01-01T00:00:00.000Z';

// All documents should be between past and future
$documents = $database->find('movies', [
Query::updatedBetween($pastDate, $futureDate),
Query::limit(25)
]);

$this->assertGreaterThan(0, count($documents));

// No documents should exist in this range
$documents = $database->find('movies', [
Query::updatedBetween($pastDate, $pastDate),
Query::limit(25)
]);

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

// Documents updated between recent past and near future
$documents = $database->find('movies', [
Query::updatedBetween($recentPastDate, $nearFutureDate),
Query::limit(25)
]);

$count = count($documents);

// Same count should be returned with expanded range
$documents = $database->find('movies', [
Query::updatedBetween($pastDate, $nearFutureDate),
Query::limit(25)
]);

$this->assertGreaterThanOrEqual($count, count($documents));
}

public function testFindLimit(): void
{
/** @var Database $database */
Expand Down
22 changes: 22 additions & 0 deletions tests/unit/QueryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,18 @@ public function testCreate(): void
$this->assertEquals(Query::TYPE_GREATER, $query->getMethod());
$this->assertEquals('$updatedAt', $query->getAttribute());
$this->assertEquals(['2023-12-31T23:59:59.999Z'], $query->getValues());

$query = Query::createdBetween('2023-01-01T00:00:00.000Z', '2023-12-31T23:59:59.999Z');

$this->assertEquals(Query::TYPE_BETWEEN, $query->getMethod());
$this->assertEquals('$createdAt', $query->getAttribute());
$this->assertEquals(['2023-01-01T00:00:00.000Z', '2023-12-31T23:59:59.999Z'], $query->getValues());

$query = Query::updatedBetween('2023-01-01T00:00:00.000Z', '2023-12-31T23:59:59.999Z');

$this->assertEquals(Query::TYPE_BETWEEN, $query->getMethod());
$this->assertEquals('$updatedAt', $query->getAttribute());
$this->assertEquals(['2023-01-01T00:00:00.000Z', '2023-12-31T23:59:59.999Z'], $query->getValues());
}

/**
Expand Down Expand Up @@ -271,6 +283,16 @@ public function testParse(): void
$this->assertEquals('$updatedAt', $query->getAttribute());
$this->assertEquals(['2023-12-31T23:59:59.999Z'], $query->getValues());

$query = Query::parse(Query::createdBetween('2023-01-01T00:00:00.000Z', '2023-12-31T23:59:59.999Z')->toString());
$this->assertEquals('between', $query->getMethod());
$this->assertEquals('$createdAt', $query->getAttribute());
$this->assertEquals(['2023-01-01T00:00:00.000Z', '2023-12-31T23:59:59.999Z'], $query->getValues());

$query = Query::parse(Query::updatedBetween('2023-01-01T00:00:00.000Z', '2023-12-31T23:59:59.999Z')->toString());
$this->assertEquals('between', $query->getMethod());
$this->assertEquals('$updatedAt', $query->getAttribute());
$this->assertEquals(['2023-01-01T00:00:00.000Z', '2023-12-31T23:59:59.999Z'], $query->getValues());

$query = Query::parse(Query::between('age', 15, 18)->toString());
$this->assertEquals('between', $query->getMethod());
$this->assertEquals('age', $query->getAttribute());
Expand Down