diff --git a/src/Filter/DateRange.php b/src/Filter/DateRange.php index 5d7b488b2ad5469af4c572a435a32a193d869c55..6fef58c7345f3e6693130e37a9539cd36c1cf06c 100644 --- a/src/Filter/DateRange.php +++ b/src/Filter/DateRange.php @@ -12,8 +12,8 @@ final class DateRange extends HttpFilter public function addToQuery(QueryBuilder $queryBuilder): QueryBuilder { $queryBuilder->where( - $this->getColumn() . ' >= \'' . $this->getHttpValue()['from'] . ' 00:00:00\' AND ' . - $this->getColumn() . ' <= \'' . $this->getHttpValue()['to'] . ' 23:59:59\'', + 'strftime(\'%Y-%m-%d\', ' . $this->getColumn() . ') >= \'' . $this->getHttpValue()['from'] . '\' AND ' . + 'strftime(\'%Y-%m-%d\', ' . $this->getColumn() . ') <= \'' . $this->getHttpValue()['to'] . '\'', ); return $queryBuilder; diff --git a/tests/FilterByDateRangeTest.php b/tests/FilterByDateRangeTest.php index 48f45bd422ccf3e265c0db7ec2165bb1547d4e80..28c83efda83484910592aaf6314fe9d8286dd657 100644 --- a/tests/FilterByDateRangeTest.php +++ b/tests/FilterByDateRangeTest.php @@ -19,8 +19,8 @@ class FilterByDateRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $firstDate = DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01'); - $secondDate = DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-05'); + $firstDate = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-01 12:00:00'); + $secondDate = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-05 14:00:00'); $post = new Post( $this->faker->name(), @@ -62,8 +62,8 @@ class FilterByDateRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $firstDate = DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01'); - $secondDate = DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-05'); + $firstDate = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-01 12:00:00'); + $secondDate = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-05 11:00:00'); $post = new Post( $this->faker->name(), @@ -105,8 +105,8 @@ class FilterByDateRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $firstDate = DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01'); - $secondDate = DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-05'); + $firstDate = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-01 13:30:00'); + $secondDate = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-05 12:00:00'); $post = new Post( $this->faker->name(), @@ -148,8 +148,8 @@ class FilterByDateRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $firstDate = DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01'); - $secondDate = DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-05'); + $firstDate = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-01 15:00:00'); + $secondDate = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2020-01-05 00:00:00'); $post = new Post( $this->faker->name(),