[TM-1407] Filter approved sites and polygons in query dashboard

wri · Nov 11, 2024 · 2fc02a6 · 2fc02a6
1 parent 5522f6e
commit 2fc02a6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/Helpers/TerrafundDashboardQueryHelper.php b/app/Helpers/TerrafundDashboardQueryHelper.php
@@ -66,7 +66,7 @@ public static function buildQueryFromRequest(Request $request)
     public static function retrievePolygonUuidsForProject($projectUuId)
     {
         $project = Project::where('uuid', $projectUuId)->first();
-        $sitePolygons = $project->sitePolygons;
+        $sitePolygons = $project->sitePolygons->where('status', 'approved');
 
         $polygonsIds = $sitePolygons->pluck('poly_id');
 

diff --git a/app/Models/V2/Projects/Project.php b/app/Models/V2/Projects/Project.php
@@ -605,7 +605,7 @@ private function approvedSiteReportIds(): HasManyThrough
 
     public function getTotalSitePolygonsAttribute()
     {
-        return $this->sitePolygons()->count();
+        return $this->sitePolygons()->where('status', 'approved')->count();
     }
 
     public function getTotalHectaresRestoredSumAttribute(): float

diff --git a/app/Services/Dashboard/RunHectaresRestoredService.php b/app/Services/Dashboard/RunHectaresRestoredService.php
@@ -5,6 +5,7 @@
 use App\Helpers\TerrafundDashboardQueryHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use App\Models\V2\Sites\Site;
 
 class RunHectaresRestoredService
 {
@@ -49,7 +50,7 @@ public function getProjectsPolygons($projects)
         return DB::table('site_polygon as sp')
             ->join('v2_sites as s', 'sp.site_id', '=', 's.uuid')
             ->join('v2_projects as p', 's.project_id', '=', 'p.id')
-            ->where('s.status', 'approved')
+            ->whereIn('s.status', Site::$approvedStatuses)
             ->where('sp.status', 'approved')
             ->whereIn('p.uuid', $projects)
             ->select('sp.id')