first_data_gateway 1.4.0 → 1.8.0

data/lib/openapi_client/models/secure3_d10_authentication_request.rb

@@ -0,0 +1,208 @@
+=begin
+#Payment Gateway API Specification.
+
+#The documentation here is designed to provide all of the technical guidance required to consume and integrate with our APIs for payment processing. To learn more about our APIs please visit https://docs.firstdata.com/org/gateway.
+
+The version of the OpenAPI document: 6.13.0.20200810.001
+
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 4.1.1
+
+=end
+
+require 'date'
+
+module OpenapiClient
+  # Request authentication of the payment card using the 3DS 1.0 URL redirect scheme.
+  class Secure3D10AuthenticationRequest < AuthenticationRequest
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+      }
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+      }
+    end
+
+    # List of class defined in allOf (OpenAPI v3)
+    def self.openapi_all_of
+      [
+      :'AuthenticationRequest'
+      ]
+    end
+
+    # Initializes the object
+    # @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 `OpenapiClient::Secure3D10AuthenticationRequest` initialize method"
+      end
+
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `OpenapiClient::Secure3D10AuthenticationRequest`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
+
+      # call parent's initialize
+      super(attributes)
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      invalid_properties = super
+      invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      true && super
+    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 && super(o)
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def self.build_from_hash(attributes)
+      new.build_from_hash(attributes)
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes, attribute_map = self.class.attribute_map, openapi_types = self.class.openapi_types)
+      return nil unless attributes.is_a?(Hash)
+      super(attributes, self.class.superclass.attribute_map, self.class.superclass.openapi_types)
+      openapi_types.each_pair do |key, type|
+        if type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the attribute
+          # is documented as an array but the input is not
+          if attributes[attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[attribute_map[key]].map { |v| _deserialize($1, v) })
+          end
+        elsif !attributes[attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[attribute_map[key]]))
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :Boolean
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        klass = OpenapiClient.const_get(type)
+        if klass.respond_to?(:openapi_discriminator_name)
+          klass = OpenapiClient.const_get(value[klass.attribute_map[klass.openapi_discriminator_name]])
+        end
+ 
+        klass.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash(attribute_map = self.class.attribute_map, openapi_nullable = Set.new([]))
+      hash = super(self.class.superclass.attribute_map, openapi_nullable)
+      attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end

data/lib/openapi_client/models/secure3_d10_authentication_result.rb

@@ -3,10 +3,10 @@
 
 #The documentation here is designed to provide all of the technical guidance required to consume and integrate with our APIs for payment processing. To learn more about our APIs please visit https://docs.firstdata.com/org/gateway.
 
-The version of the OpenAPI document: 6.8.0.20190731.002
+The version of the OpenAPI document: 6.13.0.20200810.001
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: unset
+OpenAPI Generator version: 4.1.1
 
 =end
 
@@ -14,10 +14,7 @@ require 'date'
 
 module OpenapiClient
   # Submit the result of the authentication managed outside of the gateway for a 3-D Secure 1.0 scheme. For more convenient usage without implementing 3-D Secure yourself see \"authenticationRequest\" section.
-  class Secure3D10AuthenticationResult
-    # Indicates what kind of authentication scheme the merchant wants to use on the card.
-    attr_accessor :request_type
-
+  class Secure3D10AuthenticationResult < AuthenticationResult
     # Card enrollment result from the Verification Response (VeRes).
     attr_accessor :verification_response
 
@@ -55,7 +52,6 @@ module OpenapiClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'request_type' => :'requestType',
         :'verification_response' => :'verificationResponse',
         :'authentication_attempt_result' => :'authenticationAttemptResult',
         :'cavv' => :'cavv',
@@ -66,7 +62,6 @@ module OpenapiClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'request_type' => :'String',
         :'verification_response' => :'String',
         :'authentication_attempt_result' => :'String',
         :'cavv' => :'String',
@@ -77,7 +72,7 @@ module OpenapiClient
     # List of class defined in allOf (OpenAPI v3)
     def self.openapi_all_of
       [
-      :'Authentication',
+      :'AuthenticationResult',
       :'Secure3D10AuthenticationResultAllOf'
       ]
     end
@@ -97,9 +92,8 @@ module OpenapiClient
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'request_type')
-        self.request_type = attributes[:'request_type']
-      end
+      # call parent's initialize
+      super(attributes)
 
       if attributes.key?(:'verification_response')
         self.verification_response = attributes[:'verification_response']
@@ -121,11 +115,7 @@ module OpenapiClient
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
-      invalid_properties = Array.new
-      if @request_type.nil?
-        invalid_properties.push('invalid value for "request_type", request_type cannot be nil.')
-      end
-
+      invalid_properties = super
       if !@cavv.nil? && @cavv.to_s.length > 32
         invalid_properties.push('invalid value for "cavv", the character length must be smaller than or equal to 32.')
       end
@@ -148,7 +138,6 @@ module OpenapiClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @request_type.nil?
       verification_response_validator = EnumAttributeValidator.new('String', ["Y", "N", "U"])
       return false unless verification_response_validator.valid?(@verification_response)
       authentication_attempt_result_validator = EnumAttributeValidator.new('String', ["Y", "N", "U", "A"])
@@ -157,7 +146,7 @@ module OpenapiClient
       return false if !@cavv.nil? && @cavv.to_s.length < 20
       return false if !@xid.nil? && @xid.to_s.length > 32
       return false if !@xid.nil? && @xid.to_s.length < 20
-      true
+      true && super
     end
 
     # Custom attribute writer method checking allowed values (enum).
@@ -213,11 +202,10 @@ module OpenapiClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          request_type == o.request_type &&
           verification_response == o.verification_response &&
           authentication_attempt_result == o.authentication_attempt_result &&
           cavv == o.cavv &&
-          xid == o.xid
+          xid == o.xid && super(o)
     end
 
     # @see the `==` method
@@ -229,7 +217,7 @@ module OpenapiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [request_type, verification_response, authentication_attempt_result, cavv, xid].hash
+      [verification_response, authentication_attempt_result, cavv, xid].hash
     end
 
     # Builds the object from hash
@@ -242,17 +230,18 @@ module OpenapiClient
     # Builds the object from hash
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
+    def build_from_hash(attributes, attribute_map = self.class.attribute_map, openapi_types = self.class.openapi_types)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
+      super(attributes, self.class.superclass.attribute_map, self.class.superclass.openapi_types)
+      openapi_types.each_pair do |key, type|
         if type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[attribute_map[key]].map { |v| _deserialize($1, v) })
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !attributes[attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -296,7 +285,12 @@ module OpenapiClient
           end
         end
       else # model
-        OpenapiClient.const_get(type).build_from_hash(value)
+        klass = OpenapiClient.const_get(type)
+        if klass.respond_to?(:openapi_discriminator_name)
+          klass = OpenapiClient.const_get(value[klass.attribute_map[klass.openapi_discriminator_name]])
+        end
+ 
+        klass.build_from_hash(value)
       end
     end
 
@@ -314,11 +308,15 @@ module OpenapiClient
 
     # Returns the object in the form of hash
     # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+    def to_hash(attribute_map = self.class.attribute_map, openapi_nullable = Set.new([]))
+      hash = super(self.class.superclass.attribute_map, openapi_nullable)
+      attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
         hash[param] = _to_hash(value)
       end
       hash

data/lib/openapi_client/models/secure3_d10_authentication_result_all_of.rb

@@ -3,10 +3,10 @@
 
 #The documentation here is designed to provide all of the technical guidance required to consume and integrate with our APIs for payment processing. To learn more about our APIs please visit https://docs.firstdata.com/org/gateway.
 
-The version of the OpenAPI document: 6.8.0.20190731.002
+The version of the OpenAPI document: 6.13.0.20200810.001
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: unset
+OpenAPI Generator version: 4.1.1
 
 =end
 
@@ -218,17 +218,17 @@ module OpenapiClient
     # Builds the object from hash
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
+    def build_from_hash(attributes, attribute_map = self.class.attribute_map, openapi_types = self.class.openapi_types)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
+      openapi_types.each_pair do |key, type|
         if type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[attribute_map[key]].map { |v| _deserialize($1, v) })
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !attributes[attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -272,7 +272,12 @@ module OpenapiClient
           end
         end
       else # model
-        OpenapiClient.const_get(type).build_from_hash(value)
+        klass = OpenapiClient.const_get(type)
+        if klass.respond_to?(:openapi_discriminator_name)
+          klass = OpenapiClient.const_get(value[klass.attribute_map[klass.openapi_discriminator_name]])
+        end
+ 
+        klass.build_from_hash(value)
       end
     end
 
@@ -290,11 +295,15 @@ module OpenapiClient
 
     # Returns the object in the form of hash
     # @return [Hash] Returns the object in the form of hash
-    def to_hash
+    def to_hash(attribute_map = self.class.attribute_map, openapi_nullable = Set.new([]))
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
         hash[param] = _to_hash(value)
       end
       hash

data/lib/openapi_client/models/{secure3d_authentication_verification_request.rb → secure3_d10_authentication_update_request.rb}

@@ -3,64 +3,50 @@
 
 #The documentation here is designed to provide all of the technical guidance required to consume and integrate with our APIs for payment processing. To learn more about our APIs please visit https://docs.firstdata.com/org/gateway.
 
-The version of the OpenAPI document: 6.8.0.20190731.002
+The version of the OpenAPI document: 6.13.0.20200810.001
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: unset
+OpenAPI Generator version: 4.1.1
 
 =end
 
 require 'date'
 
 module OpenapiClient
-  # Authentication verification request specific to 3DSecure transactions.
-  class Secure3dAuthenticationVerificationRequest
-    # An optional Outlet ID for clients that support multiple stores in the same developer app.
-    attr_accessor :store_id
-
-    # Object name of the authentication verification request.
-    attr_accessor :request_type
-
-    # Card security code if required by merchant.
-    attr_accessor :security_code
-
-    attr_accessor :billing_address
-
+  # Authentication update request specific to 3DSecure 1.0 transactions.
+  class Secure3D10AuthenticationUpdateRequest < AuthenticationUpdateRequest
     # A formatted message providing results of the issuer’s cardholder authentication.
     attr_accessor :payer_authentication_response
 
     # Formatted string encoding transaction time, order ID, and return URL data.
     attr_accessor :merchant_data
 
+    # Card security code if required by merchant.
+    attr_accessor :security_code
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'store_id' => :'storeId',
-        :'request_type' => :'requestType',
-        :'security_code' => :'securityCode',
-        :'billing_address' => :'billingAddress',
         :'payer_authentication_response' => :'payerAuthenticationResponse',
-        :'merchant_data' => :'merchantData'
+        :'merchant_data' => :'merchantData',
+        :'security_code' => :'securityCode'
       }
     end
 
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'store_id' => :'String',
-        :'request_type' => :'String',
-        :'security_code' => :'String',
-        :'billing_address' => :'Address',
         :'payer_authentication_response' => :'String',
-        :'merchant_data' => :'String'
+        :'merchant_data' => :'String',
+        :'security_code' => :'String'
       }
     end
 
     # List of class defined in allOf (OpenAPI v3)
     def self.openapi_all_of
       [
-      :'AuthenticationVerificationRequest',
-      :'Secure3dAuthenticationVerificationRequestAllOf'
+      :'AuthenticationUpdateRequest',
+      :'Secure3D10AuthenticationUpdateRequestAllOf'
       ]
     end
 
@@ -68,32 +54,19 @@ module OpenapiClient
     # @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 `OpenapiClient::Secure3dAuthenticationVerificationRequest` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `OpenapiClient::Secure3D10AuthenticationUpdateRequest` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `OpenapiClient::Secure3dAuthenticationVerificationRequest`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `OpenapiClient::Secure3D10AuthenticationUpdateRequest`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'store_id')
-        self.store_id = attributes[:'store_id']
-      end
-
-      if attributes.key?(:'request_type')
-        self.request_type = attributes[:'request_type']
-      end
-
-      if attributes.key?(:'security_code')
-        self.security_code = attributes[:'security_code']
-      end
-
-      if attributes.key?(:'billing_address')
-        self.billing_address = attributes[:'billing_address']
-      end
+      # call parent's initialize
+      super(attributes)
 
       if attributes.key?(:'payer_authentication_response')
         self.payer_authentication_response = attributes[:'payer_authentication_response']
@@ -102,20 +75,16 @@ module OpenapiClient
       if attributes.key?(:'merchant_data')
         self.merchant_data = attributes[:'merchant_data']
       end
+
+      if attributes.key?(:'security_code')
+        self.security_code = attributes[:'security_code']
+      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
-      invalid_properties = Array.new
-      if !@store_id.nil? && @store_id.to_s.length > 20
-        invalid_properties.push('invalid value for "store_id", the character length must be smaller than or equal to 20.')
-      end
-
-      if @request_type.nil?
-        invalid_properties.push('invalid value for "request_type", request_type cannot be nil.')
-      end
-
+      invalid_properties = super
       if @payer_authentication_response.nil?
         invalid_properties.push('invalid value for "payer_authentication_response", payer_authentication_response cannot be nil.')
       end
@@ -140,23 +109,11 @@ module OpenapiClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if !@store_id.nil? && @store_id.to_s.length > 20
-      return false if @request_type.nil?
       return false if @payer_authentication_response.nil?
       return false if @payer_authentication_response !~ Regexp.new(/^(?!\s*$).+/)
       return false if @merchant_data.nil?
       return false if @merchant_data !~ Regexp.new(/^(?!\s*$).+/)
-      true
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] store_id Value to be assigned
-    def store_id=(store_id)
-      if !store_id.nil? && store_id.to_s.length > 20
-        fail ArgumentError, 'invalid value for "store_id", the character length must be smaller than or equal to 20.'
-      end
-
-      @store_id = store_id
+      true && super
     end
 
     # Custom attribute writer method with validation
@@ -194,12 +151,9 @@ module OpenapiClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          store_id == o.store_id &&
-          request_type == o.request_type &&
-          security_code == o.security_code &&
-          billing_address == o.billing_address &&
           payer_authentication_response == o.payer_authentication_response &&
-          merchant_data == o.merchant_data
+          merchant_data == o.merchant_data &&
+          security_code == o.security_code && super(o)
     end
 
     # @see the `==` method
@@ -211,7 +165,7 @@ module OpenapiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [store_id, request_type, security_code, billing_address, payer_authentication_response, merchant_data].hash
+      [payer_authentication_response, merchant_data, security_code].hash
     end
 
     # Builds the object from hash
@@ -224,17 +178,18 @@ module OpenapiClient
     # Builds the object from hash
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
+    def build_from_hash(attributes, attribute_map = self.class.attribute_map, openapi_types = self.class.openapi_types)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
+      super(attributes, self.class.superclass.attribute_map, self.class.superclass.openapi_types)
+      openapi_types.each_pair do |key, type|
         if type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[attribute_map[key]].map { |v| _deserialize($1, v) })
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !attributes[attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -278,7 +233,12 @@ module OpenapiClient
           end
         end
       else # model
-        OpenapiClient.const_get(type).build_from_hash(value)
+        klass = OpenapiClient.const_get(type)
+        if klass.respond_to?(:openapi_discriminator_name)
+          klass = OpenapiClient.const_get(value[klass.attribute_map[klass.openapi_discriminator_name]])
+        end
+ 
+        klass.build_from_hash(value)
       end
     end
 
@@ -296,11 +256,15 @@ module OpenapiClient
 
     # Returns the object in the form of hash
     # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+    def to_hash(attribute_map = self.class.attribute_map, openapi_nullable = Set.new([]))
+      hash = super(self.class.superclass.attribute_map, openapi_nullable)
+      attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
         hash[param] = _to_hash(value)
       end
       hash