DateTime Filters: Allow column override of timezone

always-open · Jul 9, 2022 · e92f1c4 · e92f1c4
1 parent 03b3427
commit e92f1c4
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 4 deletions.
diff --git a/src/BaseFeatures/Data/Types/DateTime.php b/src/BaseFeatures/Data/Types/DateTime.php
@@ -57,6 +57,11 @@ public function setInputFormat(string|null $format) : self
         return $this;
     }
 
+    public function getOutputTimezone() : string
+    {
+        return $this->outputTzName;
+    }
+
     public function setOutputTimezone(string|null $timezone) : self
     {
         $this->outputTzName = $timezone;

diff --git a/src/BaseFeatures/Filters/DoesNotEqualFilter.php b/src/BaseFeatures/Filters/DoesNotEqualFilter.php
@@ -2,7 +2,9 @@
 
 namespace BluefynInternational\ReportEngine\BaseFeatures\Filters;
 
+use Carbon\Carbon;
 use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Arr;
 
 class DoesNotEqualFilter extends BaseFilter
 {
@@ -45,4 +47,27 @@ public static function key(): string
     {
         return 'does_not_equal';
     }
+
+    /**
+     * @return null|string|Carbon
+     */
+    public function getValue(array $options = [])
+    {
+        if ($this->valueIsDate()) {
+            /**
+             * @var Carbon $value
+             */
+            $value = parent::getValue();
+            $timeZoneString = $this->getColumn()->type()->getOutputTimezone()
+                ?? Arr::get($options, 'timezone');
+
+            if ($timeZoneString) {
+                $value->shiftTimezone($timeZoneString);
+            }
+
+            return $value->utc();
+        }
+
+        return parent::getValue();
+    }
 }
diff --git a/src/BaseFeatures/Filters/GreaterThanFilter.php b/src/BaseFeatures/Filters/GreaterThanFilter.php
@@ -32,7 +32,10 @@ public function getValue(array $options = [])
              * @var Carbon $value
              */
             $value = parent::getValue();
-            if ($timeZoneString = Arr::get($options, 'timezone')) {
+            $timeZoneString = $this->getColumn()->type()->getOutputTimezone()
+                ?? Arr::get($options, 'timezone');
+
+            if ($timeZoneString) {
                 $value->shiftTimezone($timeZoneString);
             }
 

diff --git a/src/BaseFeatures/Filters/GreaterThanOrEqualFilter.php b/src/BaseFeatures/Filters/GreaterThanOrEqualFilter.php
@@ -32,7 +32,10 @@ public function getValue(array $options = [])
              * @var Carbon $value
              */
             $value = parent::getValue();
-            if ($timeZoneString = Arr::get($options, 'timezone')) {
+            $timeZoneString = $this->getColumn()->type()->getOutputTimezone()
+                ?? Arr::get($options, 'timezone');
+
+            if ($timeZoneString) {
                 $value->shiftTimezone($timeZoneString);
             }
 

diff --git a/src/BaseFeatures/Filters/LessThanFilter.php b/src/BaseFeatures/Filters/LessThanFilter.php
@@ -32,7 +32,10 @@ public function getValue(array $options = [])
              * @var Carbon $value
              */
             $value = parent::getValue();
-            if ($timeZoneString = Arr::get($options, 'timezone')) {
+            $timeZoneString = $this->getColumn()->type()->getOutputTimezone()
+                ?? Arr::get($options, 'timezone');
+
+            if ($timeZoneString) {
                 $value->shiftTimezone($timeZoneString);
             }
 

diff --git a/src/BaseFeatures/Filters/LessThanOrEqualFilter.php b/src/BaseFeatures/Filters/LessThanOrEqualFilter.php
@@ -32,7 +32,10 @@ public function getValue(array $options = [])
              * @var Carbon $value
              */
             $value = parent::getValue();
-            if ($timeZoneString = Arr::get($options, 'timezone')) {
+            $timeZoneString = $this->getColumn()->type()->getOutputTimezone()
+                ?? Arr::get($options, 'timezone');
+
+            if ($timeZoneString) {
                 $value->shiftTimezone($timeZoneString);
             }