#510 - handle changing year for dashboard calendar (#517)

* #510 - handle changing year for dashboard calendar

* #510 - lint fix

* #510 - lint fix

* #510 - bumps

* #510 - lint fix

Author: Baakoma

app/Http/Controllers/DashboardController.php

@@ -7,20 +7,12 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
 use Inertia\Response;
-use Toby\Domain\DailySummaryRetriever;
 use Toby\Domain\DashboardAggregator;
-use Toby\Domain\UserVacationStatsRetriever;
-use Toby\Domain\VacationTypeConfigRetriever;
 
 class DashboardController extends Controller
 {
-    public function __invoke(
-        Request $request,
-        UserVacationStatsRetriever $vacationStatsRetriever,
-        VacationTypeConfigRetriever $configRetriever,
-        DailySummaryRetriever $dailySummaryRetriever,
-        DashboardAggregator $dashboardAggregator,
-    ): Response {
+    public function index(Request $request, DashboardAggregator $dashboardAggregator): Response
+    {
         $user = $request->user();
         $year = Carbon::now()->year;
 
@@ -33,4 +25,9 @@ public function __invoke(
             "stats" => $dashboardAggregator->aggregateStats($user, $year),
         ]);
     }
+
+    public function loadCalendar(Request $request, int $year, DashboardAggregator $dashboardAggregator): array
+    {
+        return $dashboardAggregator->aggregateCalendarData($request->user(), $year);
+    }
 }

app/Http/Resources/DashboardVacationRequestResource.php

@@ -10,6 +10,7 @@
 
 class DashboardVacationRequestResource extends JsonResource
 {
+    public static $wrap = null;
     protected VacationTypeConfigRetriever $configRetriever;
 
     public function __construct($resource)
@@ -19,8 +20,6 @@ public function __construct($resource)
         $this->configRetriever = app(VacationTypeConfigRetriever::class);
     }
 
-    public static $wrap = null;
-
     public function toArray($request): array
     {
         return [

app/Http/Resources/VacationRequestResource.php

@@ -13,6 +13,7 @@
 
 class VacationRequestResource extends JsonResource
 {
+    public static $wrap = null;
     protected VacationTypeConfigRetriever $configRetriever;
 
     public function __construct($resource)
@@ -22,8 +23,6 @@ public function __construct($resource)
         $this->configRetriever = app(VacationTypeConfigRetriever::class);
     }
 
-    public static $wrap = null;
-
     public function toArray($request): array
     {
         $user = $request->user();

composer.json

@@ -13,7 +13,7 @@
         "dompdf/dompdf": "^3.0",
         "fakerphp/faker": "^1.24.1",
         "guzzlehttp/guzzle": "^7.9.2",
-        "inertiajs/inertia-laravel": "^1.3.1",
+        "inertiajs/inertia-laravel": "^2.0",
         "laragear/cache-query": "^4.0",
         "laravel/framework": "^11.34.2",
         "laravel/sanctum": "^4.0.5",
@@ -34,7 +34,7 @@
         "laravel/dusk": "^8.2.12",
         "mockery/mockery": "^1.6.12",
         "nunomaduro/collision": "^8.5.0",
-        "phpunit/phpunit": "^11.4.4",
+        "phpunit/phpunit": "^11.5",
         "spatie/laravel-ignition": "^2.9.0"
     },
     "autoload": {