From 48f5fb8fa53376cfece24a80db8b138d9483b3a4 Mon Sep 17 00:00:00 2001 From: "a.shamavov" Date: Mon, 3 Mar 2025 10:34:43 +0500 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D0=BD=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=20Dat?= =?UTF-8?q?eRange=20=D0=B8=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Filter/DateRange.php | 4 ++-- tests/FilterByDateRangeTest.php | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Filter/DateRange.php b/src/Filter/DateRange.php index 5d7b488..6fef58c 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 48f45bd..28c83ef 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(), -- GitLab