- Added last 5 years and last 10 years to preset date ranges

Author: dash8x

src/Enums/PresetDateRanges.php

@@ -24,6 +24,8 @@ enum PresetDateRanges: string implements IsEnum, DateRange
     case LAST_7_DAYS = 'last_7_days';
     case LAST_14_DAYS = 'last_14_days';
     case LAST_30_DAYS = 'last_30_days';
+    case LAST_5_YEARS = 'last_5_years';
+    case LAST_10_YEARS = 'last_10_years';
     case LIFETIME = 'lifetime';
 
     public function getDateFrom(): Carbon
@@ -40,6 +42,8 @@ public function getDateFrom(): Carbon
             self::LAST_7_DAYS => now()->subDays(7 - 1)->startOfDay(),
             self::LAST_14_DAYS => now()->subDays(14 - 1)->startOfDay(),
             self::LAST_30_DAYS => now()->subDays(30 - 1)->startOfDay(),
+            self::LAST_5_YEARS => now()->subYears(5 - 1)->startOfYear(),
+            self::LAST_10_YEARS => now()->subYears(10 - 1)->startOfYear(),
             self::LIFETIME => now()->subYears(5 - 1)->startOfYear(),
         };
     }
@@ -56,6 +60,8 @@ public function getDateTo(): Carbon
             self::THIS_YEAR => now()->endOfYear(),
             self::LAST_YEAR => now()->subYear()->endOfYear(),
             self::LAST_7_DAYS, self::LAST_14_DAYS, self::LAST_30_DAYS => now()->endOfDay(),
+            self::LAST_5_YEARS => now()->endOfYear(),
+            self::LAST_10_YEARS => now()->endOfYear(),
             self::LIFETIME => now(),
         };
     }
@@ -81,6 +87,8 @@ protected function generatePreviousFromDate(): Carbon
             self::LAST_7_DAYS => $from_date->subDays(7),
             self::LAST_14_DAYS => $from_date->subDays(14),
             self::LAST_30_DAYS => $from_date->subDays(30),
+            self::LAST_5_YEARS => $from_date->subYears(5),
+            self::LAST_10_YEARS => $from_date->subYears(10),
             self::LIFETIME => $from_date->subYears(5),
         };
     }
@@ -101,6 +109,8 @@ protected function generatePreviousToDate(Carbon $from_date): Carbon
             self::LAST_7_DAYS => $from_date->addDays(7 - 1)->endOfDay(),
             self::LAST_14_DAYS => $from_date->addDays(14 - 1)->endOfDay(),
             self::LAST_30_DAYS => $from_date->addDays(30 - 1)->endOfDay(),
+            self::LAST_5_YEARS => $from_date->addYears(5 - 1)->endOfYear(),
+            self::LAST_10_YEARS => $from_date->addYears(10 - 1)->endOfYear(),
             self::LIFETIME => $from_date->addYears(5 - 1)->endOfYear(),
         };
     }

tests/Unit/Enums/PresetDateRangesTest.php

@@ -23,6 +23,8 @@ public function it_can_generate_correct_previous_start_date(): void
         $this->assertEquals('2024-06-25 00:00:00', PresetDateRanges::LAST_7_DAYS->getPreviousDateRange()->getDateFrom(), 'Incorrect previous start of LAST_7_DAYS');
         $this->assertEquals('2024-06-11 00:00:00', PresetDateRanges::LAST_14_DAYS->getPreviousDateRange()->getDateFrom(), 'Incorrect previous start of LAST_14_DAYS');
         $this->assertEquals('2024-05-10 00:00:00', PresetDateRanges::LAST_30_DAYS->getPreviousDateRange()->getDateFrom(), 'Incorrect previous start of LAST_30_DAYS');
+        $this->assertEquals('2015-01-01 00:00:00', PresetDateRanges::LAST_5_YEARS->getPreviousDateRange()->getDateFrom(), 'Incorrect previous start of LAST_5_YEARS');
+        $this->assertEquals('2005-01-01 00:00:00', PresetDateRanges::LAST_10_YEARS->getPreviousDateRange()->getDateFrom(), 'Incorrect previous start of LAST_10_YEARS');
         $this->assertEquals('2015-01-01 00:00:00', PresetDateRanges::LIFETIME->getPreviousDateRange()->getDateFrom(), 'Incorrect previous start of LIFETIME');
     }
 
@@ -42,6 +44,8 @@ public function it_can_generate_correct_previous_end_date(): void
         $this->assertEquals('2024-07-01 23:59:59', PresetDateRanges::LAST_7_DAYS->getPreviousDateRange()->getDateTo(), 'Incorrect previous end of LAST_7_DAYS');
         $this->assertEquals('2024-06-24 23:59:59', PresetDateRanges::LAST_14_DAYS->getPreviousDateRange()->getDateTo(), 'Incorrect previous end of LAST_14_DAYS');
         $this->assertEquals('2024-06-08 23:59:59', PresetDateRanges::LAST_30_DAYS->getPreviousDateRange()->getDateTo(), 'Incorrect previous end of LAST_30_DAYS');
+        $this->assertEquals('2019-12-31 23:59:59', PresetDateRanges::LAST_5_YEARS->getPreviousDateRange()->getDateTo(), 'Incorrect previous end of LAST_5_YEARS');
+        $this->assertEquals('2014-12-31 23:59:59', PresetDateRanges::LAST_10_YEARS->getPreviousDateRange()->getDateTo(), 'Incorrect previous end of LAST_10_YEARS');
         $this->assertEquals('2019-12-31 23:59:59', PresetDateRanges::LIFETIME->getPreviousDateRange()->getDateTo(), 'Incorrect previous end of LIFETIME');
     }
 
@@ -61,6 +65,8 @@ public function it_can_generate_correct_start_date(): void
         $this->assertEquals('2024-07-02 00:00:00', PresetDateRanges::LAST_7_DAYS->getDateFrom(), 'Incorrect start of LAST_7_DAYS');
         $this->assertEquals('2024-06-25 00:00:00', PresetDateRanges::LAST_14_DAYS->getDateFrom(), 'Incorrect start of LAST_14_DAYS');
         $this->assertEquals('2024-06-09 00:00:00', PresetDateRanges::LAST_30_DAYS->getDateFrom(), 'Incorrect start of LAST_30_DAYS');
+        $this->assertEquals('2020-01-01 00:00:00', PresetDateRanges::LAST_5_YEARS->getDateFrom(), 'Incorrect start of LAST_5_YEARS');
+        $this->assertEquals('2015-01-01 00:00:00', PresetDateRanges::LAST_10_YEARS->getDateFrom(), 'Incorrect start of LAST_10_YEARS');
         $this->assertEquals('2020-01-01 00:00:00', PresetDateRanges::LIFETIME->getDateFrom(), 'Incorrect start of LIFETIME');
     }
 
@@ -80,6 +86,8 @@ public function it_can_generate_correct_end_date(): void
         $this->assertEquals('2024-07-08 23:59:59', PresetDateRanges::LAST_7_DAYS->getDateTo(), 'Incorrect end of LAST_7_DAYS');
         $this->assertEquals('2024-07-08 23:59:59', PresetDateRanges::LAST_14_DAYS->getDateTo(), 'Incorrect end of LAST_14_DAYS');
         $this->assertEquals('2024-07-08 23:59:59', PresetDateRanges::LAST_30_DAYS->getDateTo(), 'Incorrect end of LAST_30_DAYS');
+        $this->assertEquals('2024-12-31 23:59:59', PresetDateRanges::LAST_5_YEARS->getDateTo(), 'Incorrect end of LAST_5_YEARS');
+        $this->assertEquals('2024-12-31 23:59:59', PresetDateRanges::LAST_10_YEARS->getDateTo(), 'Incorrect end of LAST_10_YEARS');
         $this->assertEquals('2024-07-08 22:07:00', PresetDateRanges::LIFETIME->getDateTo(), 'Incorrect end of LIFETIME');
     }
 }