Fix dates (#41)

* Laravel 9 PHP 8 upgrade #major

* Fix for dates

* Apply fixes from StyleCI

Co-authored-by: StyleCI Bot <bot@styleci.io>

Author: Norgul

src/RequestParameters/SearchParameter.php

@@ -190,9 +190,7 @@ protected function appendSingle(Builder $builder, OperatorsConfig $operatorsConf
     {
         $callbackClassName = $operatorsConfig->getCallbackClassFromOperator($searchParser->operator);
 
-        /**
-         * @var AbstractCallback $callback
-         */
+        /** @var AbstractCallback $callback */
         new $callbackClassName($builder, $searchParser);
     }
 }

src/SearchCallbacks/AbstractCallback.php

@@ -16,6 +16,10 @@ abstract class AbstractCallback
     protected SearchParser $searchParser;
     protected CategorizedValues $categorizedValues;
 
+    protected const DATE_FIELDS = [
+        'date', 'datetime',
+    ];
+
     /**
      * AbstractCallback constructor.
      *
@@ -105,7 +109,8 @@ protected function lessOrMoreCallback(Builder $builder, string $column, Categori
             throw new JsonQueryBuilderException("No valid arguments for '$operator' operator.");
         }
 
-        $builder->where($column, $operator, $values->and[0]);
+        $method = $this->isDate($this->searchParser->type) ? 'whereDate' : 'where';
+        $builder->{$method}($column, $operator, $values->and[0]);
     }
 
     /**
@@ -124,10 +129,6 @@ protected function betweenCallback(Builder $builder, string $column, Categorized
             throw new JsonQueryBuilderException("Using $operator operator assumes exactly 2 parameters. Wrong number of parameters provided.");
         }
 
-        if (!count($values->and)) {
-            throw new JsonQueryBuilderException("No valid arguments for '$operator' operator.");
-        }
-
         $callback = $operator == '<>' ? 'whereBetween' : 'whereNotBetween';
 
         $builder->{$callback}($column, [$values->and[0], $values->and[1]]);
@@ -147,4 +148,9 @@ protected function checkAllowedValues(CategorizedValues $values, string $operato
             throw new JsonQueryBuilderException("Wrong parameter type(s) for '$operator' operator.");
         }
     }
+
+    protected function isDate(string $type): bool
+    {
+        return in_array($type, self::DATE_FIELDS);
+    }
 }

src/SearchCallbacks/Equals.php

@@ -5,6 +5,7 @@
 namespace Asseco\JsonQueryBuilder\SearchCallbacks;
 
 use Asseco\JsonQueryBuilder\CategorizedValues;
+use Exception;
 use Illuminate\Database\Eloquent\Builder;
 
 class Equals extends AbstractCallback
@@ -14,6 +15,14 @@ public static function operator(): string
         return '=';
     }
 
+    /**
+     * @param  Builder  $builder
+     * @param  string  $column
+     * @param  CategorizedValues  $values
+     * @return void
+     *
+     * @throws Exception
+     */
     public function execute(Builder $builder, string $column, CategorizedValues $values): void
     {
         foreach ($values->andLike as $andLike) {
@@ -33,10 +42,20 @@ public function execute(Builder $builder, string $column, CategorizedValues $val
         }
 
         if ($values->and) {
-            $builder->whereIn($column, $values->and);
+            if ($this->isDate($this->searchParser->type)) {
+                foreach ($values->and as $andValue) {
+                    $builder->orWhereDate($column, $andValue);
+                }
+            } else {
+                $builder->whereIn($column, $values->and);
+            }
         }
 
         if ($values->not) {
+            if ($this->isDate($this->searchParser->type)) {
+                throw new Exception('Not operator is not supported for date(time) fields');
+            }
+
             $builder->whereNotIn($column, $values->not);
         }
     }

src/SearchCallbacks/NotEquals.php

@@ -5,6 +5,7 @@
 namespace Asseco\JsonQueryBuilder\SearchCallbacks;
 
 use Asseco\JsonQueryBuilder\CategorizedValues;
+use Exception;
 use Illuminate\Database\Eloquent\Builder;
 
 class NotEquals extends AbstractCallback
@@ -14,9 +15,21 @@ public static function operator(): string
         return '!=';
     }
 
+    /**
+     * @param  Builder  $builder
+     * @param  string  $column
+     * @param  CategorizedValues  $values
+     * @return void
+     *
+     * @throws Exception
+     */
     public function execute(Builder $builder, string $column, CategorizedValues $values): void
     {
         foreach (array_merge($values->andLike, $values->notLike) as $like) {
+            if ($this->isDate($this->searchParser->type)) {
+                throw new Exception('Not operator is not supported for date(time) fields');
+            }
+
             $builder->where($column, 'NOT LIKE', $like);
         }