Merge pull request #340 from utopia-php/feat-past-date-validator

adds past date validation
utopia-php · Oct 18, 2023 · e0b832d · e0b832d
2 parents 091e1a1 + 0801c6c
commit e0b832d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 8 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Database/Validator/Datetime.php b/src/Database/Validator/Datetime.php
@@ -11,8 +11,16 @@ class Datetime extends Validator
      */
     protected string $message = 'Date is not valid';
 
-    public function __construct()
+    /**
+     * @var bool
+     */
+    protected bool $requireDateInFuture = false;
+
+    public function __construct(?bool $requireDateInFuture = null)
     {
+        if (!is_null($requireDateInFuture)) {
+            $this->requireDateInFuture = $requireDateInFuture;
+        }
     }
 
     /**
@@ -37,7 +45,13 @@ public function isValid($value): bool
         }
 
         try {
-            new \DateTime($value);
+            $date = new \DateTime($value);
+            $now = new \DateTime();
+
+            if ($this->requireDateInFuture === true && $date < $now) {
+                $this->message = 'Date must be in the future';
+                return false;
+            }
         } catch(\Exception $e) {
             $this->message = $e->getMessage();
             return false;

diff --git a/tests/Database/Validator/DateTimeTest.php b/tests/Database/Validator/DateTimeTest.php
@@ -51,4 +51,18 @@ public function testCreateDatetime(): void
          */
         $this->assertEquals(false, $dateValidator->isValid("2022-13-04 11:31:52.680"));
     }
+
+    public function testPastDateValidation(): void
+    {
+        $dateValidator = new DatetimeValidator(requireDateInFuture: true);
+
+        $this->assertEquals(false, $dateValidator->isValid(DateTime::addSeconds(new \DateTime(), -3)));
+        $this->assertEquals(true, $dateValidator->isValid(DateTime::addSeconds(new \DateTime(), 5)));
+
+
+        $dateValidator = new DatetimeValidator(requireDateInFuture: false);
+
+        $this->assertEquals(true, $dateValidator->isValid(DateTime::addSeconds(new \DateTime(), -3)));
+        $this->assertEquals(true, $dateValidator->isValid(DateTime::addSeconds(new \DateTime(), 5)));
+    }
 }