[Bugfix] Change DateRangeFilterType to automatically modify the dates…

… to fit between given range, regardless of their time
Kreyu · Apr 25, 2023 · 5cb236b · 5cb236b
1 parent c23f2b7
commit 5cb236b
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/Bridge/Doctrine/Orm/Filter/Type/DateRangeFilterType.php b/src/Bridge/Doctrine/Orm/Filter/Type/DateRangeFilterType.php
@@ -29,20 +29,26 @@ public function apply(ProxyQueryInterface $query, FilterData $data, FilterInterf
 
         $criteria = $query->expr()->andX();
 
-        if (null !== $value['from']) {
+        if (null !== $dateFrom = $value['from']) {
             $parameterNameFrom = $parameterName.'_from';
 
+            $dateFrom = \DateTime::createFromInterface($dateFrom);
+            $dateFrom->setTime(0, 0);
+
             $criteria->add($query->expr()->gte($queryPath, ":$parameterNameFrom"));
 
-            $query->setParameter($parameterNameFrom, $value['from']);
+            $query->setParameter($parameterNameFrom, $dateFrom);
         }
 
-        if (null !== $value['to']) {
+        if (null !== $valueTo = $value['to']) {
             $parameterNameTo = $parameterName.'_to';
 
-            $criteria->add($query->expr()->lte($queryPath, ":$parameterNameTo"));
+            $valueTo = \DateTime::createFromInterface($valueTo)->modify('+1 day');
+            $valueTo->setTime(0, 0);
+
+            $criteria->add($query->expr()->lt($queryPath, ":$parameterNameTo"));
 
-            $query->setParameter($parameterNameTo, $value['to']);
+            $query->setParameter($parameterNameTo, $valueTo);
         }
 
         $query->andWhere($criteria);