-> ETL comment

Author: s-paquette

etl/etl.py

@@ -681,11 +681,16 @@ def update_display_values(attr, updates):
             logger.info("[STATUS] Added {} display values.".format(str(len(new_vals))))
 
 
-def load_tooltips(source_objs, attr_name, source_tooltip, obj_attr=None):
+def load_tooltips(source_objs, attr_name, source_tooltip, obj_id_col=None):
     try:
         attr = Attribute.objects.get(name=attr_name, active=True)
-        if not obj_attr:
-            obj_attr = attr_name
+        # In some cases, the data sourcing the tooltip does not have an ID column with a name which matches
+        # the attribute name (eg. in Collections, analysis results and collections both have a collection_id,
+        # but in Attributes, analysis_result_id and collection_id are distinct attributes).
+        # Used obi_id_col to specify the column in which the ID of the value to associate with the tooltip source in
+        # the case the attribute name is different from the source object's column ID
+        if not obj_id_col:
+            obj_id_col = attr_name
 
         tips = Attribute_Tooltips.objects.select_related('attribute').filter(attribute=attr)
 
@@ -696,7 +701,7 @@ def load_tooltips(source_objs, attr_name, source_tooltip, obj_attr=None):
                 extent_tooltips[tip.attribute.id] = []
             extent_tooltips[tip.attribute.id].append(tip.tooltip_id)
 
-        tooltips_by_val = {x[obj_attr]: {'tip': x[source_tooltip]} for x in source_objs.values() if x[obj_attr] != '' and x[obj_attr] is not None}
+        tooltips_by_val = {x[obj_id_col]: {'tip': x[source_tooltip]} for x in source_objs.values() if x[obj_id_col] != '' and x[obj_id_col] is not None}
 
         new_tooltips = []
         updated_tooltips = []