Merge pull request #17 from eporsche/add_absences_for_other_user

Adding the ability to manage absences for other location users

app/AbsenceCalendar/EmployeeAbsenceCalendar.php

@@ -29,7 +29,6 @@ public function __construct(User $employee, Location $location, CarbonPeriod $pe
             $period->getStartDate()->startOfDay(),
             $period->getEndDate()->endOfDay()
         );
-
         $this->calculateDays();
     }
 
@@ -113,7 +112,6 @@ protected function diffHoursToStartOrEndOfDay(Carbon $date)
             $diffInHours = BigDecimal::of($date->startOfDay()->diffInMinutes($this->endDay))
                 ->dividedBy('60', 2, RoundingMode::HALF_EVEN);
         }
-
         return $diffInHours;
     }
 

app/Actions/AddAbsence.php

@@ -7,9 +7,9 @@
 use App\Models\Location;
 use Carbon\CarbonPeriod;
 use App\Models\AbsenceType;
-use Illuminate\Support\Arr;
 use App\Contracts\AddsAbsences;
 use App\Formatter\DateFormatter;
+use Laravel\Jetstream\Jetstream;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Validator;
@@ -29,11 +29,12 @@ public function __construct()
         $this->dateFormatter = app(DateFormatter::class);
     }
 
-    public function add(User $employee, array $data): void
+    public function add(User $user, Location $location, int $managingAbsenceForId, array $data)
     {
-        Gate::forUser($employee)->authorize('addAbsence', [
+        Gate::forUser($user)->authorize('addAbsence', [
             Absence::class,
-            $employee->currentLocation
+            $managingAbsenceForId,
+            $location
         ]);
 
         Validator::make($data, [
@@ -50,40 +51,38 @@ public function add(User $employee, array $data): void
             'full_day' => ['required', 'boolean']
         ])->validateWithBag('addAbsence');
 
-
         $startsAt = $this->dateFormatter->timeStrToCarbon($data['starts_at']);
         $endsAt = $this->dateFormatter->timeStrToCarbon($data['ends_at']);
 
         //ignore given time if calculation is based on full day
         if (isset($data['full_day']) && $data['full_day']) {
             $startsAt = $startsAt->copy()->startOfDay();
             $endsAt = $endsAt->copy()->endOfDay();
-
         }
 
+        $addingAbsenceFor = Jetstream::findUserByIdOrFail($managingAbsenceForId);
+
         $calculator = new AbsenceCalculator(
             new EmployeeAbsenceCalendar(
-                $employee,
-                $employee->currentLocation,
+                $addingAbsenceFor,
+                $location,
                 new CarbonPeriod($startsAt, $endsAt)
             ),
             AbsenceType::findOrFail($data['absence_type_id'])
         );
 
-        $absence = $employee->absences()->create(
+        $absence = $addingAbsenceFor->absences()->create(
             [
-                'location_id' => $employee->currentLocation->id,
+                'location_id' => $location->id,
                 'vacation_days' => $calculator->sumVacationDays(),
                 'paid_hours' => $calculator->sumPaidHours(),
                 'starts_at' => $startsAt,
                 'ends_at' => $endsAt,
             ] + $data
         );
 
-         $admins = User::all()->filter
-            ->hasLocationRole($employee->currentLocation, 'admin');
-
-         Mail::to($admins)
-            ->send(new NewAbsenceWaitingForApproval($absence, $employee));
+        Mail::to(
+            $location->allUsers()->filter->hasLocationRole($location, 'admin')
+        )->send(new NewAbsenceWaitingForApproval($absence, $addingAbsenceFor));
     }
 }

app/Actions/AddLocationMember.php

@@ -117,9 +117,9 @@ protected function rules()
     }
 
     /**
-     * Ensure that the user is not already on the team.
+     * Ensure that the user is not already on the location.
      *
-     * @param  mixed  $team
+     * @param  mixed  $location
      * @param  string  $email
      * @return \Closure
      */
@@ -129,7 +129,7 @@ protected function ensureUserIsNotAlreadyInLocation($location, string $email)
             $validator->errors()->addIf(
                 $location->hasUserWithEmail($email),
                 'email',
-                __('This user already belongs to the team.')
+                __('This user already belongs to the location.')
             );
         };
     }

app/Actions/AddTimeTracking.php

@@ -88,8 +88,8 @@ protected function ensureDateIsNotBeforeEmploymentDate($employee, $startsAt)
         }
     }
 
-    protected function ensureGivenTimeIsNotOverlappingWithExisting($employee, $startsAt, $endsAt) {
-
+    protected function ensureGivenTimeIsNotOverlappingWithExisting($employee, $startsAt, $endsAt)
+    {
         if ($employee->timeTrackings()->where(function ($query) use ($startsAt, $endsAt) {
             $query->whereBetween('starts_at', [$startsAt, $endsAt])
                 ->orWhereBetween('ends_at', [$startsAt, $endsAt])

app/Actions/ApproveAbscence.php

@@ -27,7 +27,7 @@ class ApproveAbscence implements ApprovesAbsence
      * @param  int  $absenceId
      * @return void
      */
-    public function approve(User $user, $absenceId)
+    public function approve(User $user, Location $location, $absenceId)
     {
         Validator::make([
             'absence_id' => $absenceId
@@ -57,6 +57,7 @@ public function bookVacationDays($absence)
 
         //TODO: distribute absence days between available vacation entitlements
         $currentVacationEntitlement = $absence->employee->currentVacationEntitlement();
+
         if (!isset($currentVacationEntitlement) || !$currentVacationEntitlement->hasEnoughUnusedVacationDays($absence->vacation_days)) {
             throw ValidationException::withMessages([
                 'error' => [__('Sorry, there is no fitting vacation entitlement for this absence.')],

app/Actions/InviteLocationMember.php

@@ -18,8 +18,6 @@ public function invite($user, $location, string $email, string $role = null)
 
         $this->validate($location, $email, $role);
 
-        // InvitinglocationMember::dispatch($location, $email, $role);
-
         $invitation = $location->locationInvitations()->create([
             'email' => $email,
             'role' => $role,

app/Actions/RemoveAbsence.php

@@ -2,20 +2,25 @@
 
 namespace App\Actions;
 
+use DB;
 use App\Models\User;
-use Illuminate\Support\Facades\Gate;
+use App\Models\Location;
 use App\Mail\AbsenceRemoved;
 use App\Contracts\RemovesAbsence;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Mail;
-use DB;
 
 class RemoveAbsence implements RemovesAbsence
 {
-    public function remove($user, $removesAbsenceId)
+    public function remove(User $user, Location $location, $removesAbsenceId)
     {
-        Gate::forUser($user)->authorize('removeAbsence', $user->currentLocation);
+        tap($location->absences()->whereKey($removesAbsenceId)->first(), function ($absence) use ($user, $location) {
 
-        tap($user->currentLocation->absences()->whereKey($removesAbsenceId)->first(), function ($absence) {
+            Gate::forUser($user)->authorize('removeAbsence', [
+                Absence::class,
+                $absence,
+                $location
+            ]);
 
             $absence->delete();
 

app/Contracts/AddsAbsences.php

@@ -10,9 +10,10 @@ interface AddsAbsences
     /**
      * Add a absence for user and location
      *
-     * @param  User  $employee
+     * @param  User  $user
+     * @param  mixed  $addingAbsenceForId
      * @param  array  $data
      * @return void
      */
-    public function add(User $employee, array $data) : void;
+    public function add(User $user, Location $location, int $addingAbsenceForId, array $data);
 }

app/Contracts/ApprovesAbsence.php

@@ -2,10 +2,11 @@
 
 namespace App\Contracts;
 
-use App\Models\Absence;
 use App\Models\User;
+use App\Models\Absence;
+use App\Models\Location;
 
 interface ApprovesAbsence
 {
-    public function approve(User $user, Absence $absence);
+    public function approve(User $user, Location $location, Absence $absence);
 }

app/Contracts/RemovesAbsence.php

@@ -3,15 +3,17 @@
 namespace App\Contracts;
 
 use App\Models\User;
+use App\Models\Location;
 
 interface RemovesAbsence
 {
     /**
      * Remove a absence.
      *
-     * @param  mixed  $user
+     * @param  User  $user
+     * @param  Location  $location
      * @param  mixed  $removesAbsenceId
      * @return void
      */
-    public function remove($user, $removesAbsenceId);
+    public function remove(User $user, Location $location, $removesAbsenceId);
 }

app/Http/Controllers/AbsenceController.php

@@ -8,8 +8,6 @@ class AbsenceController extends Controller
 {
     public function __invoke(Request $request)
     {
-        return view('absences.index', [
-            'employee' => $request->user()
-        ]);
+        return view('absences.index');
     }
 }