[TM-1503] delete and create site and historic

wri · Nov 25, 2024 · fb41632 · fb41632
1 parent 9067f0c
commit fb41632
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 22 deletions.
diff --git a/app/Helpers/GeometryHelper.php b/app/Helpers/GeometryHelper.php
@@ -125,19 +125,16 @@ public static function getPolygonsBbox($polygonsIds)
 
     public static function getCriteriaDataForPolygonGeometry($polygonGeometry)
     {
-        return CriteriaSite::whereIn(
-            'id',
-            $polygonGeometry
-                ->criteriaSite()
-                ->groupBy('criteria_id')
-                ->selectRaw('max(id) as latest_id')
-        )->get([
-            'criteria_id',
-            'valid',
-            'created_at as latest_created_at',
-            'extra_info',
-        ]);
+        return $polygonGeometry
+            ->criteriaSite()
+            ->get([
+                'criteria_id',
+                'valid',
+                'created_at as latest_created_at',
+                'extra_info',
+            ]);
     }
+
 
     public static function groupFeaturesBySiteId($geojson)
     {

diff --git a/app/Models/V2/Sites/CriteriaSite.php b/app/Models/V2/Sites/CriteriaSite.php
@@ -9,7 +9,6 @@
 class CriteriaSite extends Model
 {
     use HasUuid;
-    use SoftDeletes;
 
     /**
      * The table associated with the model.
@@ -42,6 +41,6 @@ class CriteriaSite extends Model
 
     public function scopeForCriteria($query, $criteriaId)
     {
-        return $query->where('criteria_id', $criteriaId)->latest();
+        return $query->where('criteria_id', $criteriaId);
     }
 }
diff --git a/app/Models/V2/Sites/CriteriaSiteHistoric.php b/app/Models/V2/Sites/CriteriaSiteHistoric.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Models\V2\Sites;
+
+use App\Models\Traits\HasUuid;
+use Illuminate\Database\Eloquent\Model;
+
+class CriteriaSiteHistoric extends Model
+{
+    use HasUuid;
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'criteria_site_historic';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'criteria_id',
+        'polygon_id',
+        'valid',
+        'extra_info'
+    ];
+
+    /**
+     * The attributes that should be mutated to dates.
+     *
+     * @var array
+     */
+    protected $dates = [
+        'deleted_at',
+        'date_created',
+    ];
+
+    public function scopeForCriteria($query, $criteriaId)
+    {
+        return $query->where('criteria_id', $criteriaId)->latest();
+    }
+}
diff --git a/app/Services/PolygonService.php b/app/Services/PolygonService.php
@@ -11,6 +11,7 @@
 use App\Models\V2\Projects\Project;
 use App\Models\V2\Projects\ProjectPolygon;
 use App\Models\V2\Sites\CriteriaSite;
+use App\Models\V2\Sites\CriteriaSiteHistoric;
 use App\Models\V2\Sites\Site;
 use App\Models\V2\Sites\SitePolygon;
 use App\Models\V2\User;
@@ -222,20 +223,37 @@ private function insertPolygon($uuid, $sitePolygonProperties, $featureProperties
 
     public function createCriteriaSite($polygonId, $criteriaId, $valid, $extraInfo = null): bool|string
     {
-        $criteriaSite = new CriteriaSite();
-        $criteriaSite->polygon_id = $polygonId;
-        $criteriaSite->criteria_id = $criteriaId;
-        $criteriaSite->valid = $valid;
-        $criteriaSite->extra_info = $extraInfo ? json_encode($extraInfo) : null;
-
         try {
+            $existingCriteriaSite = CriteriaSite::where('polygon_id', $polygonId)
+                                                ->where('criteria_id', $criteriaId)
+                                                ->first();
+
+            if ($existingCriteriaSite) {
+                CriteriaSiteHistoric::create([
+                    'polygon_id' => $existingCriteriaSite->polygon_id,
+                    'criteria_id' => $existingCriteriaSite->criteria_id,
+                    'valid' => $existingCriteriaSite->valid,
+                    'extra_info' => $existingCriteriaSite->extra_info,
+                    'created_at' => $existingCriteriaSite->created_at,
+                    'updated_at' => $existingCriteriaSite->updated_at,
+                ]);
+
+                $existingCriteriaSite->delete();
+            }
+
+            $criteriaSite = new CriteriaSite();
+            $criteriaSite->polygon_id = $polygonId;
+            $criteriaSite->criteria_id = $criteriaId;
+            $criteriaSite->valid = $valid;
+            $criteriaSite->extra_info = $extraInfo ? json_encode($extraInfo) : null;
             $criteriaSite->save();
-
+    
             return true;
         } catch (\Exception $e) {
             return $e->getMessage();
         }
     }
+
 
     /**
      * Note: At this time, this method assumes that the geometry is a single polygon.

diff --git a/database/migrations/2024_11_22_161611_create_criteria_site_historic_table.php b/database/migrations/2024_11_22_161611_create_criteria_site_historic_table.php
@@ -20,7 +20,6 @@ public function up()
             $table->string('polygon_id')->nullable();
             $table->integer('valid')->nullable();
             $table->json('extra_info')->nullable();
-            $table->date('date_created')->nullable();
             $table->timestamps();
         });
     }