Merge pull request #33 from eporsche/future_vacation_entitlements_bugfix

ablity to approve future vacation entitlements

Author: eporsche

app/Models/VacationEntitlement.php

@@ -188,6 +188,11 @@ public function isTransferred()
         return $this->transferVacationDays()->exists();
     }
 
+    public function scopeNotExpired($query)
+    {
+        return $query->whereNotIn('status', ['expired']);
+    }
+
     public function scopeNotUsed($query)
     {
         return $query->whereNotIn('status', ['used']);

app/Traits/HasVacations.php

@@ -20,26 +20,19 @@ public function vacationEntitlements()
 
     public function availableVacationEntitlements()
     {
-        return $this->vacationEntitlements()->notUsed();
+        return $this->vacationEntitlements()
+            ->notUsed()
+            ->notExpired();
     }
 
     public function currentVacationEntitlement()
     {
         $today = now()->startOfDay();
-        $available = $this->availableVacationEntitlements()
-            ->where('starts_at','<=',$today)
+        return $this->availableVacationEntitlements()
             ->where('ends_at','>=',$today)
             ->orderBy('ends_at','ASC')
-            ->get();
-
-        $feasibleEntitlements = $available->filter(function (VacationEntitlement $entitlement) {
-            if(!$entitlement->isExpired() && !$entitlement->isUsed()) {
-                return $entitlement;
-            }
-        });
-
-        return $feasibleEntitlements->first();
-
+            ->get()
+            ->first();
     }
 
     public function latestVacationEntitlement()

tests/Feature/EvaluationTest.php

@@ -199,6 +199,61 @@ public function test_can_use_vacation_entitlement()
         ]);
     }
 
+    public function test_can_submit_future_vacation_entitlement()
+    {
+        $this->travelTo(Carbon::parse('2021-01-01'));
+
+        $absenceType = AbsenceType::forceCreate([
+            'location_id' => $this->location->id,
+            'title' => 'Urlaub',
+            'affect_vacation_times' => true,
+            'affect_evaluations' => true,
+            'evaluation_calculation_setting' => 'absent_to_target'
+        ]);
+
+        $this->user->absenceTypes()->sync($absenceType);
+
+        /**
+         * @var AddsVacationEntitlements
+         */
+        $action = app(AddsVacationEntitlements::class);
+        $action->add($this->user, [
+            'name' => "yearly allowance",
+            'starts_at' => "01.01.2022",
+            'ends_at' => "31.12.2022",
+            'days' => 10,
+            'expires' => false,
+            'transfer_remaining' => false
+        ]);
+
+        /**
+         * @var AddsAbsences
+         */
+        $action = app(AddsAbsences::class);
+
+        $action->add($this->user, $this->location, $this->user->id, [
+            'absence_type_id' => $absenceType->id,
+            'starts_at' => '29.11.2022 00:00',
+            'ends_at' => '30.11.2022 00:00',
+            'full_day' => true,
+            'status' => 'confirmed'
+        ]);
+
+        Bus::fake();
+
+        /**
+         * @var ApprovesAbsence
+         */
+        $approver = app(ApprovesAbsence::class);
+
+        $approver->approve(
+            $this->user,
+            $this->location,
+            Absence::first()->id
+        );
+
+    }
+
     public function test_can_submit_vacation()
     {
         $absenceType = AbsenceType::forceCreate([