Refactor constrains for non-sensical smoking fields combinations

HumanCellAtlas · Sep 5, 2024 · 2ce72eb · 2ce72eb
1 parent 1735684
commit 2ce72eb
Showing 1 changed file with 35 additions and 30 deletions.
diff --git a/json_schema/module/biomaterial/medical_history.json b/json_schema/module/biomaterial/medical_history.json
@@ -80,37 +80,42 @@
             "example": "Patient treated with antibiotics for a urinary tract infection; Patient treated with chemotherapy (Epirubicin, cisplatin, capecitabine) to treat stomach cancer"
         }
     },
-    "if": {
-        "properties": { 
-            "smoking_status": {
-                 "const": "active" 
-            } 
-        }
-    },
-    "then": {
-        "properties": {
-            "years_since_smoking_cessation": { 
-                "maximum": 0 
-            }
-        }
-    },
-    "else": {
-        "if": {
-            "properties": { 
-                "smoking_status": { 
-                    "const": "never" 
-                } 
-            }
-        },
-        "then": {
-            "properties": {
-                "years_since_smoking_cessation": { 
-                    "type": "null" 
+    "allOf": 
+        [
+            {
+                "if": {
+                    "properties": { 
+                        "smoking_status": {
+                            "const": "active" 
+                        } 
+                    }
                 },
-                "smoking_pack_years": { 
-                    "maximum": 0 
+                "then": {
+                    "properties": {
+                        "years_since_smoking_cessation": { 
+                            "maximum": 0 
+                        }
+                    }
+                }
+            },
+            {
+                "if": {
+                    "properties": { 
+                        "smoking_status": { 
+                            "const": "never" 
+                        } 
+                    }
+                },
+                "then": {
+                    "properties": {
+                        "years_since_smoking_cessation": { 
+                            "type": "null" 
+                        },
+                        "smoking_pack_years": { 
+                            "maximum": 0 
+                        }
+                    }
                 }
             }
-        }
-    }
+        ]
 }