Merge pull request #1334 from Sage-Bionetworks/SYNPY-1787

[SYNPY-1787] Changed conditionals so that the watched property is required

Author: andrewelamb

synapseclient/extensions/curator/schema_generation.py

@@ -5198,7 +5198,10 @@ def _convert_conditional_properties_to_all_of(
                             "Cancer"
                         ]
                     }
-                }
+                },
+                "required":[
+                    "Diagnosis"
+                ]
             },
             "then":{
                 "properties":{
@@ -5217,7 +5220,10 @@ def _convert_conditional_properties_to_all_of(
             enum_value,
         ), dependent_properties in conditional_dependencies.items():
             conditional_dep = {
-                "if": {"properties": {watched_property: {"enum": [enum_value]}}},
+                "if": {
+                    "properties": {watched_property: {"enum": [enum_value]}},
+                    "required": [watched_property],
+                },
                 "then": {
                     "properties": {
                         prop: {"not": {"type": "null"}} for prop in dependent_properties

tests/unit/synapseclient/extensions/schema_files/expected_jsonschemas/expected.BulkRNA-seqAssay.display_names_schema.json

@@ -10,7 +10,10 @@
               "BAM"
             ]
           }
-        }
+        },
+        "required":[
+          "File Format"
+        ]
       },
       "then": {
         "properties": {
@@ -33,7 +36,10 @@
               "CRAM"
             ]
           }
-        }
+        },
+        "required":[
+          "File Format"
+        ]
       },
       "then": {
         "properties": {
@@ -62,7 +68,10 @@
               "CSV/TSV"
             ]
           }
-        }
+        },
+        "required":[
+          "File Format"
+        ]
       },
       "then": {
         "properties": {

tests/unit/synapseclient/extensions/schema_files/expected_jsonschemas/expected.BulkRNA-seqAssay.schema.json

@@ -10,7 +10,10 @@
               "BAM"
             ]
           }
-        }
+        },
+        "required":[
+          "FileFormat"
+        ]
       },
       "then": {
         "properties": {
@@ -33,7 +36,10 @@
               "CRAM"
             ]
           }
-        }
+        },
+        "required":[
+          "FileFormat"
+        ]
       },
       "then": {
         "properties": {
@@ -62,7 +68,10 @@
               "CSV/TSV"
             ]
           }
-        }
+        },
+        "required":[
+          "FileFormat"
+        ]
       },
       "then": {
         "properties": {

tests/unit/synapseclient/extensions/schema_files/expected_jsonschemas/expected.Patient.display_names_schema.json

@@ -10,7 +10,10 @@
               "Cancer"
             ]
           }
-        }
+        },
+        "required":[
+          "Diagnosis"
+        ]
       },
       "then": {
         "properties": {

tests/unit/synapseclient/extensions/schema_files/expected_jsonschemas/expected.Patient.schema.json

@@ -10,7 +10,10 @@
               "Cancer"
             ]
           }
-        }
+        },
+        "required":[
+          "Diagnosis"
+        ]
       },
       "then": {
         "properties": {

tests/unit/synapseclient/extensions/unit_test_create_json_schema.py

@@ -327,7 +327,10 @@ def test_convert_conditional_properties_to_all_of(self) -> None:
 
         # THEN the result should match the expected structure
         expected_cancer = {
-            "if": {"properties": {"Diagnosis": {"enum": ["Cancer"]}}},
+            "if": {
+                "properties": {"Diagnosis": {"enum": ["Cancer"]}},
+                "required": ["Diagnosis"],
+            },
             "then": {
                 "properties": {
                     "CancerType": {"not": {"type": "null"}},
@@ -338,7 +341,10 @@ def test_convert_conditional_properties_to_all_of(self) -> None:
         }
 
         expected_healthy = {
-            "if": {"properties": {"Diagnosis": {"enum": ["Healthy"]}}},
+            "if": {
+                "properties": {"Diagnosis": {"enum": ["Healthy"]}},
+                "required": ["Diagnosis"],
+            },
             "then": {
                 "properties": {"CheckupDate": {"not": {"type": "null"}}},
                 "required": ["CheckupDate"],