date value fix

hyvor · Apr 11, 2022 · 2a3dab7 · 2a3dab7
1 parent 6f738fb
commit 2a3dab7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/FilterQ.php b/src/FilterQ.php
@@ -159,7 +159,7 @@ private function addWhereToQuery(EloquentBuilder|QueryBuilder $query, array $log
                 /**
                  * @throw InvalidValueException
                  */
-                ValueValidator::validate($keyInst, $value);
+                $value = ValueValidator::validate($keyInst, $value);
 
                 $column = $keyInst->getColumnName();
                 $join = $keyInst->getJoin();

diff --git a/src/ValueValidator.php b/src/ValueValidator.php
@@ -79,7 +79,7 @@ public static function validate(Key $key, mixed $value)
                     if ($date !== false) {
                         $isValid = true;
                         // update value to carbon date
-                        $value = Carbon::createFromTimestamp($date);
+                        $value = Carbon::createFromTimestamp($date)->toDateTimeString();
                         break;
                     }
 

diff --git a/tests/Unit/FilterQ/KeyValueTypeTest.php b/tests/Unit/FilterQ/KeyValueTypeTest.php
@@ -41,4 +41,16 @@ public function test_key_type_int_invalid_check()
 
     }
 
+    public function test_key_type_date()
+    {
+
+        FilterQ::expression("date='2022-02-22'")
+            ->builder(TestModel::class)
+            ->keys(function($keys) {
+                $keys->add('date')->valueType('date');
+            })
+            ->addWhere();
+
+    }
+
 }
diff --git a/tests/Unit/ValueValidatorTest.php b/tests/Unit/ValueValidatorTest.php
@@ -180,7 +180,7 @@ public function test_key_value_type_date_relative()
         $key = new Key('test');
         $key->valueType('date');
 
-        $date = Carbon::parse('yesterday');
+        $date = Carbon::parse('yesterday')->toDateTimeString();
 
         $this->assertEquals($date, ValueValidator::validate($key, 'yesterday'));
 
@@ -192,7 +192,7 @@ public function test_key_value_type_date_unix()
         $key = new Key('test');
         $key->valueType('date');
 
-        $date = Carbon::createFromTimestamp(1649358544);
+        $date = Carbon::createFromTimestamp(1649358544)->toDateTimeString();
 
         $this->assertEquals($date, ValueValidator::validate($key, 1649358544));