Skip to content

Commit 96cf218

Browse files
authored
fix: don't count as current stays that are ending today (#115)
1 parent 34b0281 commit 96cf218

2 files changed

Lines changed: 1 addition & 11 deletions

File tree

app/Models/Beneficiary.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,6 @@ public function residenceCountry(): BelongsTo
109109
return $this->belongsTo(Country::class, 'residence_country_id');
110110
}
111111

112-
public function scopeWhereCurrentlyInShelter(Builder $query, ?Shelter $shelter = null): Builder
113-
{
114-
return $query->whereHas('stays', function (Builder $query) use ($shelter) {
115-
return $query
116-
->whereDate('start_date', '<=', today())
117-
->whereDate('end_date', '>=', today())
118-
->when($shelter, fn (Builder $query) => $query->where('shelter_id', $shelter->id));
119-
});
120-
}
121-
122112
public function scopeWhereInShelter(Builder $query, Shelter $shelter): Builder
123113
{
124114
return $query->whereRelation('stays', 'shelter_id', $shelter->id);

app/Models/Stay.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function scopeWhereCurrent(Builder $query): Builder
6363
return $query
6464
->whereDate('start_date', '<=', today())
6565
->where(function (Builder $query) {
66-
$query->whereDate('end_date', '>=', today())
66+
$query->whereDate('end_date', '>', today())
6767
->orWhereNull('end_date');
6868
});
6969
}

0 commit comments

Comments
 (0)