improved heredicare and clinvar upload status display

GC-HBOC · Aug 29, 2024 · 22fbb76 · 22fbb76
1 parent 0ab9520
commit 22fbb76
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/frontend_celery/webapp/variant/variant_functions.py b/src/frontend_celery/webapp/variant/variant_functions.py
@@ -328,8 +328,11 @@ def summarize_heredicare_status(heredicare_queue_entries, publish_queue, mrcc):
             if prefer_publish_queue_status and publish_queue.insert_tasks_status == "progress":
                 summary["status"] = "requesting"
             if prefer_publish_queue_status and publish_queue.insert_tasks_status == "error":
-                summary["status"] = "error"
-                summary["insert_tasks_message"] = publish_queue.insert_tasks_message
+                if mrcc.needs_heredicare_upload:
+                    summary["status"] = "error"
+                    summary["insert_tasks_message"] = publish_queue.insert_tasks_message
+                else:
+                    prefer_publish_queue_status = False
         elif publish_queue.insert_tasks_status in ["success"]:
             prefer_publish_queue_status = False
         if not prefer_publish_queue_status:
@@ -361,7 +364,7 @@ def summarize_heredicare_status(heredicare_queue_entries, publish_queue, mrcc):
 
 
 
-def summarize_clinvar_status(clinvar_queue_entries, publish_queue):
+def summarize_clinvar_status(clinvar_queue_entries, publish_queue, mrcc):
 
     summary = {"status": "unknown", "insert_tasks_message": ""}
 
@@ -377,8 +380,11 @@ def summarize_clinvar_status(clinvar_queue_entries, publish_queue):
             if prefer_publish_queue_status and publish_queue.insert_tasks_status == "progress":
                 summary["status"] = "requesting"
             if prefer_publish_queue_status and publish_queue.insert_tasks_status == "error":
-                summary["status"] = "error"
-                summary["insert_tasks_message"] = publish_queue.insert_tasks_message
+                if mrcc.needs_heredicare_upload:
+                    summary["status"] = "error"
+                    summary["insert_tasks_message"] = publish_queue.insert_tasks_message
+                else:
+                    prefer_publish_queue_status = False
         elif publish_queue.insert_tasks_status in ["success"]:
             prefer_publish_queue_status = False
         if not prefer_publish_queue_status: