Merge pull request #339 from wri/fix/TM-1093-restoration-in-progress

[TM-1093] Sites in restoration-in-progress need to count as approved.
wri · Jul 9, 2024 · 89e852e · 89e852e
2 parents aa58170 + d5b1622
commit 89e852e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/Models/V2/Projects/Project.php b/app/Models/V2/Projects/Project.php
@@ -29,7 +29,6 @@
 use App\Models\V2\TreeSpecies\TreeSpecies;
 use App\Models\V2\Workdays\Workday;
 use App\Models\V2\Workdays\WorkdayDemographic;
-use App\StateMachines\EntityStatusStateMachine;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -498,7 +497,7 @@ private function submittedSiteReports(): HasManyThrough
         // a status field.
         return $this
             ->siteReports()
-            ->where('v2_sites.status', EntityStatusStateMachine::APPROVED)
+            ->whereIn('v2_sites.status', Site::$approvedStatuses)
             ->whereNotIn('v2_site_reports.status', SiteReport::UNSUBMITTED_STATUSES);
     }
 

diff --git a/app/Models/V2/Sites/Site.php b/app/Models/V2/Sites/Site.php
@@ -72,6 +72,11 @@ class Site extends Model implements MediaModel, AuditableContract, EntityModel,
         submitForApproval as entityStatusSubmitForApproval;
     }
 
+    public static array $approvedStatuses = [
+        EntityStatusStateMachine::APPROVED,
+        SiteStatusStateMachine::RESTORATION_IN_PROGRESS,
+    ];
+
     public static array $statuses = [
         EntityStatusStateMachine::STARTED => 'Started',
         EntityStatusStateMachine::AWAITING_APPROVAL => 'Awaiting approval',
@@ -200,7 +205,7 @@ public function toSearchableArray()
      */
     public function scopeIsApproved(Builder $query): Builder
     {
-        return $query->whereIn('status', [EntityStatusStateMachine::APPROVED, SiteStatusStateMachine::RESTORATION_IN_PROGRESS]);
+        return $query->whereIn('status', self::$approvedStatuses);
     }
 
     /** RELATIONS */