Merge pull request #376 from scitran/race-ethnicity

Add race and ethnicity to subjects

api/schemas/input/subject.json

@@ -7,11 +7,15 @@
     "lastname":         { "type": "string", "maxLength": 64 },
     "firstname_hash":   { "type": ["string", "null"] },
     "lastname_hash":    { "type": ["string", "null"] },
+
+    "age":              { "type": ["number", "null"] },
     "sex":              { "enum": ["male", "female", "other", "unknown", null] },
+    "race":             { "enum": ["American Indian or Alaska Native", "Asian", "Native Hawaiian or Other Pacific Islander", "Black or African American", "White", "More Than One Race", "Unknown or Not Reported", null] },
+    "ethnicity":        { "enum": ["Not Hispanic or Latino", "Hispanic or Latino", "Unknown or Not Reported", null] },
+
     "code":             { "type": "string", "maxLength": 64 },
     "tags":             { "type": "array", "items": {"type": "string"} },
-    "metadata":         { "type": "object" },
-    "age":              { "type": ["number", "null"] }
+    "metadata":         { "type": "object" }
   },
   "additionalProperties": false
 }

api/schemas/mongo/subject.json

@@ -7,11 +7,15 @@
     "lastname":         { "type": "string" },
     "firstname_hash":   { "type": "string" },
     "lastname_hash":    { "type": "string" },
+
+    "age":              { "type": ["number", "null"] },
     "sex":              { "enum": ["male", "female", "other", "unknown", null] },
+    "race":             { "enum": ["American Indian or Alaska Native", "Asian", "Native Hawaiian or Other Pacific Islander", "Black or African American", "White", "More Than One Race", "Unknown or Not Reported", null] },
+    "ethnicity":        { "enum": ["Not Hispanic or Latino", "Hispanic or Latino", "Unknown or Not Reported", null] },
+
     "code":             { "type": "string" },
     "tags":             { "type": "array", "items": {"type": "string"} },
-    "metadata":         { "type": "object" },
-    "age":              { "type": ["number", "null"] }
+    "metadata":         { "type": "object" }
   },
   "additionalProperties": false
 }