feat: added custom date range

eliseekn · Dec 30, 2021 · 6eb5fa2 · 6eb5fa2
1 parent 14b5ec9
commit 6eb5fa2
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to `laravel-metrics` will be documented in this file
 
-## 1.0.0 - 201X-XX-XX
+## 1.0.2 - 2021-12-30
 
-- initial release
+- Added custom date range
+
+## 1.0.1 - 2021-09-25
+
+- Added Carbon package
+- Removed unnecessary files and folder
+
+## 1.0.0 - 2021-09-25
+
+- Initial release
diff --git a/src/LaravelMetrics.php b/src/LaravelMetrics.php
@@ -31,6 +31,22 @@ private static function getMetricsData(string $table, string $column, string $pe
         $year = Carbon::now()->year;
         $month = Carbon::now()->month;
         $week = Carbon::now()->weekOfYear;
+
+        if (!in_array($period, [self::TODAY, self::DAY, self::WEEK, self::MONTH, self::YEAR, self::QUATER_YEAR, self::HALF_YEAR])) {
+            if (!str_contains('~', $period)) return null;
+
+            list($start_date, $end_date) = explode('~', $period);
+            $start_date = Carbon::parse($start_date)->toDateString();
+            $end_date = Carbon::parse($end_date)->toDateString();
+
+            return DB::table($table)
+                ->selectRaw("$type($column) as data")
+                ->whereBetween(DB::raw('date(created_at)'), [$start_date, $end_date])
+                ->where(function ($q) use ($whereRaw) {
+                    if (!is_null($whereRaw)) $q->whereRaw($whereRaw);
+                })
+                ->first();
+        }
 
         switch($period) {
             case self::TODAY: 
@@ -110,6 +126,23 @@ private static function getTrendsData(string $table, string $column, string $per
         $month = Carbon::now()->month;
         $week = Carbon::now()->weekOfYear;
 
+        if (!in_array($period, [self::TODAY, self::DAY, self::WEEK, self::MONTH, self::YEAR, self::QUATER_YEAR, self::HALF_YEAR])) {
+            if (!str_contains('~', $period)) return null;
+
+            list($start_date, $end_date) = explode('~', $period);
+
+            $start_date = Carbon::parse($start_date)->toDateString();
+            $end_date = Carbon::parse($end_date)->toDateString();
+
+            return DB::table($table)
+                ->selectRaw("$type($column) as data, date(created_at) as label")
+                ->whereBetween(DB::raw('date(created_at)'), [$start_date, $end_date])
+                ->where(function ($q) use ($whereRaw) {
+                    if (!is_null($whereRaw)) $q->whereRaw($whereRaw);
+                })
+                ->first();
+        }
+
         switch($period) {
             case self::TODAY: 
                 return DB::table($table)