Merge pull request #340 from wri/release/hotfix-jj-2024-07-09

[RELEASE] Hotfix JJ 2024 07 09
wri · Jul 10, 2024 · 6dd7f4c · 6dd7f4c
2 parents df1dc23 + 89e852e
commit 6dd7f4c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 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',
@@ -195,6 +200,14 @@ public function toSearchableArray()
         ];
     }
 
+    /**
+     * Overrides the method from HasEntityStatusScopesAndTransitions
+     */
+    public function scopeIsApproved(Builder $query): Builder
+    {
+        return $query->whereIn('status', self::$approvedStatuses);
+    }
+
     /** RELATIONS */
     public function framework(): BelongsTo
     {