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

wip

Browse Source
This commit is contained in:
Adrian Hopek
2022-04-07 08:57:17 +02:00
parent fe41fd1cc5
commit fb15811b16
5 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Domain/UserVacationStatsRetriever.php
View File

@@ -21,7 +21,7 @@ class UserVacationStatsRetriever
{
return $user
->vacations()
->where("year_period_id", $yearPeriod->id)
->whereBelongsTo($yearPeriod)
->whereRelation(
"vacationRequest",
fn(Builder $query) => $query
@@ -37,7 +37,7 @@ class UserVacationStatsRetriever
->whereRelation(
"vacationRequest",
fn(Builder $query) => $query
->where("year_period_id", $yearPeriod->id)
->whereBelongsTo($yearPeriod)
->whereIn("type", $this->getLimitableVacationTypes())
->states(VacationRequestStatesRetriever::successStates()),
)
@@ -50,7 +50,7 @@ class UserVacationStatsRetriever
{
return $user
->vacations()
->where("year_period_id", $yearPeriod->id)
->whereBelongsTo($yearPeriod)
->whereRelation(
"vacationRequest",
fn(Builder $query) => $query
@@ -64,7 +64,7 @@ class UserVacationStatsRetriever
{
return $user
->vacations()
->where("year_period_id", $yearPeriod->id)
->whereBelongsTo($yearPeriod)
->whereRelation(
"vacationRequest",
fn(Builder $query) => $query
@@ -86,7 +86,7 @@ class UserVacationStatsRetriever
public function getVacationDaysLimit(User $user, YearPeriod $yearPeriod): int
{
$limit = $user->vacationLimits()
->where("year_period_id", $yearPeriod->id)
->whereBelongsTo($yearPeriod)
->first()
?->days;

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

@@ -41,13 +41,16 @@ class DoesNotExceedLimitRule implements VacationRequestRule
protected function getUserVacationLimit(User $user, YearPeriod $yearPeriod): int
{
return $user->vacationLimits()->where("year_period_id", $yearPeriod->id)->first()->days ?? 0;
return $user->vacationLimits()
->whereBelongsTo($yearPeriod)
->first()
->days ?? 0;
}
protected function getVacationDaysWithLimit(User $user, YearPeriod $yearPeriod): int
{
return $user->vacations()
->where("year_period_id", $yearPeriod->id)
->whereBelongsTo($yearPeriod)
->whereRelation(
"vacationRequest",
fn(Builder $query) => $query