kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

#36 - wip

Browse Source
This commit is contained in:
Adrian Hopek 2022-02-07 10:35:14 +01:00
parent eadf984f30
commit 51d3849b58
12 changed files with 47 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Domain/VacationDaysCalculator.php
View File

@ -39,4 +39,4 @@ class VacationDaysCalculator
return true;
}
}
}

9
app/Domain/Validation/Rules/DoesNotExceedLimitRule.php
View File

@ -7,13 +7,14 @@ namespace Toby\Domain\Validation\Rules;
use Toby\Domain\VacationTypeConfigRetriever;
use Toby\Eloquent\Models\VacationRequest;
class DoesNotExceedLimitRule extends VacationRequestRule
class DoesNotExceedLimitRule implements VacationRequestRule
{
public function __construct(protected VacationTypeConfigRetriever $configRetriever)
{
public function __construct(
protected VacationTypeConfigRetriever $configRetriever,
) {
}
public function passes(VacationRequest $vacationRequest): bool
public function check(VacationRequest $vacationRequest): bool
{
return true;
}

9
app/Domain/Validation/Rules/MinimumOneVacationDayRule.php
View File

@ -7,13 +7,14 @@ namespace Toby\Domain\Validation\Rules;
use Toby\Domain\VacationDaysCalculator;
use Toby\Eloquent\Models\VacationRequest;
class MinimumOneVacationDayRule extends VacationRequestRule
class MinimumOneVacationDayRule implements VacationRequestRule
{
public function __construct(protected VacationDaysCalculator $vacationDaysCalculator)
{
public function __construct(
protected VacationDaysCalculator $vacationDaysCalculator,
) {
}
public function passes(VacationRequest $vacationRequest): bool
public function check(VacationRequest $vacationRequest): bool
{
return $this->vacationDaysCalculator
->calculateDays($vacationRequest->yearPeriod, $vacationRequest->from, $vacationRequest->to)

6
app/Domain/Validation/Rules/NoApprovedVacationRequestsInRange.php
View File

@ -7,11 +7,11 @@ namespace Toby\Domain\Validation\Rules;
use Toby\Domain\Enums\VacationRequestState;
use Toby\Eloquent\Models\VacationRequest;
class NoApprovedVacationRequestsInRange extends VacationRequestRule
class NoApprovedVacationRequestsInRange implements VacationRequestRule
{
public function passes(VacationRequest $vacationRequest): bool
public function check(VacationRequest $vacationRequest): bool
{
return $vacationRequest
return !$vacationRequest
->user
->vacationRequests()
->overlapsWith($vacationRequest)

6
app/Domain/Validation/Rules/NoPendingVacationRequestInRange.php
View File

@ -7,11 +7,11 @@ namespace Toby\Domain\Validation\Rules;
use Toby\Domain\Enums\VacationRequestState;
use Toby\Eloquent\Models\VacationRequest;
class NoPendingVacationRequestInRange extends VacationRequestRule
class NoPendingVacationRequestInRange implements VacationRequestRule
{
public function passes(VacationRequest $vacationRequest): bool
public function check(VacationRequest $vacationRequest): bool
{
return $vacationRequest
return !$vacationRequest
->user
->vacationRequests()
->overlapsWith($vacationRequest)

4
app/Domain/Validation/Rules/VacationRangeIsInTheSameYearRule.php
View File

@ -6,9 +6,9 @@ namespace Toby\Domain\Validation\Rules;
use Toby\Eloquent\Models\VacationRequest;
class VacationRangeIsInTheSameYearRule extends VacationRequestRule
class VacationRangeIsInTheSameYearRule implements VacationRequestRule
{
public function passes(VacationRequest $vacationRequest): bool
public function check(VacationRequest $vacationRequest): bool
{
return $vacationRequest->from->isSameYear($vacationRequest->to);
}

14
app/Domain/Validation/Rules/VacationRequestRule.php
View File

@ -4,18 +4,10 @@ declare(strict_types=1);
namespace Toby\Domain\Validation\Rules;
use Illuminate\Validation\ValidationException;
use Toby\Eloquent\Models\VacationRequest;
abstract class VacationRequestRule
interface VacationRequestRule
{
public function check(VacationRequest $vacationRequest): void
{
if (! $this->passes($vacationRequest)) {
throw ValidationException::withMessages(["vacationRequest" => $this->errorMessage()]);
}
}
public abstract function passes(VacationRequest $vacationRequest): bool;
public abstract function errorMessage(): string;
public function check(VacationRequest $vacationRequest): bool;
public function errorMessage(): string;
}

24
app/Domain/Validation/VacationRequestValidator.php
View File

@ -4,12 +4,14 @@ declare(strict_types=1);
namespace Toby\Domain\Validation;
use Illuminate\Pipeline\Pipeline;
use Toby\Domain\Validation\Rules\NoApprovedVacationRequestsInRange;
use Illuminate\Contracts\Container\Container;
use Illuminate\Validation\ValidationException;
use Toby\Domain\Validation\Rules\DoesNotExceedLimitRule;
use Toby\Domain\Validation\Rules\MinimumOneVacationDayRule;
use Toby\Domain\Validation\Rules\NoApprovedVacationRequestsInRange;
use Toby\Domain\Validation\Rules\NoPendingVacationRequestInRange;
use Toby\Domain\Validation\Rules\VacationRangeIsInTheSameYearRule;
use Toby\Domain\Validation\Rules\VacationRequestRule;
use Toby\Eloquent\Models\VacationRequest;
class VacationRequestValidator
@ -23,14 +25,28 @@ class VacationRequestValidator
];
public function __construct(
protected Pipeline $pipeline,
protected Container $container,
) {
}
/**
* @throws ValidationException
*/
public function validate(VacationRequest $vacationRequest): void
{
foreach ($this->rules as $rule) {
app($rule)->check($vacationRequest);
$rule = $this->makeRule($rule);
if (!$rule->check($vacationRequest)) {
throw ValidationException::withMessages([
"vacationRequest" => $rule->errorMessage(),
]);
}
}
}
protected function makeRule(string $class): VacationRequestRule
{
return $this->container->make($class);
}
}

7
app/Eloquent/Models/VacationRequest.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace Toby\Eloquent\Models;
use Carbon\CarbonInterface;
use Database\Factories\VacationRequestFactory;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@ -69,10 +68,10 @@ class VacationRequest extends Model
return $query->whereIn("state", $states);
}
public function scopeOverlapsWith(Builder $query, VacationRequest $vacationRequest): Builder
public function scopeOverlapsWith(Builder $query, self $vacationRequest): Builder
{
return $query->where("from", '<=', $vacationRequest->to)
->where("to", '>=', $vacationRequest->from);
return $query->where("from", "<=", $vacationRequest->to)
->where("to", ">=", $vacationRequest->from);
}
protected static function newFactory(): VacationRequestFactory

1
app/Infrastructure/Http/Controllers/VacationRequestController.php
View File

@ -5,7 +5,6 @@ declare(strict_types=1);
namespace Toby\Infrastructure\Http\Controllers;
use Barryvdh\DomPDF\Facade\Pdf;
use Carbon\Carbon;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response as LaravelResponse;

9
database/factories/VacationRequestFactory.php
View File

@ -15,6 +15,7 @@ use Toby\Eloquent\Models\YearPeriod;
class VacationRequestFactory extends Factory
{
protected $model = VacationRequest::class;
private static int $number = 1;
public function definition(): array
{
@ -36,13 +37,7 @@ class VacationRequestFactory extends Factory
protected function generateName(array $attributes): string
{
$year = YearPeriod::find($attributes["year_period_id"])->year;
$user = User::find($attributes["user_id"]);
$number = $user->vacationRequests()
->whereYear("from", $year)
->count() + 1;
dump($user->vacationRequests()->count());
$number = static::$number++;
return "{$number}/{$year}";
}

9
resources/js/Pages/VacationRequest/Index.vue
View File

@ -61,12 +61,6 @@
>
Do
</th>
<th
scope="col"
class="px-6 py-3 text-left text-xs font-semibold text-gray-500 uppercase tracking-wider"
>
Dni urlopu
</th>
<th scope="col" />
</tr>
</thead>
@ -96,9 +90,6 @@
<td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
{{ request.to }}
</td>
<td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
X
</td>
<td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
<InertiaLink :href="`/vacation-requests/${request.id}`">
<ChevronRightIcon class="block w-6 h-6 fill-gray-400" />