From f43891ad1a52dde598b7be760c8205748c88081f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Ioni=C8=9B=C4=83?= <hi@andrei.io>
Date: Mon, 12 May 2025 12:45:16 +0100
Subject: [PATCH] fix: don't count as current stays that are ending today

---
 app/Models/Beneficiary.php | 10 ----------
 app/Models/Stay.php        |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/Models/Beneficiary.php b/app/Models/Beneficiary.php
index a6c822d..05a8a9b 100644
--- a/app/Models/Beneficiary.php
+++ b/app/Models/Beneficiary.php
@@ -109,16 +109,6 @@ public function residenceCountry(): BelongsTo
         return $this->belongsTo(Country::class, 'residence_country_id');
     }
 
-    public function scopeWhereCurrentlyInShelter(Builder $query, ?Shelter $shelter = null): Builder
-    {
-        return $query->whereHas('stays', function (Builder $query) use ($shelter) {
-            return $query
-                ->whereDate('start_date', '<=', today())
-                ->whereDate('end_date', '>=', today())
-                ->when($shelter, fn (Builder $query) => $query->where('shelter_id', $shelter->id));
-        });
-    }
-
     public function scopeWhereInShelter(Builder $query, Shelter $shelter): Builder
     {
         return $query->whereRelation('stays', 'shelter_id', $shelter->id);
diff --git a/app/Models/Stay.php b/app/Models/Stay.php
index 17058a0..c67521b 100644
--- a/app/Models/Stay.php
+++ b/app/Models/Stay.php
@@ -63,7 +63,7 @@ public function scopeWhereCurrent(Builder $query): Builder
         return $query
             ->whereDate('start_date', '<=', today())
             ->where(function (Builder $query) {
-                $query->whereDate('end_date', '>=', today())
+                $query->whereDate('end_date', '>', today())
                     ->orWhereNull('end_date');
             });
     }