Merge branch 'main' of https://github.com/JhumanJ/laravel-model-stats into main

Author: Julien Nahum

src/Http/Controllers/Controller.php

@@ -9,19 +9,20 @@
 
 class Controller extends BaseController
 {
-    use ValidatesRequests, AuthorizesRequests;
+    use ValidatesRequests;
+    use AuthorizesRequests;
 
     public function success($data = [])
     {
         return response()->json(array_merge([
-            'type' => 'success'
+            'type' => 'success',
         ], $data));
     }
 
     public function error($data = [], $statusCode = 400)
     {
         return response()->json(array_merge([
-            'type' => 'error'
+            'type' => 'error',
         ], $data), $statusCode);
     }
 }

src/Http/Controllers/DashboardController.php

@@ -26,14 +26,16 @@ public function store(StoreRequest $request)
     public function update(Dashboard $dashboard, UpdateRequest $request)
     {
         $dashboard->update($request->validated());
+
         return $dashboard;
     }
 
-    public function destroy(Dashboard $dashboard) {
+    public function destroy(Dashboard $dashboard)
+    {
         $dashboard->delete();
+
         return $this->success([
-           'message' => 'Dashboard deleted'
+           'message' => 'Dashboard deleted',
         ]);
     }
-
 }

src/Http/Controllers/StatController.php

@@ -3,10 +3,6 @@
 namespace Jhumanj\LaravelModelStats\Http\Controllers;
 
 use Carbon\Carbon;
-use Illuminate\Container\Container;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\File;
 use Jhumanj\LaravelModelStats\Http\Requests\Widgets\DataRequest;
 use Jhumanj\LaravelModelStats\Services\ModelStats;
 
@@ -18,7 +14,7 @@ public function widgetData(DataRequest $request)
         $dateFrom = Carbon::createFromFormat('Y-m-d', $request->date_from);
         $dateTo = Carbon::createFromFormat('Y-m-d', $request->date_to);
 
-        switch ($request->aggregate_type){
+        switch ($request->aggregate_type) {
             case 'daily_count':
                 return $modelStats->getDailyHistogram($dateFrom, $dateTo, $request->date_column);
         }

src/Http/Requests/Dashboard/StoreRequest.php

@@ -3,7 +3,6 @@
 
 namespace Jhumanj\LaravelModelStats\Http\Requests\Dashboard;
 
-
 use Illuminate\Foundation\Http\FormRequest;
 
 class StoreRequest extends FormRequest

src/Http/Requests/Dashboard/UpdateRequest.php

@@ -3,7 +3,6 @@
 
 namespace Jhumanj\LaravelModelStats\Http\Requests\Dashboard;
 
-
 use Illuminate\Foundation\Http\FormRequest;
 
 class UpdateRequest extends FormRequest

src/Http/Requests/Widgets/DataRequest.php

@@ -3,7 +3,6 @@
 
 namespace Jhumanj\LaravelModelStats\Http\Requests\Widgets;
 
-
 use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Http\FormRequest;

src/LaravelModelStatsServiceProvider.php

@@ -78,7 +78,8 @@ protected function registerCommands()
     /**
      * Load the package's migrations
      */
-    protected function loadMigrations() {
+    protected function loadMigrations()
+    {
         $this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
     }
 }

src/Models/Dashboard.php

@@ -15,10 +15,10 @@ class Dashboard extends Model
     protected $fillable = [
         'name',
         'description',
-        'body'
+        'body',
     ];
 
     protected $casts = [
-        'body' => 'array'
+        'body' => 'array',
     ];
 }

src/Services/ModelStats.php

@@ -3,12 +3,10 @@
 namespace Jhumanj\LaravelModelStats\Services;
 
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
 class ModelStats
 {
-
     public $class;
 
     public function __construct($class)
@@ -32,10 +30,10 @@ public function getDailyHistogram(
             });
         }
 
-        $data = $dataQuery->select(array(
+        $data = $dataQuery->select([
             DB::raw('DATE('.$dateFieldName.') as date'),
-            DB::raw('COUNT(*) as "count"')
-        ))->get()->pluck("count", "date");
+            DB::raw('COUNT(*) as "count"'),
+        ])->get()->pluck("count", "date");
 
         return self::fillMissingDays($data, $from, $to);
     }
@@ -49,11 +47,11 @@ public static function fillMissingDays($data, Carbon $since, Carbon $to, $defaul
 
         foreach (array_reverse(range(0, $daysSince)) as $number) {
             $dateKey = Carbon::now()->subDays($number)->format('Y-m-d');
-            if (!isset($data[$dateKey])) {
+            if (! isset($data[$dateKey])) {
                 $data[$dateKey] = $defaultValue;
             }
         }
+
         return $data;
     }
-
 }

tests/TestCase.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Jhumanj\LaravelModelStats\LaravelModelStatsServiceProvider;
-use Jhumanj\LaravelModelStats\ModelStatsServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 
 class TestCase extends Orchestra