pharmaobservatory 0.1.2 → 0.1.3

data/lib/pharmaobservatory/models/{biomarkers_list200_response_query_filters.rb → biomarker_cdx_assertions_response_freshness.rb}

@@ -14,16 +14,16 @@ require 'date'
 require 'time'
 
 module PharmaObservatory
-  class BiomarkersList200ResponseQueryFilters
-    attr_accessor :kind
+  class BiomarkerCdxAssertionsResponseFreshness
+    attr_accessor :source
 
-    attr_accessor :identity
+    attr_accessor :last_loaded
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'kind' => :'kind',
-        :'identity' => :'identity'
+        :'source' => :'source',
+        :'last_loaded' => :'last_loaded'
       }
     end
 
@@ -40,14 +40,16 @@ module PharmaObservatory
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'kind' => :'Array<String>',
-        :'identity' => :'Array<String>'
+        :'source' => :'String',
+        :'last_loaded' => :'String'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'source',
+        :'last_loaded'
       ])
     end
 
@@ -55,28 +57,24 @@ 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::BiomarkersList200ResponseQueryFilters` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PharmaObservatory::BiomarkerCdxAssertionsResponseFreshness` 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::BiomarkersList200ResponseQueryFilters`. 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::BiomarkerCdxAssertionsResponseFreshness`. 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?(:'kind')
-        if (value = attributes[:'kind']).is_a?(Array)
-          self.kind = value
-        end
+      if attributes.key?(:'source')
+        self.source = attributes[:'source']
       end
 
-      if attributes.key?(:'identity')
-        if (value = attributes[:'identity']).is_a?(Array)
-          self.identity = value
-        end
+      if attributes.key?(:'last_loaded')
+        self.last_loaded = attributes[:'last_loaded']
       end
     end
 
@@ -100,8 +98,8 @@ module PharmaObservatory
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          kind == o.kind &&
-          identity == o.identity
+          source == o.source &&
+          last_loaded == o.last_loaded
     end
 
     # @see the `==` method
@@ -113,7 +111,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [kind, identity].hash
+      [source, last_loaded].hash
     end
 
     # Builds the object from hash

data/lib/pharmaobservatory/models/{biomarkers_where_it_appears200_response_rows_inner.rb → biomarker_cdx_assertions_response_scope.rb}

@@ -14,19 +14,41 @@ require 'date'
 require 'time'
 
 module PharmaObservatory
-  class BiomarkersWhereItAppears200ResponseRowsInner
+  class BiomarkerCdxAssertionsResponseScope
     attr_accessor :kind
 
-    attr_accessor :name
+    attr_accessor :group_id
 
-    attr_accessor :condition_id
+    attr_accessor :group_name
+
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'kind' => :'kind',
-        :'name' => :'name',
-        :'condition_id' => :'condition_id'
+        :'group_id' => :'group_id',
+        :'group_name' => :'group_name'
       }
     end
 
@@ -44,15 +66,16 @@ module PharmaObservatory
     def self.openapi_types
       {
         :'kind' => :'String',
-        :'name' => :'String',
-        :'condition_id' => :'Object'
+        :'group_id' => :'String',
+        :'group_name' => :'String'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
-        :'condition_id'
+        :'group_id',
+        :'group_name'
       ])
     end
 
@@ -60,34 +83,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::BiomarkersWhereItAppears200ResponseRowsInner` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PharmaObservatory::BiomarkerCdxAssertionsResponseScope` 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::BiomarkersWhereItAppears200ResponseRowsInner`. 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::BiomarkerCdxAssertionsResponseScope`. 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?(:'kind')
         self.kind = attributes[:'kind']
-      else
-        self.kind = nil
       end
 
-      if attributes.key?(:'name')
-        self.name = attributes[:'name']
-      else
-        self.name = nil
+      if attributes.key?(:'group_id')
+        self.group_id = attributes[:'group_id']
       end
 
-      if attributes.key?(:'condition_id')
-        self.condition_id = attributes[:'condition_id']
-      else
-        self.condition_id = nil
+      if attributes.key?(:'group_name')
+        self.group_name = attributes[:'group_name']
       end
     end
 
@@ -96,14 +113,6 @@ module PharmaObservatory
     def list_invalid_properties
       warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
-      if @kind.nil?
-        invalid_properties.push('invalid value for "kind", kind cannot be nil.')
-      end
-
-      if @name.nil?
-        invalid_properties.push('invalid value for "name", name cannot be nil.')
-      end
-
       invalid_properties
     end
 
@@ -111,39 +120,29 @@ module PharmaObservatory
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      return false if @kind.nil?
-      return false if @name.nil?
+      kind_validator = EnumAttributeValidator.new('String', ["company", "group"])
+      return false unless kind_validator.valid?(@kind)
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] kind Value to be assigned
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] kind Object to be assigned
     def kind=(kind)
-      if kind.nil?
-        fail ArgumentError, 'kind cannot be nil'
+      validator = EnumAttributeValidator.new('String', ["company", "group"])
+      unless validator.valid?(kind)
+        fail ArgumentError, "invalid value for \"kind\", must be one of #{validator.allowable_values}."
       end
-
       @kind = kind
     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
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
           kind == o.kind &&
-          name == o.name &&
-          condition_id == o.condition_id
+          group_id == o.group_id &&
+          group_name == o.group_name
     end
 
     # @see the `==` method
@@ -155,7 +154,7 @@ module PharmaObservatory
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [kind, name, condition_id].hash
+      [kind, group_id, group_name].hash
     end
 
     # Builds the object from hash