first_data_gateway 1.4.0 → 1.8.0

data/lib/openapi_client/models/payment.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
 
@@ -256,17 +256,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
 
@@ -310,7 +310,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
 
@@ -328,11 +333,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/payment_card.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
 
@@ -28,8 +28,6 @@ module OpenapiClient
     # Name of the cardholder.
     attr_accessor :cardholder_name
 
-    attr_accessor :authentication
-
     # The payment card BIN.
     attr_accessor :bin
 
@@ -47,7 +45,6 @@ module OpenapiClient
         :'security_code' => :'securityCode',
         :'card_function' => :'cardFunction',
         :'cardholder_name' => :'cardholderName',
-        :'authentication' => :'authentication',
         :'bin' => :'bin',
         :'last4' => :'last4',
         :'brand' => :'brand'
@@ -62,7 +59,6 @@ module OpenapiClient
         :'security_code' => :'String',
         :'card_function' => :'CardFunction',
         :'cardholder_name' => :'String',
-        :'authentication' => :'Authentication',
         :'bin' => :'String',
         :'last4' => :'String',
         :'brand' => :'String'
@@ -104,10 +100,6 @@ module OpenapiClient
         self.cardholder_name = attributes[:'cardholder_name']
       end
 
-      if attributes.key?(:'authentication')
-        self.authentication = attributes[:'authentication']
-      end
-
       if attributes.key?(:'bin')
         self.bin = attributes[:'bin']
       end
@@ -209,7 +201,6 @@ module OpenapiClient
           security_code == o.security_code &&
           card_function == o.card_function &&
           cardholder_name == o.cardholder_name &&
-          authentication == o.authentication &&
           bin == o.bin &&
           last4 == o.last4 &&
           brand == o.brand
@@ -224,7 +215,7 @@ module OpenapiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [number, expiry_date, security_code, card_function, cardholder_name, authentication, bin, last4, brand].hash
+      [number, expiry_date, security_code, card_function, cardholder_name, bin, last4, brand].hash
     end
 
     # Builds the object from hash
@@ -237,17 +228,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
 
@@ -291,7 +282,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
 
@@ -309,11 +305,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/payment_card_credit_transaction.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,22 +14,7 @@ require 'date'
 
 module OpenapiClient
   # Request to create credit transaction using payment card.
-  class PaymentCardCreditTransaction
-    # Object name of the primary transaction request.
-    attr_accessor :request_type
-
-    attr_accessor :transaction_amount
-
-    # An optional outlet ID for clients that support multiple stores in the same app.
-    attr_accessor :store_id
-
-    # The unique merchant transaction ID from the request header, if supplied.
-    attr_accessor :merchant_transaction_id
-
-    attr_accessor :transaction_origin
-
-    attr_accessor :order
-
+  class PaymentCardCreditTransaction < PrimaryTransaction
     attr_accessor :payment_method
 
     attr_accessor :currency_conversion
@@ -37,12 +22,6 @@ module OpenapiClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'request_type' => :'requestType',
-        :'transaction_amount' => :'transactionAmount',
-        :'store_id' => :'storeId',
-        :'merchant_transaction_id' => :'merchantTransactionId',
-        :'transaction_origin' => :'transactionOrigin',
-        :'order' => :'order',
         :'payment_method' => :'paymentMethod',
         :'currency_conversion' => :'currencyConversion'
       }
@@ -51,12 +30,6 @@ module OpenapiClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'request_type' => :'String',
-        :'transaction_amount' => :'Amount',
-        :'store_id' => :'String',
-        :'merchant_transaction_id' => :'String',
-        :'transaction_origin' => :'TransactionOrigin',
-        :'order' => :'Order',
         :'payment_method' => :'PaymentCardPaymentMethod',
         :'currency_conversion' => :'CurrencyConversion'
       }
@@ -85,29 +58,8 @@ module OpenapiClient
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'request_type')
-        self.request_type = attributes[:'request_type']
-      end
-
-      if attributes.key?(:'transaction_amount')
-        self.transaction_amount = attributes[:'transaction_amount']
-      end
-
-      if attributes.key?(:'store_id')
-        self.store_id = attributes[:'store_id']
-      end
-
-      if attributes.key?(:'merchant_transaction_id')
-        self.merchant_transaction_id = attributes[:'merchant_transaction_id']
-      end
-
-      if attributes.key?(:'transaction_origin')
-        self.transaction_origin = attributes[:'transaction_origin']
-      end
-
-      if attributes.key?(:'order')
-        self.order = attributes[:'order']
-      end
+      # call parent's initialize
+      super(attributes)
 
       if attributes.key?(:'payment_method')
         self.payment_method = attributes[:'payment_method']
@@ -121,23 +73,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
-
-      if @transaction_amount.nil?
-        invalid_properties.push('invalid value for "transaction_amount", transaction_amount cannot be nil.')
-      end
-
-      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 !@merchant_transaction_id.nil? && @merchant_transaction_id.to_s.length > 40
-        invalid_properties.push('invalid value for "merchant_transaction_id", the character length must be smaller than or equal to 40.')
-      end
-
+      invalid_properties = super
       if @payment_method.nil?
         invalid_properties.push('invalid value for "payment_method", payment_method cannot be nil.')
       end
@@ -148,32 +84,8 @@ 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?
-      return false if @transaction_amount.nil?
-      return false if !@store_id.nil? && @store_id.to_s.length > 20
-      return false if !@merchant_transaction_id.nil? && @merchant_transaction_id.to_s.length > 40
       return false if @payment_method.nil?
-      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
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] merchant_transaction_id Value to be assigned
-    def merchant_transaction_id=(merchant_transaction_id)
-      if !merchant_transaction_id.nil? && merchant_transaction_id.to_s.length > 40
-        fail ArgumentError, 'invalid value for "merchant_transaction_id", the character length must be smaller than or equal to 40.'
-      end
-
-      @merchant_transaction_id = merchant_transaction_id
+      true && super
     end
 
     # Checks equality by comparing each attribute.
@@ -181,14 +93,8 @@ module OpenapiClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          request_type == o.request_type &&
-          transaction_amount == o.transaction_amount &&
-          store_id == o.store_id &&
-          merchant_transaction_id == o.merchant_transaction_id &&
-          transaction_origin == o.transaction_origin &&
-          order == o.order &&
           payment_method == o.payment_method &&
-          currency_conversion == o.currency_conversion
+          currency_conversion == o.currency_conversion && super(o)
     end
 
     # @see the `==` method
@@ -200,7 +106,7 @@ module OpenapiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [request_type, transaction_amount, store_id, merchant_transaction_id, transaction_origin, order, payment_method, currency_conversion].hash
+      [payment_method, currency_conversion].hash
     end
 
     # Builds the object from hash
@@ -213,17 +119,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
 
@@ -267,7 +174,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
 
@@ -285,11 +197,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/payment_card_disbursement_transaction.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,22 +14,7 @@ require 'date'
 
 module OpenapiClient
   # Request to create disbursement transaction using a payment card.
-  class PaymentCardDisbursementTransaction
-    # Object name of the primary transaction request.
-    attr_accessor :request_type
-
-    attr_accessor :transaction_amount
-
-    # An optional outlet ID for clients that support multiple stores in the same app.
-    attr_accessor :store_id
-
-    # The unique merchant transaction ID from the request header, if supplied.
-    attr_accessor :merchant_transaction_id
-
-    attr_accessor :transaction_origin
-
-    attr_accessor :order
-
+  class PaymentCardDisbursementTransaction < PrimaryTransaction
     attr_accessor :disbursement
 
     attr_accessor :payment_method
@@ -41,12 +26,6 @@ module OpenapiClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'request_type' => :'requestType',
-        :'transaction_amount' => :'transactionAmount',
-        :'store_id' => :'storeId',
-        :'merchant_transaction_id' => :'merchantTransactionId',
-        :'transaction_origin' => :'transactionOrigin',
-        :'order' => :'order',
         :'disbursement' => :'disbursement',
         :'payment_method' => :'paymentMethod',
         :'stored_credentials' => :'storedCredentials',
@@ -57,12 +36,6 @@ module OpenapiClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'request_type' => :'String',
-        :'transaction_amount' => :'Amount',
-        :'store_id' => :'String',
-        :'merchant_transaction_id' => :'String',
-        :'transaction_origin' => :'TransactionOrigin',
-        :'order' => :'Order',
         :'disbursement' => :'Disbursement',
         :'payment_method' => :'PaymentCardPaymentMethod',
         :'stored_credentials' => :'StoredCredential',
@@ -93,29 +66,8 @@ module OpenapiClient
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'request_type')
-        self.request_type = attributes[:'request_type']
-      end
-
-      if attributes.key?(:'transaction_amount')
-        self.transaction_amount = attributes[:'transaction_amount']
-      end
-
-      if attributes.key?(:'store_id')
-        self.store_id = attributes[:'store_id']
-      end
-
-      if attributes.key?(:'merchant_transaction_id')
-        self.merchant_transaction_id = attributes[:'merchant_transaction_id']
-      end
-
-      if attributes.key?(:'transaction_origin')
-        self.transaction_origin = attributes[:'transaction_origin']
-      end
-
-      if attributes.key?(:'order')
-        self.order = attributes[:'order']
-      end
+      # call parent's initialize
+      super(attributes)
 
       if attributes.key?(:'disbursement')
         self.disbursement = attributes[:'disbursement']
@@ -137,23 +89,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
-
-      if @transaction_amount.nil?
-        invalid_properties.push('invalid value for "transaction_amount", transaction_amount cannot be nil.')
-      end
-
-      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 !@merchant_transaction_id.nil? && @merchant_transaction_id.to_s.length > 40
-        invalid_properties.push('invalid value for "merchant_transaction_id", the character length must be smaller than or equal to 40.')
-      end
-
+      invalid_properties = super
       if @disbursement.nil?
         invalid_properties.push('invalid value for "disbursement", disbursement cannot be nil.')
       end
@@ -168,33 +104,9 @@ 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?
-      return false if @transaction_amount.nil?
-      return false if !@store_id.nil? && @store_id.to_s.length > 20
-      return false if !@merchant_transaction_id.nil? && @merchant_transaction_id.to_s.length > 40
       return false if @disbursement.nil?
       return false if @payment_method.nil?
-      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
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] merchant_transaction_id Value to be assigned
-    def merchant_transaction_id=(merchant_transaction_id)
-      if !merchant_transaction_id.nil? && merchant_transaction_id.to_s.length > 40
-        fail ArgumentError, 'invalid value for "merchant_transaction_id", the character length must be smaller than or equal to 40.'
-      end
-
-      @merchant_transaction_id = merchant_transaction_id
+      true && super
     end
 
     # Checks equality by comparing each attribute.
@@ -202,16 +114,10 @@ module OpenapiClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          request_type == o.request_type &&
-          transaction_amount == o.transaction_amount &&
-          store_id == o.store_id &&
-          merchant_transaction_id == o.merchant_transaction_id &&
-          transaction_origin == o.transaction_origin &&
-          order == o.order &&
           disbursement == o.disbursement &&
           payment_method == o.payment_method &&
           stored_credentials == o.stored_credentials &&
-          create_token == o.create_token
+          create_token == o.create_token && super(o)
     end
 
     # @see the `==` method
@@ -223,7 +129,7 @@ module OpenapiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [request_type, transaction_amount, store_id, merchant_transaction_id, transaction_origin, order, disbursement, payment_method, stored_credentials, create_token].hash
+      [disbursement, payment_method, stored_credentials, create_token].hash
     end
 
     # Builds the object from hash
@@ -236,17 +142,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
 
@@ -290,7 +197,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
 
@@ -308,11 +220,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