api: fix min/max columns update in post_save/delete

materialsproject · Oct 20, 2021 · c4fa95f · c4fa95f
1 parent f4e6848
commit c4fa95f
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/mpcontribs-api/mpcontribs/api/contributions/document.py b/mpcontribs-api/mpcontribs/api/contributions/document.py
@@ -326,17 +326,20 @@ def update_columns(path, key, value):
             return True
 
         # run update_columns over document data
+        if not document.data:
+            document.reload("data")
+
         remap(document.data, visit=update_columns, enter=enter)
 
         # get and set min/max for all paths
         min_max = get_min_max(sender, min_max_paths, project.name)
 
         for clean_path in min_max_paths:
             for k in ["min", "max"]:
-                path = clean_path.replace("__", delimiter)
+                path = clean_path.replace(delimiter, "__")
                 m = min_max.get(f"{path}__{k}")
                 if m is not None:
-                    setattr(columns[path], k, m)
+                    setattr(columns[clean_path], k, m)
 
         # add/remove columns for other components
         for path in COMPONENTS.keys():
@@ -419,13 +422,13 @@ def post_delete(cls, sender, document, **kwargs):
         min_max = get_min_max(sender, min_max_paths, project.name)
 
         for clean_path in min_max_paths:
-            path = clean_path.replace("__", delimiter)
-            column = columns[path]
+            path = clean_path.replace(delimiter, "__")
+            column = columns[clean_path]
 
             for k in ["min", "max"]:
                 if min_max.get(f"{path}__{k}") is None:
                     # just deleted last contribution with this column
-                    columns.pop(path)
+                    columns.pop(clean_path)
                     break
 
         cls.update_project(sender, project, columns_copy, columns.values())