#71 - annual summary (#113)

* wip * wip * wip * wip * wip * wip * wip * wip * wip * fix * lint fix * cr fix * fix
2022-04-07 14:33:15 +02:00
parent 84403a762a
commit ff8d6aade6
20 changed files with 1073 additions and 1206 deletions
--- a/app/Eloquent/Models/User.php
+++ b/app/Eloquent/Models/User.php
@@ -91,7 +91,7 @@ class User extends Authenticatable
    public function hasVacationLimit(YearPeriod $yearPeriod): bool
    {
        return $this->vacationLimits()
-            ->where("year_period_id", $yearPeriod->id)
+            ->whereBelongsTo($yearPeriod)
            ->whereNotNull("days")
            ->exists();
    }
@@ -112,8 +112,8 @@ class User extends Authenticatable
    {
        return $query->whereRelation(
            "vacationlimits",
-            fn(Builder $query) => $query
-                ->where("year_period_id", $yearPeriod->id)
+            fn(Builder $query): Builder => $query
+                ->whereBelongsTo($yearPeriod)
                ->whereNotNull("days"),
        );
    }
--- a/app/Eloquent/Models/Vacation.php
+++ b/app/Eloquent/Models/Vacation.php
@@ -47,7 +47,15 @@ class Vacation extends Model
    {
        return $query->whereRelation(
            "vacationRequest",
-            fn(Builder $query) => $query->states(VacationRequestStatesRetriever::successStates()),
+            fn(Builder $query): Builder => $query->states(VacationRequestStatesRetriever::successStates()),
+        );
+    }
+
+    public function scopePending(Builder $query): Builder
+    {
+        return $query->whereRelation(
+            "vacationRequest",
+            fn(Builder $query): Builder => $query->states(VacationRequestStatesRetriever::pendingStates()),
        );
    }
 }