pharmaobservatory 0.1.4 → 0.1.6

data/lib/pharmaobservatory/models/site_beds_yearly_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<SiteBedsYearlyRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/site_cro_trials_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<SiteCroTrialsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/site_hospitals_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<SiteHospitalsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/site_investigators_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<SiteInvestigatorsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/site_trial_conditions_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<SiteTrialConditionsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/site_trial_drugs_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<SiteTrialDrugsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/site_trials_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<SiteTrialsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/site_trials_row.rb

@@ -28,9 +28,12 @@ module PharmaObservatory
     # INTERVENTIONAL or OBSERVATIONAL.
     attr_accessor :study_type
 
-    # The trial phase label.
+    # The registry's phase code (PHASE1, PHASE2, PHASE2/PHASE3, NA and so on). Null when the registry gives no phase (observational and expanded-access trials); phase_label carries the display label for those.
     attr_accessor :phase
 
+    # The trial phase as a display label (Phase 2, Phase 3, Observational, Not applicable, Expanded access, Unknown). The same trial's phase column holds the registry code.
+    attr_accessor :phase_label
+
     # The registry's overall status.
     attr_accessor :overall_status
 
@@ -69,6 +72,7 @@ module PharmaObservatory
         :'trial_title' => :'trial_title',
         :'study_type' => :'study_type',
         :'phase' => :'phase',
+        :'phase_label' => :'phase_label',
         :'overall_status' => :'overall_status',
         :'start_date' => :'start_date',
         :'start_year' => :'start_year',
@@ -100,6 +104,7 @@ module PharmaObservatory
         :'trial_title' => :'String',
         :'study_type' => :'String',
         :'phase' => :'String',
+        :'phase_label' => :'String',
         :'overall_status' => :'String',
         :'start_date' => :'Date',
         :'start_year' => :'Integer',
@@ -121,6 +126,7 @@ module PharmaObservatory
         :'trial_title',
         :'study_type',
         :'phase',
+        :'phase_label',
         :'overall_status',
         :'start_date',
         :'start_year',
@@ -170,6 +176,10 @@ module PharmaObservatory
         self.phase = attributes[:'phase']
       end
 
+      if attributes.key?(:'phase_label')
+        self.phase_label = attributes[:'phase_label']
+      end
+
       if attributes.key?(:'overall_status')
         self.overall_status = attributes[:'overall_status']
       end
@@ -236,6 +246,7 @@ module PharmaObservatory
           trial_title == o.trial_title &&
           study_type == o.study_type &&
           phase == o.phase &&
+          phase_label == o.phase_label &&
           overall_status == o.overall_status &&
           start_date == o.start_date &&
           start_year == o.start_year &&
@@ -257,7 +268,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [site_id, trial_id, trial_title, study_type, phase, overall_status, start_date, start_year, enrollment, lead_sponsor_name, lead_sponsor_org_id, lead_sponsor_company_id, lead_sponsor_company_name, lead_sponsor_group_id, lead_sponsor_group_name].hash
+      [site_id, trial_id, trial_title, study_type, phase, phase_label, overall_status, start_date, start_year, enrollment, lead_sponsor_name, lead_sponsor_org_id, lead_sponsor_company_id, lead_sponsor_company_name, lead_sponsor_group_id, lead_sponsor_group_name].hash
     end
 
     # Builds the object from hash

data/lib/pharmaobservatory/models/sites_record.rb

@@ -74,8 +74,8 @@ module PharmaObservatory
         :'datasets' => :'Array<DatasetListing>',
         :'attribution' => :'Array<DatasetAttribution>',
         :'source_credit' => :'String',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/sites_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<SitesRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/sponsor_recruitment_by_phase_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<SponsorRecruitmentByPhaseRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/sponsor_recruitment_duration_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<SponsorRecruitmentDurationRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/sponsor_trial_start_forecast_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<SponsorTrialStartForecastRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/sponsor_trials_response.rb

@@ -102,7 +102,7 @@ module PharmaObservatory
         :'grain' => :'String',
         :'object_type' => :'String',
         :'id' => :'String',
-        :'scope' => :'BiomarkerCdxAssertionsResponseScope',
+        :'scope' => :'BiomarkerAssayEvidenceResponseScope',
         :'columns' => :'Array<DatasetColumn>',
         :'rows' => :'Array<SponsorTrialsRow>',
         :'total' => :'Integer',
@@ -115,8 +115,8 @@ module PharmaObservatory
         :'source_credit' => :'String',
         :'withheld_tiers' => :'Array<String>',
         :'withheld_columns' => :'Array<String>',
-        :'freshness' => :'BiomarkerCdxAssertionsResponseFreshness',
-        :'build' => :'BiomarkerCdxAssertionsResponseBuild',
+        :'freshness' => :'BiomarkerAssayEvidenceResponseFreshness',
+        :'build' => :'BiomarkerAssayEvidenceResponseBuild',
         :'build_state' => :'DatasetBuildState',
         :'restriction' => :'Hash<String, Object>'
       }

data/lib/pharmaobservatory/models/sponsor_trials_row.rb

@@ -40,7 +40,7 @@ module PharmaObservatory
     # Display name of the sponsor's group.
     attr_accessor :sponsor_group_name
 
-    # The registry's agency class for the sponsor (INDUSTRY, NIH for the US National Institutes of Health, OTHER ...).
+    # The funder class the registry declared for the sponsor (INDUSTRY, NIH for the US National Institutes of Health, FED, OTHER_GOV, NETWORK, OTHER, INDIV, AMBIG, UNKNOWN). UNKNOWN is the registry's own code for a class it does not state.
     attr_accessor :sponsor_agency_class
 
     # How the sponsor name was resolved to an organization record.
@@ -52,9 +52,12 @@ module PharmaObservatory
     # INTERVENTIONAL or OBSERVATIONAL.
     attr_accessor :study_type
 
-    # The trial phase label.
+    # The registry's phase code (PHASE1, PHASE2, PHASE2/PHASE3, NA and so on). Null when the registry gives no phase (observational and expanded-access trials); phase_label carries the display label for those.
     attr_accessor :phase
 
+    # The trial phase as a display label (Phase 2, Phase 3, Observational, Not applicable, Expanded access, Unknown). The same trial's phase column holds the registry code.
+    attr_accessor :phase_label
+
     # The registry's overall status.
     attr_accessor :overall_status
 
@@ -95,6 +98,7 @@ module PharmaObservatory
         :'trial_title' => :'trial_title',
         :'study_type' => :'study_type',
         :'phase' => :'phase',
+        :'phase_label' => :'phase_label',
         :'overall_status' => :'overall_status',
         :'start_date' => :'start_date',
         :'start_year' => :'start_year',
@@ -132,6 +136,7 @@ module PharmaObservatory
         :'trial_title' => :'String',
         :'study_type' => :'String',
         :'phase' => :'String',
+        :'phase_label' => :'String',
         :'overall_status' => :'String',
         :'start_date' => :'Date',
         :'start_year' => :'Integer',
@@ -159,6 +164,7 @@ module PharmaObservatory
         :'trial_title',
         :'study_type',
         :'phase',
+        :'phase_label',
         :'overall_status',
         :'start_date',
         :'start_year',
@@ -238,6 +244,10 @@ module PharmaObservatory
         self.phase = attributes[:'phase']
       end
 
+      if attributes.key?(:'phase_label')
+        self.phase_label = attributes[:'phase_label']
+      end
+
       if attributes.key?(:'overall_status')
         self.overall_status = attributes[:'overall_status']
       end
@@ -308,6 +318,7 @@ module PharmaObservatory
           trial_title == o.trial_title &&
           study_type == o.study_type &&
           phase == o.phase &&
+          phase_label == o.phase_label &&
           overall_status == o.overall_status &&
           start_date == o.start_date &&
           start_year == o.start_year &&
@@ -327,7 +338,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [trial_id, sponsor_role, sponsor_name, sponsor_org_id, sponsor_company_id, sponsor_company_name, sponsor_group_id, sponsor_group_name, sponsor_agency_class, sponsor_resolution_method, trial_title, study_type, phase, overall_status, start_date, start_year, primary_completion_date, enrollment, were_results_reported, conditions, interventions].hash
+      [trial_id, sponsor_role, sponsor_name, sponsor_org_id, sponsor_company_id, sponsor_company_name, sponsor_group_id, sponsor_group_name, sponsor_agency_class, sponsor_resolution_method, trial_title, study_type, phase, phase_label, overall_status, start_date, start_year, primary_completion_date, enrollment, were_results_reported, conditions, interventions].hash
     end
 
     # Builds the object from hash