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

#38 - cr fix

Browse Source
This commit is contained in:
Adrian Hopek
2022-02-22 10:42:20 +01:00
parent 6b4b583632
commit 0cc495acab
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Domain/Listeners/HandleCreatedVacationRequest.php
View File

@@ -20,7 +20,7 @@ class HandleCreatedVacationRequest
{
$vacationRequest = $event->vacationRequest;
if ($vacationRequest->shouldSkipFlow()) {
if ($vacationRequest->hasFlowSkipped()) {
$this->stateManager->approve($vacationRequest);
return;

4
app/Domain/Listeners/SendCreatedVacationRequestNotification.php
View File

@@ -19,9 +19,9 @@ class SendCreatedVacationRequestNotification
$vacationRequest = $event->vacationRequest;
if ($vacationRequest->creator->is($vacationRequest->user)) {
$event->vacationRequest->user->notify(new VacationRequestCreatedNotification($event->vacationRequest));
$vacationRequest->user->notify(new VacationRequestCreatedNotification($vacationRequest));
} else {
$event->vacationRequest->user->notify(new VacationRequestCreatedOnEmployeeBehalf($event->vacationRequest));
$vacationRequest->user->notify(new VacationRequestCreatedOnEmployeeBehalf($vacationRequest));
}
}
}

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

@@ -22,7 +22,7 @@ use Toby\Domain\Enums\VacationType;
* @property Carbon $from
* @property Carbon $to
* @property string $comment
* @property boolean $skip_flow
* @property bool $flow_skipped
* @property User $user
* @property User $creator
* @property YearPeriod $yearPeriod
@@ -76,9 +76,9 @@ class VacationRequest extends Model
$this->save();
}
public function shouldSkipFlow(): bool
public function hasFlowSkipped(): bool
{
return $this->skip_flow;
return $this->flow_skipped;
}
public function scopeStates(Builder $query, array $states): Builder

4
app/Infrastructure/Http/Requests/VacationRequestRequest.php
View File

@@ -20,7 +20,7 @@ class VacationRequestRequest extends FormRequest
"type" => ["required", new Enum(VacationType::class)],
"from" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
"to" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
"skipFlow" => ["nullable", "boolean"],
"flowSkipped" => ["nullable", "boolean"],
"comment" => ["nullable"],
];
}
@@ -36,7 +36,7 @@ class VacationRequestRequest extends FormRequest
"to" => $this->get("to"),
"year_period_id" => YearPeriod::findByYear(Carbon::create($from)->year)->id,
"comment" => $this->get("comment"),
"skip_flow" => $this->boolean("skipFlow"),
"flow_skipped" => $this->boolean("flowSkipped"),
];
}
}