Merge branch 'main' of https://github.com/hubmapconsortium/entity-api …

…into dev-integrate
hubmapconsortium · Dec 12, 2024 · 28ab1d5 · 28ab1d5
2 parents 024ace8 + cb0ed8f
commit 28ab1d5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/entity-api-spec.yaml b/entity-api-spec.yaml
@@ -773,6 +773,12 @@ components:
         creation_action:
           type: string
           description: 'The associated action that represents the creation of that dataset'
+        intended_dataset_type:
+          type: string
+          description: 'The dataset type of the intended datasets that will be uploaded as part of the Upload.'
+        intended_organ:
+          type: string
+          description: 'The organ code representing the organ type that the data contained in the upload will be registered/associated with.'
     Upload:
       type: object
       properties:

diff --git a/src/schema/provenance_schema.yaml b/src/schema/provenance_schema.yaml
@@ -1244,13 +1244,15 @@ ENTITIES:
           - validate_in_admin_group
       intended_dataset_type:
         type: string
+        required_on_create: true
         indexed: true
         description: The dataset type of the intended datasets that will be uploaded as part of the Upload.
         before_property_create_validators:
           - validate_intended_dataset_type
         before_property_update_validators:
           - validate_intended_dataset_type
       intended_organ: 
+        required_on_create: true
         type: string
         indexed: true
         description: The organ code representing the organ type that the data contained in the upload will be registered/associated with.