Merge pull request #31 from eporsche/fix_vacation_allocation

fixed an issue where multiple vacation allowances could not be approved
eporsche · Dec 2, 2021 · 07517c6 · 07517c6
2 parents 8390089 + 6469816
commit 07517c6
Show file tree

Hide file tree

Showing 5 changed files with 181 additions and 6 deletions.
diff --git a/.php_cs → .php-cs-fixer.php b/.php_cs → .php-cs-fixer.php
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/app/Models/VacationEntitlement.php b/app/Models/VacationEntitlement.php
@@ -89,6 +89,11 @@ public function isExpired()
         return $this->status === 'expired';
     }
 
+    public function notExpired()
+    {
+        return $this->status != 'expired';
+    }
+
     public function expire()
     {
         return $this->update([
@@ -151,15 +156,15 @@ public function useVacationDays(Absence $absence)
             return;
         }
 
-        if ($this->isUsed()) {
+        if ($this->isUsed() || $this->isExpired()) {
             throw ValidationException::withMessages([
                 'error' => [__('Vacation entitlement has wrong status.')],
             ]);
         }
 
-        $this->usedVacationDays()->attach($absence->id, [
+        tap($this, fn($model) => $model->usedVacationDays()->attach($absence->id, [
             'used_days' => $absence->vacation_days
-        ]);
+        ]))->load('usedVacationDays');
 
         if ($this->used_days->isGreaterThanOrEqualTo($this->available_days)) {
             $this->markAsUsed();

diff --git a/app/Traits/HasVacations.php b/app/Traits/HasVacations.php
@@ -26,12 +26,20 @@ public function availableVacationEntitlements()
     public function currentVacationEntitlement()
     {
         $today = now()->startOfDay();
-        return $this->availableVacationEntitlements()
+        $available = $this->availableVacationEntitlements()
             ->where('starts_at','<=',$today)
             ->where('ends_at','>=',$today)
             ->orderBy('ends_at','ASC')
-            ->limit(1)
-            ->first();
+            ->get();
+
+        $feasibleEntitlements = $available->filter(function (VacationEntitlement $entitlement) {
+            if(!$entitlement->isExpired() && !$entitlement->isUsed()) {
+                return $entitlement;
+            }
+        });
+
+        return $feasibleEntitlements->first();
+
     }
 
     public function latestVacationEntitlement()

diff --git a/tests/Feature/EvaluationTest.php b/tests/Feature/EvaluationTest.php
@@ -12,6 +12,7 @@
 use App\Models\Location;
 use App\Models\AbsenceType;
 use App\Contracts\AddsAbsences;
+use App\Contracts\AddsVacationEntitlements;
 use App\Contracts\ApprovesAbsence;
 use Illuminate\Support\Facades\Bus;
 use App\Contracts\FiltersEvaluation;
@@ -135,6 +136,167 @@ public function test_can_submit_fullday_illness()
     //Überstunden
 
     //Urlaub
+    public function test_can_use_vacation_entitlement()
+    {
+        $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.2021",
+            'ends_at' => "31.12.2021",
+            'days' => 2,
+            '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.2021 00:00',
+            'ends_at' => '30.11.2021 00:00',
+            'full_day' => true,
+            'status' => 'confirmed'
+        ]);
+
+        Bus::fake();
+
+        /**
+         * @var ApprovesAbsence
+         */
+        $approver = app(ApprovesAbsence::class);
+
+        $approver->approve(
+            $this->user,
+            $this->location,
+            Absence::first()->id
+        );
+
+        $this->assertDatabaseHas("absences",[
+            'id' =>  Absence::first()->id,
+            'status' => 'confirmed',
+            'vacation_days' => 2,
+            'paid_hours' => 16
+        ]);
+
+        $this->assertDatabaseHas("vacation_entitlements",[
+            'name' => 'yearly allowance',
+            'status' => 'used',
+        ]);
+    }
+
+    public function test_can_submit_vacation()
+    {
+        $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.2021",
+            'ends_at' => "31.12.2021",
+            'days' => 2,
+            '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.2021 00:00',
+            'ends_at' => '30.11.2021 00:00',
+            'full_day' => true,
+            'status' => 'confirmed'
+        ]);
+
+        Bus::fake();
+
+        /**
+         * @var ApprovesAbsence
+         */
+        $approver = app(ApprovesAbsence::class);
+
+        $approver->approve(
+            $this->user,
+            $this->location,
+            Absence::first()->id
+        );
+
+        $this->assertDatabaseHas("absence_index",[
+            'date' => '2021-11-29 00:00:00',
+            'hours' => 8,
+        ]);
+
+        $this->assertDatabaseHas("absence_index",[
+            'date' => '2021-11-30 00:00:00',
+            'hours' => 8,
+        ]);
+
+        /**
+         * @var AddsVacationEntitlements
+         */
+        $action = app(AddsVacationEntitlements::class);
+        $action->add($this->user, [
+            'name' => "additional allowance",
+            'starts_at' => "01.01.2021",
+            'ends_at' => "31.12.2021",
+            'days' => 2,
+            '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' => '06.12.2021 00:00',
+            'ends_at' => '07.12.2021 00:00',
+            'full_day' => true,
+            'status' => 'confirmed'
+        ]);
+
+        /**
+         * @var ApprovesAbsence
+         */
+        $approver = app(ApprovesAbsence::class);
+
+        $approver->approve(
+            $this->user,
+            $this->location,
+            Absence::where('starts_at','2021-12-06 00:00:00')->first()->id
+        );
+    }
 
     //Wunschfrei
 }