uc-cdis · mfshao · Jun 12, 2020 · May 20, 2020 · May 20, 2020 · May 21, 2020
diff --git a/doc/download.md b/doc/download.md
@@ -23,11 +23,13 @@ Example request body:
 		"gender", 
 		"race",
 		"file_count",
-		"subject_id"
+		"subject_id",
+    "visit.visit_label"
 	],
 	"sort": [
 		{ "file_count": "asc" },
-		{ "gender": "desc" }
+		{ "gender": "desc" },
+    { "visit.visit_label": "asc" }
 	]
 }
 ```
@@ -40,25 +42,51 @@ Example result:
     "subject_id": "78",
     "file_count": 1,
     "gender": "female",
-    "race": "hispanic"
+    "race": "hispanic",
+    "visit": [
+      {
+        "visit_label": "label_1"
+      },
+      {
+        "visit_label": "label_2"
+      }
+    ]
   },
   {
     "subject_id": "45",
     "file_count": 3,
     "gender": "female",
-    "race": "hispanic"
+    "race": "hispanic",
+    "visit": [
+      {
+        "visit_label": "label_3"
+      },
+      ...
+    ]
   },
   {
     "subject_id": "60",
     "file_count": 5,
     "gender": "female",
-    "race": "asian"
+    "race": "asian",
+    "visit": [
+      {
+        "visit_label": "label_X"
+      },
+      ...
+    ]
   },
   {
     "subject_id": "58",
     "file_count": 13,
     "gender": "male",
-    "race": "white"
+    "race": "white",
+    "visit": [
+      {
+        "visit_label": "label_Y"
+      },
+      ...
+    ]
   },
   ...
 ]

diff --git a/doc/queries.md b/doc/queries.md
@@ -30,6 +30,9 @@ Example query:
     },
     {
       "gender": asc
+    },
+    {
+      "experiments.experimental_description": asc
     }
   ], filter: $filter) {
     subject_id

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gen3/guppy",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Server that support GraphQL queries on data from elasticsearch",
   "main": "src/server/server.js",
   "directories": {

diff --git a/src/components/Utils/queries.js b/src/components/Utils/queries.js
@@ -129,6 +129,20 @@ const queryGuppyForSubAgg = (
     });
 };
 
+const rawDataQueryStrForEachField = (field) => {
+  const splittedFieldArray = field.split('.');
+  const splittedField = splittedFieldArray.shift();
+  if (splittedFieldArray.length === 0) {
+    return (`
+    ${splittedField}
+    `);
+  }
+  return (`
+  ${splittedField} {
+    ${rawDataQueryStrForEachField(splittedFieldArray.join('.'))}
+  }`);
+};
+
 const queryGuppyForRawDataAndTotalCounts = (
   path,
   type,
@@ -151,9 +165,10 @@ const queryGuppyForRawDataAndTotalCounts = (
   if (gqlFilter) {
     typeAggsLine = `${type} (filter: $filter, accessibility: ${accessibility}) {`;
   }
+  const processedFields = fields.map((field) => rawDataQueryStrForEachField(field));
   const query = `${queryLine}
     ${dataTypeLine} 
-      ${fields.join('\n')}
+      ${processedFields.join('\n')}
     }
     _aggregation {
       ${typeAggsLine}