Merge branch 'staging' into feat/TM-criteria-by-multiple

wri · Dec 31, 2024 · 2c2c235 · 2c2c235
2 parents 27c56ac + 9556ead
commit 2c2c235
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 14 deletions.
diff --git a/app/Jobs/Dashboard/RunActiveCountriesTableJob.php b/app/Jobs/Dashboard/RunActiveCountriesTableJob.php
@@ -75,7 +75,7 @@ public function handle(RunActiveCountriesTableService $runActiveCountriesTableSe
 
             Redis::set('dashboard:active-countries-table|' . $this->cacheParameter, json_encode([
                 'data' => $response,
-            ]));
+            ]), 'EX', config('cache.ttl.dashboard'));
 
             $delayedJob->update([
                 'status' => DelayedJob::STATUS_SUCCEEDED,

diff --git a/app/Jobs/Dashboard/RunActiveProjectsJob.php b/app/Jobs/Dashboard/RunActiveProjectsJob.php
@@ -66,7 +66,7 @@ public function handle(RunActiveProjectsService $runActiveProjectsService)
                 ]
             );
             $response = $runActiveProjectsService->runActiveProjectsJob($request);
-            Redis::set('dashboard:active-projects|' . $this->cacheParameter, json_encode($response));
+            Redis::set('dashboard:active-projects|' . $this->cacheParameter, json_encode($response), 'EX', config('cache.ttl.dashboard'));
 
 
             $delayedJob->update([

diff --git a/app/Jobs/Dashboard/RunHectaresRestoredJob.php b/app/Jobs/Dashboard/RunHectaresRestoredJob.php
@@ -66,7 +66,7 @@ public function handle(RunHectaresRestoredService $runHectaresRestoredService)
                 ]
             );
             $response = $runHectaresRestoredService->runHectaresRestoredJob($request);
-            Redis::set('dashboard:indicator/hectares-restoration' . $this->cacheParameter, json_encode($response));
+            Redis::set('dashboard:indicator/hectares-restoration' . $this->cacheParameter, json_encode($response), 'EX', config('cache.ttl.dashboard'));
 
 
             $delayedJob->update([

diff --git a/app/Jobs/Dashboard/RunJobsCreatedJob.php b/app/Jobs/Dashboard/RunJobsCreatedJob.php
@@ -72,7 +72,7 @@ public function handle(JobsCreatedService $jobsCreatedService)
             ]);
 
             $response = $jobsCreatedService->calculateJobsCreated($request);
-            Redis::set('dashboard:jobs-created|' . $this->cacheParameter, json_encode($response));
+            Redis::set('dashboard:jobs-created|' . $this->cacheParameter, json_encode($response), 'EX', config('cache.ttl.dashboard'));
 
             $delayedJob->update([
                 'status' => DelayedJob::STATUS_SUCCEEDED,

diff --git a/app/Jobs/Dashboard/RunTopTreesJob.php b/app/Jobs/Dashboard/RunTopTreesJob.php
@@ -66,7 +66,7 @@ public function handle(RunTopTreesService $runTopTreesService)
                 ]
             );
             $response = $runTopTreesService->runTopTreesJob($request);
-            Redis::set('dashboard:top-trees-planted|' . $this->cacheParameter, json_encode($response));
+            Redis::set('dashboard:top-trees-planted|' . $this->cacheParameter, json_encode($response), 'EX', config('cache.ttl.dashboard'));
 
 
             $delayedJob->update([

diff --git a/app/Jobs/Dashboard/RunTotalHeaderJob.php b/app/Jobs/Dashboard/RunTotalHeaderJob.php
@@ -66,7 +66,7 @@ public function handle(RunTotalHeaderService $runTotalHeaderService)
                 ]
             );
             $response = $runTotalHeaderService->runTotalHeaderJob($request);
-            Redis::set('dashboard:total-section-header|' . $this->cacheParameter, json_encode($response));
+            Redis::set('dashboard:total-section-header|' . $this->cacheParameter, json_encode($response), 'EX', config('cache.ttl.dashboard'));
 
             $delayedJob->update([
                 'status' => DelayedJob::STATUS_SUCCEEDED,

diff --git a/app/Jobs/Dashboard/RunTreeRestorationGoalJob.php b/app/Jobs/Dashboard/RunTreeRestorationGoalJob.php
@@ -72,7 +72,7 @@ public function handle(TreeRestorationGoalService $treeRestorationGoalService)
             ]);
 
             $response = $treeRestorationGoalService->calculateTreeRestorationGoal($request);
-            Redis::set('dashboard:tree-restoration-goal|' . $this->cacheParameter, json_encode($response));
+            Redis::set('dashboard:tree-restoration-goal|' . $this->cacheParameter, json_encode($response), 'EX', config('cache.ttl.dashboard'));
 
             $delayedJob->update([
                 'status' => DelayedJob::STATUS_SUCCEEDED,

diff --git a/app/Jobs/Dashboard/RunVolunteersAverageJob.php b/app/Jobs/Dashboard/RunVolunteersAverageJob.php
@@ -66,7 +66,7 @@ public function handle(RunVolunteersAverageService $runVolunteersAverageService)
                 ]
             );
             $response = $runVolunteersAverageService->runVolunteersAverageJob($request);
-            Redis::set('dashboard:volunteers-survival-rate|' . $this->cacheParameter, json_encode($response));
+            Redis::set('dashboard:volunteers-survival-rate|' . $this->cacheParameter, json_encode($response), 'EX', config('cache.ttl.dashboard'));
 
 
             $delayedJob->update([

diff --git a/app/Models/V2/Projects/Project.php b/app/Models/V2/Projects/Project.php
@@ -305,6 +305,22 @@ public function sitePolygons(): HasManyThrough
         )->active();
     }
 
+    public function approvedSitePolygons(): HasManyThrough
+    {
+        return $this->hasManyThrough(
+            SitePolygon::class,
+            Site::class,
+            'project_id',
+            'site_id',
+            'id',
+            'uuid'
+        )
+        ->whereHas('site', function ($query) {
+            $query->whereIn('status', Site::$approvedStatuses);
+        })
+        ->active();
+    }
+
     public function treeSpecies()
     {
         return $this->morphMany(TreeSpecies::class, 'speciesable');
@@ -615,6 +631,6 @@ public function getTotalSitePolygonsAttribute()
 
     public function getTotalHectaresRestoredSumAttribute(): float
     {
-        return round($this->sitePolygons->where('status', 'approved')->sum('calc_area'));
+        return $this->approvedSitePolygons->where('status', 'approved')->sum('calc_area');
     }
 }
diff --git a/app/Validators/Extensions/Polygons/NotOverlapping.php b/app/Validators/Extensions/Polygons/NotOverlapping.php
@@ -52,14 +52,15 @@ public static function getIntersectionData(string $polygonUuid): array
 
         $mainPolygonArea = PolygonGeometry::where('uuid', $polygonUuid)
             ->value(DB::raw('ST_Area(geom)'));
-
         $extra_info = $intersects
-            ->filter(fn ($intersect) => $intersect->intersects)
-            ->map(function ($intersect) use ($mainPolygonArea) {
+            ->filter(function ($intersect) {
+                return $intersect->intersects && $intersect->intersection_area > 1e-10;
+            })
+            ->map(function ($intersect) use ($mainPolygonArea, $sitePolygon) {
                 $minArea = min($mainPolygonArea, $intersect->area);
                 $percentage = $minArea > 0
-                    ? round(($intersect->intersection_area / $minArea) * 100, 2)
-                    : 100;
+                  ? round(($intersect->intersection_area / $minArea) * 100, 2)
+                  : 100;
 
                 return [
                     'poly_uuid' => $intersect->uuid,

diff --git a/config/cache.php b/config/cache.php
@@ -107,4 +107,18 @@
 
     'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Cache Timeout Values
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define the cache timeout values for different sections
+    | of the application. These values can be used in any controllers
+    | to set the time-to-live (TTL) for cached items.
+    |
+    */
+
+    'ttl' => [
+        'dashboard' => 86400, // 24 hours
+    ]
 ];