pharmaobservatory 0.1.2 → 0.1.3

data/lib/pharmaobservatory/models/{orgs_org_targets200_response_rows_inner.rb → company_targets_row.rb}

@@ -14,28 +14,55 @@ require 'date'
 require 'time'
 
 module PharmaObservatory
-  class OrgsOrgTargets200ResponseRowsInner
-    attr_accessor :ensembl_id
+  # One row of the company_targets dataset: one row per company and target. A grouped request returns the group columns and the measures instead, as additional properties.
+  class CompanyTargetsRow
+    # Company level: the company whose lead-sponsored trials pursue the target.
+    attr_accessor :sponsor_company_id
 
-    attr_accessor :symbol
+    # Display name of the sponsor's company.
+    attr_accessor :sponsor_company_name
 
-    attr_accessor :name
+    # Group level: the sponsor's current ultimate parent company; a root company's group is itself.
+    attr_accessor :sponsor_group_id
 
+    # Display name of the sponsor's group.
+    attr_accessor :sponsor_group_name
+
+    # The target's gene identifier (Ensembl).
+    attr_accessor :target_id
+
+    # The target's gene symbol.
+    attr_accessor :target_symbol
+
+    # The target's name.
+    attr_accessor :target_name
+
+    # The furthest phase any qualifying program of the company reached against the target.
+    attr_accessor :max_phase
+
+    # Distinct drugs of the company's qualifying programs against the target.
     attr_accessor :n_drugs
 
-    attr_accessor :n_trials
+    # Distinct conditions of the company's qualifying programs against the target.
+    attr_accessor :n_conditions
 
-    attr_accessor :last_year
+    # Distinct trials the company leads in those programs.
+    attr_accessor :n_trials
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'ensembl_id' => :'ensembl_id',
-        :'symbol' => :'symbol',
-        :'name' => :'name',
+        :'sponsor_company_id' => :'sponsor_company_id',
+        :'sponsor_company_name' => :'sponsor_company_name',
+        :'sponsor_group_id' => :'sponsor_group_id',
+        :'sponsor_group_name' => :'sponsor_group_name',
+        :'target_id' => :'target_id',
+        :'target_symbol' => :'target_symbol',
+        :'target_name' => :'target_name',
+        :'max_phase' => :'max_phase',
         :'n_drugs' => :'n_drugs',
-        :'n_trials' => :'n_trials',
-        :'last_year' => :'last_year'
+        :'n_conditions' => :'n_conditions',
+        :'n_trials' => :'n_trials'
       }
     end
 
@@ -52,18 +79,34 @@ module PharmaObservatory
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'ensembl_id' => :'String',
-        :'symbol' => :'String',
-        :'name' => :'String',
+        :'sponsor_company_id' => :'String',
+        :'sponsor_company_name' => :'String',
+        :'sponsor_group_id' => :'String',
+        :'sponsor_group_name' => :'String',
+        :'target_id' => :'String',
+        :'target_symbol' => :'String',
+        :'target_name' => :'String',
+        :'max_phase' => :'Integer',
         :'n_drugs' => :'Integer',
-        :'n_trials' => :'Integer',
-        :'last_year' => :'Integer'
+        :'n_conditions' => :'Integer',
+        :'n_trials' => :'Integer'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'sponsor_company_id',
+        :'sponsor_company_name',
+        :'sponsor_group_id',
+        :'sponsor_group_name',
+        :'target_id',
+        :'target_symbol',
+        :'target_name',
+        :'max_phase',
+        :'n_drugs',
+        :'n_conditions',
+        :'n_trials'
       ])
     end
 
@@ -71,84 +114,68 @@ module PharmaObservatory
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `PharmaObservatory::OrgsOrgTargets200ResponseRowsInner` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PharmaObservatory::CompanyTargetsRow` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       acceptable_attribute_map = self.class.acceptable_attribute_map
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!acceptable_attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `PharmaObservatory::OrgsOrgTargets200ResponseRowsInner`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `PharmaObservatory::CompanyTargetsRow`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'ensembl_id')
-        self.ensembl_id = attributes[:'ensembl_id']
-      else
-        self.ensembl_id = nil
+      if attributes.key?(:'sponsor_company_id')
+        self.sponsor_company_id = attributes[:'sponsor_company_id']
       end
 
-      if attributes.key?(:'symbol')
-        self.symbol = attributes[:'symbol']
-      else
-        self.symbol = nil
-      end
-
-      if attributes.key?(:'name')
-        self.name = attributes[:'name']
-      else
-        self.name = nil
+      if attributes.key?(:'sponsor_company_name')
+        self.sponsor_company_name = attributes[:'sponsor_company_name']
       end
 
-      if attributes.key?(:'n_drugs')
-        self.n_drugs = attributes[:'n_drugs']
-      else
-        self.n_drugs = nil
+      if attributes.key?(:'sponsor_group_id')
+        self.sponsor_group_id = attributes[:'sponsor_group_id']
       end
 
-      if attributes.key?(:'n_trials')
-        self.n_trials = attributes[:'n_trials']
-      else
-        self.n_trials = nil
+      if attributes.key?(:'sponsor_group_name')
+        self.sponsor_group_name = attributes[:'sponsor_group_name']
       end
 
-      if attributes.key?(:'last_year')
-        self.last_year = attributes[:'last_year']
-      else
-        self.last_year = nil
+      if attributes.key?(:'target_id')
+        self.target_id = attributes[:'target_id']
       end
-    end
 
-    # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properties with the reasons
-    def list_invalid_properties
-      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
-      invalid_properties = Array.new
-      if @ensembl_id.nil?
-        invalid_properties.push('invalid value for "ensembl_id", ensembl_id cannot be nil.')
+      if attributes.key?(:'target_symbol')
+        self.target_symbol = attributes[:'target_symbol']
       end
 
-      if @symbol.nil?
-        invalid_properties.push('invalid value for "symbol", symbol cannot be nil.')
+      if attributes.key?(:'target_name')
+        self.target_name = attributes[:'target_name']
       end
 
-      if @name.nil?
-        invalid_properties.push('invalid value for "name", name cannot be nil.')
+      if attributes.key?(:'max_phase')
+        self.max_phase = attributes[:'max_phase']
       end
 
-      if @n_drugs.nil?
-        invalid_properties.push('invalid value for "n_drugs", n_drugs cannot be nil.')
+      if attributes.key?(:'n_drugs')
+        self.n_drugs = attributes[:'n_drugs']
       end
 
-      if @n_trials.nil?
-        invalid_properties.push('invalid value for "n_trials", n_trials cannot be nil.')
+      if attributes.key?(:'n_conditions')
+        self.n_conditions = attributes[:'n_conditions']
       end
 
-      if @last_year.nil?
-        invalid_properties.push('invalid value for "last_year", last_year cannot be nil.')
+      if attributes.key?(:'n_trials')
+        self.n_trials = attributes[:'n_trials']
       end
+    end
 
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
+      invalid_properties = Array.new
       invalid_properties
     end
 
@@ -156,86 +183,25 @@ module PharmaObservatory
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      return false if @ensembl_id.nil?
-      return false if @symbol.nil?
-      return false if @name.nil?
-      return false if @n_drugs.nil?
-      return false if @n_trials.nil?
-      return false if @last_year.nil?
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] ensembl_id Value to be assigned
-    def ensembl_id=(ensembl_id)
-      if ensembl_id.nil?
-        fail ArgumentError, 'ensembl_id cannot be nil'
-      end
-
-      @ensembl_id = ensembl_id
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] symbol Value to be assigned
-    def symbol=(symbol)
-      if symbol.nil?
-        fail ArgumentError, 'symbol cannot be nil'
-      end
-
-      @symbol = symbol
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] name Value to be assigned
-    def name=(name)
-      if name.nil?
-        fail ArgumentError, 'name cannot be nil'
-      end
-
-      @name = name
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] n_drugs Value to be assigned
-    def n_drugs=(n_drugs)
-      if n_drugs.nil?
-        fail ArgumentError, 'n_drugs cannot be nil'
-      end
-
-      @n_drugs = n_drugs
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] n_trials Value to be assigned
-    def n_trials=(n_trials)
-      if n_trials.nil?
-        fail ArgumentError, 'n_trials cannot be nil'
-      end
-
-      @n_trials = n_trials
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] last_year Value to be assigned
-    def last_year=(last_year)
-      if last_year.nil?
-        fail ArgumentError, 'last_year cannot be nil'
-      end
-
-      @last_year = last_year
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          ensembl_id == o.ensembl_id &&
-          symbol == o.symbol &&
-          name == o.name &&
+          sponsor_company_id == o.sponsor_company_id &&
+          sponsor_company_name == o.sponsor_company_name &&
+          sponsor_group_id == o.sponsor_group_id &&
+          sponsor_group_name == o.sponsor_group_name &&
+          target_id == o.target_id &&
+          target_symbol == o.target_symbol &&
+          target_name == o.target_name &&
+          max_phase == o.max_phase &&
           n_drugs == o.n_drugs &&
-          n_trials == o.n_trials &&
-          last_year == o.last_year
+          n_conditions == o.n_conditions &&
+          n_trials == o.n_trials
     end
 
     # @see the `==` method
@@ -247,7 +213,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [ensembl_id, symbol, name, n_drugs, n_trials, last_year].hash
+      [sponsor_company_id, sponsor_company_name, sponsor_group_id, sponsor_group_name, target_id, target_symbol, target_name, max_phase, n_drugs, n_conditions, n_trials].hash
     end
 
     # Builds the object from hash

data/lib/pharmaobservatory/models/{orgs_esg_trend200_response_attribution_inner.rb → dataset_attribution.rb}

@@ -14,11 +14,15 @@ require 'date'
 require 'time'
 
 module PharmaObservatory
-  class OrgsEsgTrend200ResponseAttributionInner
+  class DatasetAttribution
     attr_accessor :name
 
     attr_accessor :license
 
+    attr_accessor :href
+
+    attr_accessor :license_href
+
     attr_accessor :note
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -26,6 +30,8 @@ module PharmaObservatory
       {
         :'name' => :'name',
         :'license' => :'license',
+        :'href' => :'href',
+        :'license_href' => :'license_href',
         :'note' => :'note'
       }
     end
@@ -44,7 +50,9 @@ module PharmaObservatory
     def self.openapi_types
       {
         :'name' => :'String',
-        :'license' => :'Object',
+        :'license' => :'String',
+        :'href' => :'String',
+        :'license_href' => :'String',
         :'note' => :'String'
       }
     end
@@ -53,6 +61,9 @@ module PharmaObservatory
     def self.openapi_nullable
       Set.new([
         :'license',
+        :'href',
+        :'license_href',
+        :'note'
       ])
     end
 
@@ -60,34 +71,36 @@ module PharmaObservatory
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `PharmaObservatory::OrgsEsgTrend200ResponseAttributionInner` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PharmaObservatory::DatasetAttribution` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       acceptable_attribute_map = self.class.acceptable_attribute_map
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!acceptable_attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `PharmaObservatory::OrgsEsgTrend200ResponseAttributionInner`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `PharmaObservatory::DatasetAttribution`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
-      else
-        self.name = nil
       end
 
       if attributes.key?(:'license')
         self.license = attributes[:'license']
-      else
-        self.license = nil
+      end
+
+      if attributes.key?(:'href')
+        self.href = attributes[:'href']
+      end
+
+      if attributes.key?(:'license_href')
+        self.license_href = attributes[:'license_href']
       end
 
       if attributes.key?(:'note')
         self.note = attributes[:'note']
-      else
-        self.note = nil
       end
     end
 
@@ -96,14 +109,6 @@ module PharmaObservatory
     def list_invalid_properties
       warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
-      if @name.nil?
-        invalid_properties.push('invalid value for "name", name cannot be nil.')
-      end
-
-      if @note.nil?
-        invalid_properties.push('invalid value for "note", note cannot be nil.')
-      end
-
       invalid_properties
     end
 
@@ -111,31 +116,9 @@ module PharmaObservatory
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      return false if @name.nil?
-      return false if @note.nil?
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] name Value to be assigned
-    def name=(name)
-      if name.nil?
-        fail ArgumentError, 'name cannot be nil'
-      end
-
-      @name = name
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] note Value to be assigned
-    def note=(note)
-      if note.nil?
-        fail ArgumentError, 'note cannot be nil'
-      end
-
-      @note = note
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -143,6 +126,8 @@ module PharmaObservatory
       self.class == o.class &&
           name == o.name &&
           license == o.license &&
+          href == o.href &&
+          license_href == o.license_href &&
           note == o.note
     end
 
@@ -155,7 +140,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, license, note].hash
+      [name, license, href, license_href, note].hash
     end
 
     # Builds the object from hash

data/lib/pharmaobservatory/models/{biomarkers_relations200_response_query.rb → dataset_build_state.rb}

@@ -14,13 +14,19 @@ require 'date'
 require 'time'
 
 module PharmaObservatory
-  class BiomarkersRelations200ResponseQuery
-    attr_accessor :filters
+  class DatasetBuildState
+    attr_accessor :built
+
+    attr_accessor :generation
+
+    attr_accessor :last_loaded
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'filters' => :'filters'
+        :'built' => :'built',
+        :'generation' => :'generation',
+        :'last_loaded' => :'last_loaded'
       }
     end
 
@@ -37,13 +43,17 @@ module PharmaObservatory
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'filters' => :'BiomarkersList200ResponseShape'
+        :'built' => :'Boolean',
+        :'generation' => :'String',
+        :'last_loaded' => :'String'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'generation',
+        :'last_loaded'
       ])
     end
 
@@ -51,22 +61,28 @@ module PharmaObservatory
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `PharmaObservatory::BiomarkersRelations200ResponseQuery` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PharmaObservatory::DatasetBuildState` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       acceptable_attribute_map = self.class.acceptable_attribute_map
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!acceptable_attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `PharmaObservatory::BiomarkersRelations200ResponseQuery`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `PharmaObservatory::DatasetBuildState`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'filters')
-        self.filters = attributes[:'filters']
-      else
-        self.filters = nil
+      if attributes.key?(:'built')
+        self.built = attributes[:'built']
+      end
+
+      if attributes.key?(:'generation')
+        self.generation = attributes[:'generation']
+      end
+
+      if attributes.key?(:'last_loaded')
+        self.last_loaded = attributes[:'last_loaded']
       end
     end
 
@@ -75,10 +91,6 @@ module PharmaObservatory
     def list_invalid_properties
       warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
-      if @filters.nil?
-        invalid_properties.push('invalid value for "filters", filters cannot be nil.')
-      end
-
       invalid_properties
     end
 
@@ -86,26 +98,17 @@ module PharmaObservatory
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      return false if @filters.nil?
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] filters Value to be assigned
-    def filters=(filters)
-      if filters.nil?
-        fail ArgumentError, 'filters cannot be nil'
-      end
-
-      @filters = filters
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          filters == o.filters
+          built == o.built &&
+          generation == o.generation &&
+          last_loaded == o.last_loaded
     end
 
     # @see the `==` method
@@ -117,7 +120,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [filters].hash
+      [built, generation, last_loaded].hash
     end
 
     # Builds the object from hash