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

#71 - annual summary (#113)

Browse Source 
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* fix

* lint fix

* cr fix

* fix
This commit is contained in:
Adrian Hopek
2022-04-07 14:33:15 +02:00
committed by GitHub
parent 84403a762a
commit ff8d6aade6
20 changed files with 1073 additions and 1206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Domain/TimesheetPerUserSheet.php
View File

@@ -187,7 +187,7 @@ class TimesheetPerUserSheet implements WithTitle, WithHeadings, WithEvents, With
{
return $user->vacations()
->with("vacationRequest")
->whereRelation("vacationRequest", fn(Builder $query) => $query->whereIn("type", $this->types))
->whereRelation("vacationRequest", fn(Builder $query): Builder => $query->whereIn("type", $this->types))
->whereBetween("date", [$period->start, $period->end])
->approved()
->get()

18
app/Domain/UserVacationStatsRetriever.php
View File

@@ -21,10 +21,10 @@ class UserVacationStatsRetriever
{
return $user
->vacations()
->where("year_period_id", $yearPeriod->id)
->whereBelongsTo($yearPeriod)
->whereRelation(
"vacationRequest",
fn(Builder $query) => $query
fn(Builder $query): Builder => $query
->whereIn("type", $this->getLimitableVacationTypes())
->states(VacationRequestStatesRetriever::successStates()),
)
@@ -36,8 +36,8 @@ class UserVacationStatsRetriever
return $user->vacations()
->whereRelation(
"vacationRequest",
fn(Builder $query) => $query
->where("year_period_id", $yearPeriod->id)
fn(Builder $query): Builder => $query
->whereBelongsTo($yearPeriod)
->whereIn("type", $this->getLimitableVacationTypes())
->states(VacationRequestStatesRetriever::successStates()),
)
@@ -50,10 +50,10 @@ class UserVacationStatsRetriever
{
return $user
->vacations()
->where("year_period_id", $yearPeriod->id)
->whereBelongsTo($yearPeriod)
->whereRelation(
"vacationRequest",
fn(Builder $query) => $query
fn(Builder $query): Builder => $query
->whereIn("type", $this->getLimitableVacationTypes())
->states(VacationRequestStatesRetriever::pendingStates()),
)
@@ -64,10 +64,10 @@ class UserVacationStatsRetriever
{
return $user
->vacations()
->where("year_period_id", $yearPeriod->id)
->whereBelongsTo($yearPeriod)
->whereRelation(
"vacationRequest",
fn(Builder $query) => $query
fn(Builder $query): Builder => $query
->whereIn("type", $this->getNotLimitableVacationTypes())
->states(VacationRequestStatesRetriever::successStates()),
)
@@ -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;

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

@@ -41,16 +41,19 @@ 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
fn(Builder $query): Builder => $query
->whereIn("type", $this->getLimitableVacationTypes())
->noStates(VacationRequestStatesRetriever::failedStates()),
)