feat(required): required links for data-generator

.travis.yml

@@ -4,6 +4,7 @@ python:
 before_script:
 - yes | python setup.py install
 - git clone https://github.com/uc-cdis/dictionaryutils; cd dictionaryutils
+- git checkout c0ecf93c024ccc311ed8f02ed2df3b55fceae709
 script:
 - ./run_tests.sh
 deploy:

gdcdictionary/schemas/imaging_file.yaml

@@ -21,21 +21,18 @@ systemProperties:
   - updated_datetime
 
 links:
-  - exclusive: false
+  - name: core_metadata_collections
+    backref: imaging_files
+    label: data_from
+    target_type: core_metadata_collection
+    multiplicity: many_to_one
+    required: false
+  - name: imaging_exams
+    backref: imaging_files
+    label: data_for
+    target_type: imaging_exam
+    multiplicity: many_to_one
     required: true
-    subgroup:
-      - name: core_metadata_collections
-        backref: imaging_files
-        label: data_from
-        target_type: core_metadata_collection
-        multiplicity: many_to_one
-        required: false
-      - name: imaging_exams
-        backref: imaging_files
-        label: data_for
-        target_type: imaging_exam
-        multiplicity: many_to_one
-        required: false
 
 
 uniqueKeys:
@@ -50,6 +47,7 @@ required:
   - data_format
   - md5sum
   - data_category
+  - imaging_exams
 
 properties:
   $ref: "_definitions.yaml#/data_file_properties"

gdcdictionary/schemas/imaging_study.yaml

@@ -32,7 +32,7 @@ links:
     label: performed_at
     target_type: follow_up
     multiplicity: many_to_one
-    required: false
+    required: true
 
 
 uniqueKeys:
@@ -43,6 +43,7 @@ required:
   - submitter_id
   - type
   - subjects
+  - follow_ups
 
 properties:
   $ref: "_definitions.yaml#/ubiquitous_properties"

gdcdictionary/schemas/submitted_unaligned_reads.yaml

@@ -22,21 +22,18 @@ systemProperties:
   - error_type
 
 links:
-  - exclusive: false
+  - name: core_metadata_collections
+    backref: submitted_unaligned_reads_files
+    label: data_from
+    target_type: core_metadata_collection
+    multiplicity: many_to_one
+    required: false
+  - name: read_groups
+    backref: submitted_unaligned_reads_files # pretty ugly
+    label: data_from
+    target_type: read_group
+    multiplicity: many_to_one
     required: true
-    subgroup:
-      - name: core_metadata_collections
-        backref: submitted_unaligned_reads_files
-        label: data_from
-        target_type: core_metadata_collection
-        multiplicity: many_to_one
-        required: false
-      - name: read_groups
-        backref: submitted_unaligned_reads_files # pretty ugly
-        label: data_from
-        target_type: read_group
-        multiplicity: many_to_one
-        required: false
 
 required:
   - type
@@ -48,6 +45,7 @@ required:
   - data_type
   - data_format
   - experimental_strategy
+  - read_groups
 
 uniqueKeys:
   - [ id ]

gdcdictionary/schemas/summary_drug_use.yaml

@@ -21,21 +21,18 @@ systemProperties:
   - updated_datetime
 
 links:
-  - exclusive: false
+  - name: follow_ups
+    backref: summary_drug_uses
+    label: performed_at
+    target_type: follow_up
+    multiplicity: one_to_one
     required: true
-    subgroup:
-      - name: follow_ups
-        backref: summary_drug_uses
-        label: performed_at
-        target_type: follow_up
-        multiplicity: one_to_one
-        required: false
-      - name: treatments
-        backref: summary_drug_uses
-        label: associate_with
-        target_type: treatment
-        multiplicity: one_to_one
-        required: false
+  - name: treatments
+    backref: summary_drug_uses
+    label: associate_with
+    target_type: treatment
+    multiplicity: one_to_one
+    required: false
 
 uniqueKeys:
   - [id]
@@ -44,6 +41,7 @@ uniqueKeys:
 required:
   - submitter_id
   - type
+  - follow_ups
 
 properties:
   $ref: "_definitions.yaml#/ubiquitous_properties"

gdcdictionary/schemas/summary_lab_result.yaml

@@ -28,22 +28,19 @@ systemProperties:
   - updated_datetime
 
 links:
-  - exclusive: false
+  - name: follow_ups
+    backref: summary_lab_results
+    label: performed_at
+    target_type: follow_up
+    multiplicity: one_to_one
     required: true
-    subgroup:
-      - name: follow_ups
-        backref: summary_lab_results
-        label: performed_at
-        target_type: follow_up
-        multiplicity: many_to_one
-        required: false
-
-      - name: samples
-        backref: summary_lab_results
-        label: performed_on
-        target_type: sample
-        multiplicity: one_to_one
-        required: false
+
+  - name: samples
+    backref: summary_lab_results
+    label: performed_on
+    target_type: sample
+    multiplicity: one_to_one
+    required: false
 
 uniqueKeys:
   - [id]
@@ -52,6 +49,7 @@ uniqueKeys:
 required:
   - submitter_id
   - type
+  - follow_ups
 
 properties:
   $ref: "_definitions.yaml#/ubiquitous_properties"

gdcdictionary/schemas/summary_mutation_panel.yaml

@@ -32,7 +32,7 @@ links:
     label: derived_from
     target_type: submitted_unaligned_reads
     multiplicity: many_to_one
-    required: false
+    required: true
 
 uniqueKeys:
   - [id]
@@ -42,6 +42,7 @@ required:
   - submitter_id
   - type
   - subjects
+  - submitted_unaligned_reads_files
 
 properties:
   $ref: "_definitions.yaml#/ubiquitous_properties"

gdcdictionary/schemas/summary_socio_demographic.yaml

@@ -21,21 +21,18 @@ systemProperties:
   - updated_datetime
 
 links:
-  - exclusive: false
+  - name: subjects
+    backref: summary_socio_demographics
+    label: performed_on
+    target_type: subject
+    multiplicity: one_to_one
+    required: false
+  - name: follow_ups
+    backref: summary_socio_demographics
+    label: performed_at
+    target_type: follow_up
+    multiplicity: one_to_one
     required: true
-    subgroup:
-      - name: subjects
-        backref: summary_socio_demographics
-        label: performed_on
-        target_type: subject
-        multiplicity: one_to_one
-        required: false
-      - name: follow_ups
-        backref: summary_socio_demographics
-        label: performed_at
-        target_type: follow_up
-        multiplicity: one_to_one
-        required: false
 
 uniqueKeys:
   - [id]
@@ -44,6 +41,7 @@ uniqueKeys:
 required:
   - submitter_id
   - type
+  - follow_ups
 
 properties:
   $ref: "_definitions.yaml#/ubiquitous_properties"