first_data_gateway 1.6.0 → 1.7.0

data/lib/openapi_client/models/payment_token_payment_method.rb

@@ -3,7 +3,7 @@
 
 #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.10.1.20200226.002
+The version of the OpenAPI document: 6.12.0.20200605.001
 
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: unset
@@ -35,10 +35,15 @@ module OpenapiClient
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
     # List of class defined in allOf (OpenAPI v3)
     def self.openapi_all_of
       [
-      :'PaymentMethod',
       :'PaymentTokenPaymentMethodAllOf'
       ]
     end
@@ -116,17 +121,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
 
@@ -170,7 +175,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
 
@@ -188,11 +198,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 = self.class.openapi_nullable)
       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_token_payment_method_all_of.rb

@@ -3,7 +3,7 @@
 
 #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.10.1.20200226.002
+The version of the OpenAPI document: 6.12.0.20200605.001
 
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: unset
@@ -34,6 +34,12 @@ module OpenapiClient
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -107,17 +113,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
 
@@ -161,7 +167,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
 
@@ -179,11 +190,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 = self.class.openapi_nullable)
       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_token_pre_auth_transaction.rb

@@ -3,7 +3,7 @@
 
 #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.10.1.20200226.002
+The version of the OpenAPI document: 6.12.0.20200605.001
 
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: unset
@@ -15,21 +15,6 @@ require 'date'
 module OpenapiClient
   # Request to create pre-auth transaction using payment token.
   class PaymentTokenPreAuthTransaction < PrimaryTransaction
-    # 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
-
     attr_accessor :payment_method
 
     attr_accessor :stored_credentials
@@ -43,42 +28,41 @@ module OpenapiClient
 
     attr_accessor :authentication_result
 
+    # This flag can only be used in a preAuth transaction that updates the amount of a previous preAuth transaction to either increase the preAuth amount (DecrementalPreAuthFlag = false) or decrease the preAuth amount (DecrementalPreAuthFlag = true).
+    attr_accessor :decremental_flag
+
     # 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',
         :'stored_credentials' => :'storedCredentials',
         :'split_shipment' => :'splitShipment',
         :'settlement_split' => :'settlementSplit',
         :'authentication_request' => :'authenticationRequest',
-        :'authentication_result' => :'authenticationResult'
+        :'authentication_result' => :'authenticationResult',
+        :'decremental_flag' => :'decrementalFlag'
       }
     end
 
     # 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' => :'PaymentTokenPaymentMethod',
         :'stored_credentials' => :'StoredCredential',
         :'split_shipment' => :'SplitShipment',
         :'settlement_split' => :'Array<SubMerchantSplit>',
         :'authentication_request' => :'AuthenticationRequest',
-        :'authentication_result' => :'AuthenticationResult'
+        :'authentication_result' => :'AuthenticationResult',
+        :'decremental_flag' => :'Boolean'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
     # List of class defined in allOf (OpenAPI v3)
     def self.openapi_all_of
       [
@@ -105,30 +89,6 @@ module OpenapiClient
       # call parent's initialize
       super(attributes)
 
-      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
-
       if attributes.key?(:'payment_method')
         self.payment_method = attributes[:'payment_method']
       end
@@ -154,20 +114,18 @@ module OpenapiClient
       if attributes.key?(:'authentication_result')
         self.authentication_result = attributes[:'authentication_result']
       end
+
+      if attributes.key?(:'decremental_flag')
+        self.decremental_flag = attributes[:'decremental_flag']
+      else
+        self.decremental_flag = false
+      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 = super
-      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
-
       if @payment_method.nil?
         invalid_properties.push('invalid value for "payment_method", payment_method cannot be nil.')
       end
@@ -178,49 +136,22 @@ 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 !@merchant_transaction_id.nil? && @merchant_transaction_id.to_s.length > 40
       return false if @payment_method.nil?
       true && super
     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
-    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 &&
-          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 &&
           stored_credentials == o.stored_credentials &&
           split_shipment == o.split_shipment &&
           settlement_split == o.settlement_split &&
           authentication_request == o.authentication_request &&
-          authentication_result == o.authentication_result && super(o)
+          authentication_result == o.authentication_result &&
+          decremental_flag == o.decremental_flag && super(o)
     end
 
     # @see the `==` method
@@ -232,7 +163,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, stored_credentials, split_shipment, settlement_split, authentication_request, authentication_result].hash
+      [payment_method, stored_credentials, split_shipment, settlement_split, authentication_request, authentication_result, decremental_flag].hash
     end
 
     # Builds the object from hash
@@ -245,18 +176,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)
-      super(attributes)
-      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
 
@@ -300,7 +231,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
 
@@ -318,11 +254,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 = super
-      self.class.attribute_map.each_pair do |attr, param|
+    def to_hash(attribute_map = self.class.attribute_map, openapi_nullable = self.class.openapi_nullable)
+      hash = super(self.class.superclass.attribute_map, self.class.superclass.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_token_pre_auth_transaction_all_of.rb

@@ -3,7 +3,7 @@
 
 #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.10.1.20200226.002
+The version of the OpenAPI document: 6.12.0.20200605.001
 
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: unset
@@ -14,21 +14,6 @@ require 'date'
 
 module OpenapiClient
   class PaymentTokenPreAuthTransactionAllOf
-    # 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
-
     attr_accessor :payment_method
 
     attr_accessor :stored_credentials
@@ -42,42 +27,41 @@ module OpenapiClient
 
     attr_accessor :authentication_result
 
+    # This flag can only be used in a preAuth transaction that updates the amount of a previous preAuth transaction to either increase the preAuth amount (DecrementalPreAuthFlag = false) or decrease the preAuth amount (DecrementalPreAuthFlag = true).
+    attr_accessor :decremental_flag
+
     # 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',
         :'stored_credentials' => :'storedCredentials',
         :'split_shipment' => :'splitShipment',
         :'settlement_split' => :'settlementSplit',
         :'authentication_request' => :'authenticationRequest',
-        :'authentication_result' => :'authenticationResult'
+        :'authentication_result' => :'authenticationResult',
+        :'decremental_flag' => :'decrementalFlag'
       }
     end
 
     # 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' => :'PaymentTokenPaymentMethod',
         :'stored_credentials' => :'StoredCredential',
         :'split_shipment' => :'SplitShipment',
         :'settlement_split' => :'Array<SubMerchantSplit>',
         :'authentication_request' => :'AuthenticationRequest',
-        :'authentication_result' => :'AuthenticationResult'
+        :'authentication_result' => :'AuthenticationResult',
+        :'decremental_flag' => :'Boolean'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -93,30 +77,6 @@ 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
-
       if attributes.key?(:'payment_method')
         self.payment_method = attributes[:'payment_method']
       end
@@ -142,20 +102,18 @@ module OpenapiClient
       if attributes.key?(:'authentication_result')
         self.authentication_result = attributes[:'authentication_result']
       end
+
+      if attributes.key?(:'decremental_flag')
+        self.decremental_flag = attributes[:'decremental_flag']
+      else
+        self.decremental_flag = false
+      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 !@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
-
       if @payment_method.nil?
         invalid_properties.push('invalid value for "payment_method", payment_method cannot be nil.')
       end
@@ -166,49 +124,22 @@ 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 !@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
-    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 &&
-          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 &&
           stored_credentials == o.stored_credentials &&
           split_shipment == o.split_shipment &&
           settlement_split == o.settlement_split &&
           authentication_request == o.authentication_request &&
-          authentication_result == o.authentication_result
+          authentication_result == o.authentication_result &&
+          decremental_flag == o.decremental_flag
     end
 
     # @see the `==` method
@@ -220,7 +151,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, stored_credentials, split_shipment, settlement_split, authentication_request, authentication_result].hash
+      [payment_method, stored_credentials, split_shipment, settlement_split, authentication_request, authentication_result, decremental_flag].hash
     end
 
     # Builds the object from hash
@@ -233,17 +164,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
 
@@ -287,7 +218,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
 
@@ -305,11 +241,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 = self.class.openapi_nullable)
       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