Merge pull request #340 from flaxandteal/fix/remap-and-merge

Fix/remap and merge
flaxandteal · Jul 17, 2024 · e4eceeb · e4eceeb
2 parents d90318a + 6b81ac5
commit e4eceeb
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/coral/utils/merge_resources.py b/coral/utils/merge_resources.py
@@ -125,6 +125,10 @@ def merge_default(self, base_node_value, merge_node_value):
 
     def merge_resource_instance_list(self, base_node_value, merge_node_value):
         resource_map = {}
+        if not base_node_value:
+            base_node_value = []
+        if not merge_node_value:
+            merge_node_value = []
         for resource in base_node_value:
             if resource["resourceId"] not in resource_map:
                 resource_map[resource["resourceId"]] = resource

diff --git a/coral/utils/remap_resources.py b/coral/utils/remap_resources.py
@@ -252,20 +252,35 @@ def remap_resources(self, user):
                     data[destination_node_id] = data[data_node_id]
                     del data[data_node_id]
 
-                new_tile = Tile(
-                    tileid=uuid.uuid4(),
+                # In the unlikely event that a tile exists on the brand new destination
+                # resource (had a case where a function was creating a tile). This will find
+                # it and update it rather than create it.
+                # 
+                # FIXME: this is only needed for cardinality 1 tiles. Many tiles should just create a new tile
+                #
+                destination_tile = Tile.objects.filter(
                     resourceinstance=self.destination_resource,
-                    parenttile=parent_tile,
-                    data=data,
                     nodegroup=destination_nodegroup,
-                )
-                new_tile.save()
+                ).first()
+
+                if destination_tile:
+                    destination_tile.data = data
+                else:
+                    destination_tile = Tile(
+                        tileid=uuid.uuid4(),
+                        resourceinstance=self.destination_resource,
+                        parenttile=parent_tile,
+                        data=data,
+                        nodegroup=destination_nodegroup,
+                    )
+
+                destination_tile.save()
 
                 # If this is true, it means the parent tile had data and needed
                 # that data to be remapped. We then add into the created parent
                 # tiles dictionary for child tiles to look up
                 if tile_nodegroup_id in self.parent_nodegroup_ids:
-                    self.created_parent_tiles[str(tile.tileid)] = new_tile
+                    self.created_parent_tiles[str(tile.tileid)] = destination_tile
 
             return {
                 "remapped": True,