Commit 48f5fb8f authored by Адлан Шамавов's avatar Адлан Шамавов
Browse files

fix: Доработан фильтр DateRange и тесты

parent d038573e

src/Filter/DateRange.php

+2 −2
Original line number Diff line number Diff line
@@ -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;

tests/FilterByDateRangeTest.php

+8 −8
Original line number Diff line number Diff line
@@ -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(),