Merge pull request '# Boost geometry conflict message fetch' (#523) from 503_Improve_performance_on_geometry_conflict_message into master

Reviewed-on: #523

konova/models/geometry.py

@@ -103,9 +103,12 @@ class Geometry(BaseResource):
         resolved_conflicts = all_conflicted_by_conflicts.exclude(id__in=still_conflicting_conflicts)
         resolved_conflicts.delete()
 
-    def get_data_objects(self):
+    def get_data_objects(self, limit_to_attrs: list = None):
         """ Getter for all objects which are related to this geometry
 
+        Using the limit_to_attrs we can limit the amount of returned data directly onto the data object attributes
+        we want to have. Reduces memory consumption and runtime.
+
         Returns:
             objs (list): The list of objects
         """
@@ -121,15 +124,20 @@ class Geometry(BaseResource):
             set_objs = _set.filter(
                 deleted=None
             )
-            objs += set_objs
+            if limit_to_attrs:
+                objs += set_objs.values_list(*limit_to_attrs, flat=True)
+            else:
+                objs += set_objs
 
         # ... but we need a special treatment for compensations, since they can be deleted directly OR inherit their
         # de-facto-deleted status from their deleted parent intervention
         comp_objs = self.compensation_set.filter(
             Q(deleted=None) & Q(intervention__deleted=None)
         )
-        objs += comp_objs
+        if limit_to_attrs:
-
+            objs += comp_objs.values_list(*limit_to_attrs, flat=True)
+        else:
+            objs += comp_objs
         return objs
 
     def get_data_object(self):

konova/models/object.py

@@ -677,19 +677,23 @@ class GeoReferencedMixin(models.Model):
             return request
 
         instance_objs = []
+        needed_data_object_attrs = [
+            "identifier"
+        ]
         conflicts = self.geometry.conflicts_geometries.iterator()
 
         for conflict in conflicts:
-            instance_objs += conflict.affected_geometry.get_data_objects()
+            # Only check the affected geometry of this conflict, since we know the conflicting geometry is self.geometry
+            instance_objs += conflict.affected_geometry.get_data_objects(needed_data_object_attrs)
 
         conflicts = self.geometry.conflicted_by_geometries.iterator()
         for conflict in conflicts:
-            instance_objs += conflict.conflicting_geometry.get_data_objects()
+            # Only check the conflicting geometry of this conflict, since we know the affected geometry is self.geometry
+            instance_objs += conflict.conflicting_geometry.get_data_objects(needed_data_object_attrs)
 
         add_message = len(instance_objs) > 0
         if add_message:
-            instance_identifiers = [x.identifier for x in instance_objs]
+            instance_identifiers = ", ".join(instance_objs)
-            instance_identifiers = ", ".join(instance_identifiers)
             message_str = GEOMETRY_CONFLICT_WITH_TEMPLATE.format(instance_identifiers)
             messages.info(request, message_str)
         return request