Merge pull request #93 from HumanCellAtlas/v4.4.0_minorRelease

Assay/project_bundle.json now objects. Bundle JSONs have core field.
HumanCellAtlas · Dec 8, 2017 · d238f40 · d238f40
2 parents 15dac04 + 8a7c7e7
commit d238f40
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/json_schema/assay_bundle.json b/json_schema/assay_bundle.json
@@ -3,7 +3,8 @@
         "assay_ingest": {
             "required": [
                 "hca_ingest", 
-                "content"
+                "content",
+                "core"
             ], 
             "type": "object", 
             "properties": {
@@ -23,14 +24,16 @@
                     "type": "object", 
                     "description": "core fields added by HCA ingest service", 
                     "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/ingest.json"
+                },
+                "core": {
+                    "description": "Type and schema for this object.",
+                    "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/core.json"
                 }
             }
         }
     }, 
     "$schema": "http://json-schema.org/draft-04/schema#", 
-    "type": "array", 
+    "type": "object",
     "description": "A schema for an assay bundle", 
-    "items": {
-        "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/assay_bundle.json#/definitions/assay_ingest"
-    }
+    "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/assay_bundle.json#/definitions/assay_ingest"
 }
diff --git a/json_schema/core.json b/json_schema/core.json
@@ -12,7 +12,10 @@
                 "protocol", 
                 "sample", 
                 "file", 
-                "analysis"
+                "analysis",
+                "assay_bundle",
+                "sample_bundle",
+                "project_bundle"
             ], 
             "description": "The name of the core metadata entity type."
         }, 

diff --git a/json_schema/project_bundle.json b/json_schema/project_bundle.json
@@ -3,7 +3,8 @@
         "project_ingest": {
             "required": [
                 "hca_ingest", 
-                "content"
+                "content",
+                "core"
             ], 
             "type": "object", 
             "properties": {
@@ -16,14 +17,16 @@
                     "type": "object", 
                     "description": "core fields added by HCA ingest service", 
                     "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/ingest.json"
+                },
+                "core": {
+                    "description": "Type and schema for this object.",
+                    "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/core.json"
                 }
             }
         }
     }, 
     "$schema": "http://json-schema.org/draft-04/schema#", 
-    "type": "array", 
-    "description": "A schema for a project bundle", 
-    "items": {
-        "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/project_bundle.json#/definitions/project_ingest"
-    }
+    "type": "object",
+    "description": "A schema for a project bundle",
+    "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/project_bundle.json#/definitions/project_ingest"
 }
diff --git a/json_schema/sample_bundle.json b/json_schema/sample_bundle.json
@@ -3,7 +3,8 @@
         "sample_ingest": {
             "required": [
                 "hca_ingest", 
-                "content"
+                "content",
+                "core"
             ], 
             "type": "object", 
             "properties": {
@@ -25,7 +26,12 @@
                     "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/ingest.json"
                 }, 
                 "derived_from": {
-                    "type": "string"
+                    "type": "string",
+                    "description": "The sample that this sample was derived from."
+                },
+                "core": {
+                    "description": "Type and schema for this object.",
+                    "$ref": "https://raw.githubusercontent.com/HumanCellAtlas/metadata-schema/4.3.0/json_schema/core.json"
                 }
             }
         }