Merge pull request #628 from wri/fix/TM-1581-tree-collections

[TM-1581] Improve BE mechanics for updating tree collections.
wri · Dec 19, 2024 · 082ab4e · 082ab4e
2 parents 48be67b + d75fd98
commit 082ab4e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/Models/Traits/UsesLinkedFields.php b/app/Models/Traits/UsesLinkedFields.php
@@ -293,8 +293,10 @@ private function syncRelation(string $property, string $inputType, $data, bool $
             if ($model != null) {
                 $model->update($entry);
             } else {
-                // protection against updating a deleted entry
-                unset($entry['uuid']);
+                // protection against clashing with a deleted entry
+                if (! empty($entry['uuid']) && $entity->$property()->onlyTrashed()->where('uuid', $entry['uuid'])->exists()) {
+                    unset($entry['uuid']);
+                }
                 $entity->$property()->create($entry);
             }
         }

diff --git a/app/Models/V2/TreeSpecies/TreeSpecies.php b/app/Models/V2/TreeSpecies/TreeSpecies.php
@@ -32,6 +32,7 @@ class TreeSpecies extends Model implements EntityRelationModel
     public $table = 'v2_tree_species';
 
     protected $fillable = [
+        'uuid',
         'name',
         'amount',
         'speciesable_type',