Merge c150b5e into feeceac

HISTORY.rst

@@ -16,6 +16,7 @@ End-User Summary
   **This will require an import of the updated Clinvar ``20210728c`` data (#296).**
 - Warning in the case of truncated displayed results (#641).
 - Improving Clinvar record aggregation (#640).
+- Fixing ClinVar submission XML generation (#677).
 
 Full Change List
 ================
@@ -28,6 +29,7 @@ Full Change List
   **This will require an import of the updated Clinvar ``20210728c`` data (#296).**
 - Improving Clinvar record aggregation (#640).
 - Fixing Docker builds (#660).
+- Fixing ClinVar submission XML generation (#677).
 
 -----------------
 v1.2.2 (anthenea)

clinvar_export/clinvar_xml.py

@@ -223,7 +223,8 @@ def build_xref(term_id):
                                 self.em("ElementValueType", "Preferred", **{"val_type": "name"}),
                                 self.em("ElementValue", phenotype["term_name"]),
                             ),
-                            self.em("XRef", **{"db": "HP", "id": phenotype["term_id"],}),
+                            self.em("XRef", **{"db": "HP", "id": phenotype["term_id"],},),
+                            **{"ClinicalFeaturesAffectedStatus": "present",},
                         )
                         for phenotype in submission_individual.phenotypes
                     ],

clinvar_export/views_ajax.py

@@ -258,10 +258,20 @@ def get(self, request, *args, **kwargs):
                 "valid": True,
             }
         else:
-            result = {
-                "valid": False,
-                "details": "\n".join(e.message for e in schema.error_log),
-            }
+            ignored_message = (
+                "Element 'Trait', attribute 'ClinicalFeaturesAffectedStatus': The attribute "
+                "'ClinicalFeaturesAffectedStatus' is not allowed."
+            )
+            filtered_es = [e for e in schema.error_log if e.message != ignored_message]
+            if filtered_es:
+                result = {
+                    "valid": False,
+                    "details": "\n".join(e.message for e in filtered_es),
+                }
+            else:
+                result = {
+                    "valid": True,
+                }
         return JsonResponse(result)
 
     def _get_schema(self, root):