uc-cdis · paulineribeyre · Mar 13, 2023 · Mar 10, 2023 · Mar 10, 2023 · Mar 10, 2023
diff --git a/sheepdog/utils/transforms/graph_to_doc.py b/sheepdog/utils/transforms/graph_to_doc.py
@@ -159,15 +159,13 @@ def list_to_comma_string(val, file_format):
     Example:
         ['1','2','3'] -> '1,2,3'
     """
-
-    if val is None:
+    if file_format != "json":
         # If a field is empty we must replace it with an empty string for tsv/csv exports and leave it as None for json exports
-        if file_format == "json":
-            return val
-        return ""
+        if val is None:
+            return ""
 
-    if isinstance(val, list):
-        val = ",".join((str(x) for x in val))
+        if isinstance(val, list):
+            val = ",".join((str(x) for x in val))
     return val
 
 

diff --git a/tests/integration/datadict/schemas/dictionary.json b/tests/integration/datadict/schemas/dictionary.json
@@ -6177,6 +6177,7 @@
         "id": "case",
         "$schema": "http://json-schema.org/draft-04/schema#",
         "properties": {
+            "consent_codes": {"type": "array", "description": "", "items": {"type": "string"}},
             "disease_type": {
                 "type": "string",
                 "description": "Name of the disease for the case."

diff --git a/tests/integration/datadict/submission/data/case.json b/tests/integration/datadict/submission/data/case.json
@@ -3,5 +3,6 @@
     "submitter_id": "BLGSP-71-06-00019",
     "experiments": {
     	"submitter_id": "BLGSP-71-experiment-01"
-    }
-}
+    },
+    "consent_codes": ["code1", "code2"]
+}
diff --git a/tests/integration/datadict/submission/test_endpoints.py b/tests/integration/datadict/submission/test_endpoints.py
@@ -909,6 +909,20 @@ def test_export_all_node_types_and_resubmit_tsv_with_empty_field(
     print(json.dumps(json.loads(resp.data), indent=4, sort_keys=True))
     assert resp.status_code == 200, resp.data
 
+def test_export_node_with_array_json(
+    client, pg_driver, cgci_blgsp, require_index_exists_off, submitter
+):
+    post_example_entities_together(client, submitter, extended_data_fnames)
+    with pg_driver.session_scope() as s:
+        case = pg_driver.nodes(md.Case).first()
+        consent_codes = case.props.get("consent_codes", [])
+    path = "/v0/submission/CGCI/BLGSP/export/?node_label=case&format=json"
+    r = client.get(path, headers=submitter)
+    assert r.status_code == 200, r.data
+    assert r.headers["Content-Disposition"].endswith("json")
+    js_data = json.loads(r.data)
+    assert isinstance(js_data["data"][0]["consent_codes"], list)
+    assert len(js_data["data"][0]["consent_codes"]) == len(consent_codes)
 
 def test_export_all_node_types_json(
     client, pg_driver, cgci_blgsp, submitter, require_index_exists_off

diff --git a/tests/integration/datadictwithobjid/schemas/dictionary.json b/tests/integration/datadictwithobjid/schemas/dictionary.json
diff --git a/tests/integration/datadictwithobjid/submission/data/case.json b/tests/integration/datadictwithobjid/submission/data/case.json
@@ -3,5 +3,6 @@
     "submitter_id": "BLGSP-71-06-00019",
     "experiments": {
     	"submitter_id": "BLGSP-71-experiment-01"
-    }
+    },
+    "consent_codes": ["code1", "code2"]
 }
diff --git a/tests/integration/datadictwithobjid/submission/test_endpoints.py b/tests/integration/datadictwithobjid/submission/test_endpoints.py
@@ -660,6 +660,22 @@ def test_export_all_node_types(
     do_test_export(client, pg_driver, submitter, "experimental_metadata", "tsv")
 
 
+def test_export_node_with_array_json(
+    client, pg_driver, cgci_blgsp, require_index_exists_off, submitter
+):
+    post_example_entities_together(client, submitter, extended_data_fnames)
+    with pg_driver.session_scope() as s:
+        case = pg_driver.nodes(md.Case).first()
+        consent_codes = case.props.get("consent_codes", [])
+    path = "/v0/submission/CGCI/BLGSP/export/?node_label=case&format=json"
+    r = client.get(path, headers=submitter)
+    assert r.status_code == 200, r.data
+    assert r.headers["Content-Disposition"].endswith("json")
+    js_data = json.loads(r.data)
+    assert isinstance(js_data["data"][0]["consent_codes"], list)
+    assert len(js_data["data"][0]["consent_codes"]) == len(consent_codes)
+
+
 def test_export_all_node_types_json(
     client, pg_driver, cgci_blgsp, require_index_exists_off, submitter
 ):