#444 - added tests

app/Actions/OvertimeRequest/CreateAction.php

@@ -10,13 +10,15 @@
 use Toby\Models\OvertimeRequest;
 use Toby\Models\User;
 use Toby\Models\VacationRequest;
+use Toby\Validation\OvertimeRequestValidator;
 
 class CreateAction
 {
     public function __construct(
         protected OvertimeRequestStateManager $stateManager,
         protected WaitForTechApprovalAction $waitForTechApprovalAction,
         protected OvertimeCalculator $overtimeCalculator,
+        protected OvertimeRequestValidator $overtimeRequestValidator,
     ) {}
 
     /**
@@ -31,12 +33,17 @@ public function execute(array $data, User $creator): OvertimeRequest
         return $overtimeRequest;
     }
 
+    /**
+     * @throws ValidationException
+     */
     protected function createVacationRequest(array $data, User $creator): OvertimeRequest
     {
         /** @var OvertimeRequest $overtimeRequest */
         $overtimeRequest = $creator->createdOvertimeRequests()->make($data);
         $overtimeRequest->hours = $this->overtimeCalculator->calculateHours($overtimeRequest->from, $overtimeRequest->to);
 
+        $this->overtimeRequestValidator->validate($overtimeRequest);
+
         $overtimeRequest->save();
 
         $this->stateManager->markAsCreated($overtimeRequest);

app/Domain/OvertimeCalculator.php

@@ -11,8 +11,8 @@ class OvertimeCalculator
 {
     public function calculateHours(CarbonInterface $from, CarbonInterface $to): int
     {
-        $hours = Carbon::create($from)->diffInHours($to);
+        $hours = Carbon::create($from)->diffInMinutes($to, true);
 
-        return (int)$hours;
+        return (int)ceil($hours / 60);
     }
 }

app/Http/Controllers/Api/CalculateOvertimeHoursController.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Http\Controllers\Api;
+
+use Illuminate\Http\JsonResponse;
+use Toby\Domain\OvertimeCalculator;
+use Toby\Http\Controllers\Controller;
+use Toby\Http\Requests\Api\CalculateOvertimeHoursRequest;
+
+class CalculateOvertimeHoursController extends Controller
+{
+    public function __invoke(CalculateOvertimeHoursRequest $request, OvertimeCalculator $overtimeCalculator): JsonResponse
+    {
+        $hours = $overtimeCalculator->calculateHours($request->from(), $request->to());
+
+        return new JsonResponse($hours);
+    }
+}

app/Http/Controllers/OvertimeRequestController.php

@@ -131,10 +131,11 @@ public function show(OvertimeRequest $overtimeRequest): Response
         ]);
     }
 
-    public function create(): Response
+    public function create(Request $request): Response
     {
         return inertia("OvertimeRequest/Create", [
             "settlementTypes" => SettlementType::casesToSelect(),
+            "overtimeFromDate" => $request->get("from_date"),
         ]);
     }
 

app/Http/Requests/Api/CalculateOvertimeHoursRequest.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Http\Requests\Api;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Carbon;
+use Toby\Http\Rules\YearPeriodExists;
+use Toby\Models\YearPeriod;
+
+class CalculateOvertimeHoursRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        return [
+            "from" => ["required", "date_format:Y-m-d H:i", new YearPeriodExists()],
+            "to" => ["required", "date_format:Y-m-d H:i", new YearPeriodExists()],
+        ];
+    }
+
+    public function from(): Carbon
+    {
+        return Carbon::create($this->request->get("from"));
+    }
+
+    public function to(): Carbon
+    {
+        return Carbon::create($this->request->get("to"));
+    }
+
+    public function yearPeriod(): YearPeriod
+    {
+        return YearPeriod::findByYear(Carbon::create($this->request->get("from"))->year);
+    }
+}

app/Models/OvertimeRequest.php

@@ -74,6 +74,12 @@ public function scopeStates(Builder $query, OvertimeRequestState|array $states):
         return $query->whereState("state", $states);
     }
 
+    public function scopeOverlapsWith(Builder $query, self $overtimeRequest): Builder
+    {
+        return $query->where("from", "<=", $overtimeRequest->to)
+            ->where("to", ">=", $overtimeRequest->from);
+    }
+
     protected static function newFactory(): OvertimeRequestFactory
     {
         return OvertimeRequestFactory::new();

app/Validation/OvertimeRequestValidator.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Validation;
+
+use Illuminate\Contracts\Container\Container;
+use Illuminate\Validation\ValidationException;
+use Toby\Models\OvertimeRequest;
+use Toby\Validation\Rules\OvertimeRequest\NoPendingOvertimeRequestInRange;
+use Toby\Validation\Rules\OvertimeRequest\OvertimeRequestRule;
+
+class OvertimeRequestValidator
+{
+    protected array $rules = [
+        NoPendingOvertimeRequestInRange::class,
+    ];
+
+    public function __construct(
+        protected Container $container,
+    ) {}
+
+    /**
+     * @throws ValidationException
+     */
+    public function validate(OvertimeRequest $overtimeRequest): void
+    {
+        foreach ($this->rules as $rule) {
+            $rule = $this->makeRule($rule);
+
+            if (!$rule->check($overtimeRequest)) {
+                throw ValidationException::withMessages([
+                    "overtimeRequest" => $rule->errorMessage(),
+                ]);
+            }
+        }
+    }
+
+    protected function makeRule(string $class): OvertimeRequestRule
+    {
+        return $this->container->make($class);
+    }
+}

app/Validation/Rules/OvertimeRequest/NoPendingOvertimeRequestInRange.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Validation\Rules\OvertimeRequest;
+
+use Toby\Domain\OvertimeRequestStatesRetriever;
+use Toby\Models\OvertimeRequest;
+
+class NoPendingOvertimeRequestInRange implements OvertimeRequestRule
+{
+    public function check(OvertimeRequest $overtimeRequest): bool
+    {
+        return !$overtimeRequest
+            ->user
+            ->overtimeRequests()
+            ->overlapsWith($overtimeRequest)
+            ->states(OvertimeRequestStatesRetriever::pendingStates())
+            ->exists();
+    }
+
+    public function errorMessage(): string
+    {
+        return __("You have a pending request in this date range.");
+    }
+}

app/Validation/Rules/OvertimeRequest/OvertimeRequestRule.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Validation\Rules\OvertimeRequest;
+
+use Toby\Models\OvertimeRequest;
+
+interface OvertimeRequestRule
+{
+    public function check(OvertimeRequest $overtimeRequest): bool;
+
+    public function errorMessage(): string;
+}

app/Validation/Rules/DoesNotExceedLimitRule.php → app/Validation/Rules/VacationRequest/DoesNotExceedLimitRule.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;

app/Validation/Rules/MinimumOneVacationDayRule.php → app/Validation/Rules/VacationRequest/MinimumOneVacationDayRule.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Toby\Domain\WorkDaysCalculator;
 use Toby\Models\VacationRequest;

app/Validation/Rules/NoApprovedVacationRequestsInRange.php → app/Validation/Rules/VacationRequest/NoApprovedVacationRequestsInRange.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Toby\Domain\VacationRequestStatesRetriever;
 use Toby\Models\VacationRequest;

app/Validation/Rules/NoPendingVacationRequestInRange.php → app/Validation/Rules/VacationRequest/NoPendingVacationRequestInRange.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Toby\Domain\VacationRequestStatesRetriever;
 use Toby\Models\VacationRequest;

app/Validation/Rules/VacationRangeIsInTheSameYearRule.php → app/Validation/Rules/VacationRequest/VacationRangeIsInTheSameYearRule.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Toby\Models\VacationRequest;
 

app/Validation/Rules/VacationRequestRule.php → app/Validation/Rules/VacationRequest/VacationRequestRule.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Toby\Models\VacationRequest;
 

app/Validation/Rules/VacationTypeCanBeSelected.php → app/Validation/Rules/VacationRequest/VacationTypeCanBeSelected.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Toby\Domain\VacationTypeConfigRetriever;
 use Toby\Enums\VacationType;

app/Validation/VacationRequestValidator.php

@@ -7,13 +7,13 @@
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Validation\ValidationException;
 use Toby\Models\VacationRequest;
-use Toby\Validation\Rules\DoesNotExceedLimitRule;
-use Toby\Validation\Rules\MinimumOneVacationDayRule;
-use Toby\Validation\Rules\NoApprovedVacationRequestsInRange;
-use Toby\Validation\Rules\NoPendingVacationRequestInRange;
-use Toby\Validation\Rules\VacationRangeIsInTheSameYearRule;
-use Toby\Validation\Rules\VacationRequestRule;
-use Toby\Validation\Rules\VacationTypeCanBeSelected;
+use Toby\Validation\Rules\VacationRequest\DoesNotExceedLimitRule;
+use Toby\Validation\Rules\VacationRequest\MinimumOneVacationDayRule;
+use Toby\Validation\Rules\VacationRequest\NoApprovedVacationRequestsInRange;
+use Toby\Validation\Rules\VacationRequest\NoPendingVacationRequestInRange;
+use Toby\Validation\Rules\VacationRequest\VacationRangeIsInTheSameYearRule;
+use Toby\Validation\Rules\VacationRequest\VacationRequestRule;
+use Toby\Validation\Rules\VacationRequest\VacationTypeCanBeSelected;
 
 class VacationRequestValidator
 {

database/factories/OvertimeRequestFactory.php

@@ -7,6 +7,7 @@
 use Carbon\CarbonImmutable;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Toby\Domain\OvertimeRequestStatesRetriever;
+use Toby\Enums\SettlementType;
 use Toby\Models\OvertimeRequest;
 use Toby\Models\User;
 use Toby\Models\YearPeriod;
@@ -29,6 +30,7 @@ public function definition(): array
             "from" => $from,
             "to" => $to,
             "hours" => $hours,
+            "settlement_type" => $this->faker->randomElement(SettlementType::cases())->value,
             "comment" => $this->faker->boolean ? $this->faker->paragraph() : null,
         ];
     }