Merge pull request #574 from sennetconsortium/libpitt/568-lab_id

Update method exclude_properties_from_response to handle nested lists…
sennetconsortium · Jan 13, 2025 · ade0947 · ade0947
2 parents 3ce746d + 784560e
commit ade0947
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/schema/provenance_schema.yaml b/src/schema/provenance_schema.yaml
@@ -355,8 +355,17 @@ ENTITIES:
     before_entity_create_validator: validate_application_header_before_entity_create
     excluded_properties_from_public_response:
       - lab_dataset_id
+      - direct_ancestors:
+          - lab_tissue_sample_id
+          - source:
+              - lab_source_id
+          - origin_samples:
+              - lab_tissue_sample_id
       - sources:
           - lab_source_id
+      - metadata:
+          - lab_id
+          - slide_id
       - ingest_metadata:
           - metadata:
               - lab_id

diff --git a/src/schema/schema_manager.py b/src/schema/schema_manager.py
@@ -343,7 +343,11 @@ def delete_nested_field(data, nested_path):
                     if isinstance(value, list):
                         for nested_field in value:
                             if isinstance(nested_field, dict):
-                                delete_nested_field(data[key], nested_field)
+                                if isinstance(data[key], list):
+                                    for item in data[key]:
+                                        delete_nested_field(item, nested_field)
+                                else:
+                                    delete_nested_field(data[key], nested_field)
 
                             elif isinstance(data[key], list):
                                 for item in data[key]: