Merge pull request #5 from eporsche/code_refactoring

Code refactoring and small bug fixes

Author: eporsche

app/Actions/AddAbsence.php

@@ -29,11 +29,11 @@ public function __construct()
         $this->dateFormatter = app(DateFormatter::class);
     }
 
-    public function add(User $employee, Location $location, array $data): void
+    public function add(User $employee, array $data): void
     {
         Gate::forUser($employee)->authorize('addAbsence', [
             Absence::class,
-            $location
+            $employee->currentLocation
         ]);
 
         Validator::make($data, [
@@ -64,15 +64,15 @@ public function add(User $employee, Location $location, array $data): void
         $calculator = new AbsenceCalculator(
             new EmployeeAbsenceCalendar(
                 $employee,
-                $location,
+                $employee->currentLocation,
                 new CarbonPeriod($startsAt, $endsAt)
             ),
             AbsenceType::findOrFail($data['absence_type_id'])
         );
 
         $absence = $employee->absences()->create(
             [
-                'location_id' => $location->id,
+                'location_id' => $employee->currentLocation->id,
                 'vacation_days' => $calculator->sumVacationDays(),
                 'paid_hours' => $calculator->sumPaidHours(),
                 'starts_at' => $startsAt,
@@ -81,7 +81,7 @@ public function add(User $employee, Location $location, array $data): void
         );
 
          $admins = User::all()->filter
-            ->hasLocationRole($location, 'admin');
+            ->hasLocationRole($employee->currentLocation, 'admin');
 
          Mail::to($admins)
             ->send(new NewAbsenceWaitingForApproval($absence, $employee));

app/Actions/AddTimeTracking.php

@@ -51,10 +51,8 @@ public function add($employee, array $data, array $pauseTimes)
             ], Arr::except($data, ['starts_at','ends_at'])));
 
             $trackedTime->pauseTimes()->createMany($pauseTimes);
-
             $trackedTime->updatePauseTime();
         });
-
     }
 
     protected function validatePauseTimes($pauseTimePeriodCalculator, $startsAt, $endsAt)
@@ -70,13 +68,6 @@ protected function validatePauseTimes($pauseTimePeriodCalculator, $startsAt, $en
         });
     }
 
-    protected function calculatePauseTimeFromDefaultRestingTimes($employee, $workingTimeInSeconds)
-    {
-        return optional(
-            $employee->defaultRestingTimes()->firstWhere('min_hours','<=',$workingTimeInSeconds)
-        )->duration->inSeconds();
-    }
-
     protected function ensureDateIsNotTooFarInTheFuture($endsAt)
     {
         if ($endsAt->isAfter(Carbon::now()->endOfDay())) {

app/Actions/ApproveAbscence.php

@@ -27,7 +27,7 @@ class ApproveAbscence implements ApprovesAbsence
      * @param  int  $absenceId
      * @return void
      */
-    public function approve(User $user, Location $location, $absenceId)
+    public function approve(User $user, $absenceId)
     {
         Validator::make([
             'absence_id' => $absenceId
@@ -37,9 +37,9 @@ public function approve(User $user, Location $location, $absenceId)
 
         $absence = Absence::findOrFail($absenceId);
 
-        DB::transaction(function () use ($absence, $location) {
+        DB::transaction(function () use ($absence, $user) {
             $this->bookVacationDays($absence);
-            $this->createAbsenceIndex($absence, $location);
+            $this->createAbsenceIndex($absence, $user->currentLocation);
             $absence->markAsConfirmed();
             if (Daybreak::hasCaldavFeature()) {
                 CreateCaldavEvent::dispatch($absence)

app/Actions/RemoveAbsence.php

@@ -3,16 +3,23 @@
 namespace App\Actions;
 
 use App\Models\User;
+use Illuminate\Support\Facades\Gate;
 use App\Mail\AbsenceRemoved;
 use App\Contracts\RemovesAbsence;
 use Illuminate\Support\Facades\Mail;
+use DB;
 
 class RemoveAbsence implements RemovesAbsence
 {
-    public function remove(User $employee, $absenceId)
+    public function remove($user, $removesAbsenceId)
     {
-        $employee->absences()->whereKey($absenceId)->delete();
+        Gate::forUser($user)->authorize('removeAbsence', $user->currentLocation);
 
-        Mail::to($employee)->send(new AbsenceRemoved());
+        tap($user->currentLocation->absences()->whereKey($removesAbsenceId)->first(), function ($absence) {
+
+            $absence->delete();
+
+            Mail::to($absence->employee)->send(new AbsenceRemoved());
+        });
     }
 }

app/Actions/RemoveTimeTracking.php

@@ -9,6 +9,6 @@ class RemoveTimeTracking implements RemovesTimeTracking
 {
     public function remove(User $user, $timeTrackingId)
     {
-        $user->timeTrackings()->whereKey($timeTrackingId)->delete();
+        $user->currentLocation->timeTrackings()->whereKey($timeTrackingId)->delete();
     }
 }

app/Actions/UpdateTimeTracking.php

@@ -41,15 +41,13 @@ public function update(User $employee, $timeTrackingId, array $data, array $paus
         $this->ensureDateIsNotTooFarInTheFuture($endsAt);
         $this->ensureGivenTimeIsNotOverlappingWithExisting($employee, $startsAt, $endsAt, $timeTrackingId);
 
-        //check pause times
-
         $this->validatePauseTimes(
             PeriodCalculator::fromTimesArray($pauseTimes),
             $startsAt,
             $endsAt
         );
 
-        $trackedTime = $employee->timeTrackings()->whereKey($timeTrackingId)->first();
+        $trackedTime = $employee->currentLocation->timeTrackings()->whereKey($timeTrackingId)->first();
 
         DB::transaction(function () use ($trackedTime, $startsAt, $endsAt, $data, $pauseTimes) {
             $trackedTime->update(array_merge([

app/Contracts/AddsAbsences.php

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

app/Contracts/ApprovesAbsence.php

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

app/Contracts/RemovesAbsence.php

@@ -13,5 +13,5 @@ interface RemovesAbsence
      * @param  mixed  $removesAbsenceId
      * @return void
      */
-    public function remove(User $employee, $removesAbsenceId);
+    public function remove($user, $removesAbsenceId);
 }

app/Formatter/DateFormatter.php

@@ -21,7 +21,7 @@ public function formatDateForView($date);
 
     public function formatDateTimeForView($date);
 
-    public function generateTimeStr(string $date, string $hours = null, string $minutes = null);
+    public function generateTimeStr(string $date = null, string $hours = null, string $minutes = null);
 
     public function timeStrToCarbon(string $timeStr) : CarbonImmutable;