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

fix: Поправлены фильтры для комбинаций фильтров

parent 9e546434

src/Filter/Date.php

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ final class Date extends HttpFilter 
            return $queryBuilder;

        }



        $queryBuilder->where(

        $queryBuilder->andWhere(

            $this->getColumn() . ' BETWEEN :dateStart AND :dateEnd',

        );

src/Filter/DateRange.php

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ final class DateRange extends HttpFilter 
        }



        if ($fromDate) {

            $queryBuilder->where($this->getColumn() . ' >= :fromDate')

            $queryBuilder->andWhere($this->getColumn() . ' >= :fromDate')

                ->setParameter('fromDate', $fromDate->setTime(0, 0, 0));

        }

src/Filter/ILike.php

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ final class ILike extends HttpFilter 
{

    public function addToQuery(QueryBuilder $queryBuilder): QueryBuilder

    {

        $queryBuilder->where(

        $queryBuilder->andWhere(

            $this->getColumn() . ' ILIKE \'%' . $this->getHttpValue() . '%\'',

        );

src/Filter/In.php

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ final class In extends HttpFilter 
        $values = array_map(fn($value) => '\'' . $value . '\'', $this->getHttpValue());

        $stringValues = implode(',', $values);



        $queryBuilder->where(

        $queryBuilder->andWhere(

            $this->getColumn() . ' IN (' . $stringValues . ')',

        );

src/Filter/Like.php

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ final class Like extends HttpFilter 
            return $queryBuilder;

        }



        $queryBuilder->where(

        $queryBuilder->andWhere(

            $this->getColumn() . ' LIKE :' . $this->getParameterKey(),

        );