first_data_gateway 1.5.0 → 1.8.1

data/lib/openapi_client/models/transaction_error_response.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.9.1.20191223.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
 
@@ -43,6 +43,9 @@ module OpenapiClient
     # The terminal that is processing the transaction.
     attr_accessor :terminal_id
 
+    # The unique (on Acquirer level) mechant ID. Usually this value has been chosen from the merchant itself and will be used in communication with the endpoint.
+    attr_accessor :merchant_id
+
     # The unique merchant transaction ID from the request header, if supplied.
     attr_accessor :merchant_transaction_id
 
@@ -51,10 +54,10 @@ module OpenapiClient
 
     attr_accessor :approved_amount
 
-    # The status of the transaction. APPROVED/WAITING are returned by the endpoints.  VALIDATION_FAILED/DECLINED are errors. See ErrorResponse object for details.
+    # Represents the status of a transaction immediately following the original processing request. This value is not stored for the transaction and is only available in the response when the transaction is processed. TransactionStatus is not returned on either the transaction inquiry or on the order inquiry.
     attr_accessor :transaction_status
 
-    # The state of the transaction.
+    # Shows the state of the current transaction.
     attr_accessor :transaction_state
 
     attr_accessor :secure3d_response
@@ -62,7 +65,7 @@ module OpenapiClient
     # The endpoint redirection URL.
     attr_accessor :redirect_url
 
-    attr_accessor :authentication_redirect
+    attr_accessor :authentication_response
 
     # The transaction ID received from schemes for the initial transaction of card on file flows.
     attr_accessor :scheme_transaction_id
@@ -73,6 +76,10 @@ module OpenapiClient
 
     attr_accessor :account_updater_response
 
+    attr_accessor :ach_response
+
+    attr_accessor :currency_conversion_response
+
     attr_accessor :error
 
     class EnumAttributeValidator
@@ -111,6 +118,7 @@ module OpenapiClient
         :'payment_method_details' => :'paymentMethodDetails',
         :'country' => :'country',
         :'terminal_id' => :'terminalId',
+        :'merchant_id' => :'merchantId',
         :'merchant_transaction_id' => :'merchantTransactionId',
         :'transaction_time' => :'transactionTime',
         :'approved_amount' => :'approvedAmount',
@@ -118,11 +126,13 @@ module OpenapiClient
         :'transaction_state' => :'transactionState',
         :'secure3d_response' => :'secure3dResponse',
         :'redirect_url' => :'redirectURL',
-        :'authentication_redirect' => :'authenticationRedirect',
+        :'authentication_response' => :'authenticationResponse',
         :'scheme_transaction_id' => :'schemeTransactionId',
         :'processor' => :'processor',
         :'additional_details' => :'additionalDetails',
         :'account_updater_response' => :'accountUpdaterResponse',
+        :'ach_response' => :'achResponse',
+        :'currency_conversion_response' => :'currencyConversionResponse',
         :'error' => :'error'
       }
     end
@@ -141,6 +151,7 @@ module OpenapiClient
         :'payment_method_details' => :'PaymentMethodDetails',
         :'country' => :'String',
         :'terminal_id' => :'String',
+        :'merchant_id' => :'String',
         :'merchant_transaction_id' => :'String',
         :'transaction_time' => :'Integer',
         :'approved_amount' => :'Amount',
@@ -148,11 +159,13 @@ module OpenapiClient
         :'transaction_state' => :'String',
         :'secure3d_response' => :'Secure3dResponse',
         :'redirect_url' => :'String',
-        :'authentication_redirect' => :'AuthenticationRedirect',
+        :'authentication_response' => :'Secure3DAuthenticationResponse',
         :'scheme_transaction_id' => :'String',
         :'processor' => :'ProcessorData',
         :'additional_details' => :'AdditionalTransactionDetails',
         :'account_updater_response' => :'AccountUpdaterResponse',
+        :'ach_response' => :'AchResponse',
+        :'currency_conversion_response' => :'CurrencyConversionResponse',
         :'error' => :'Error'
       }
     end
@@ -223,6 +236,10 @@ module OpenapiClient
         self.terminal_id = attributes[:'terminal_id']
       end
 
+      if attributes.key?(:'merchant_id')
+        self.merchant_id = attributes[:'merchant_id']
+      end
+
       if attributes.key?(:'merchant_transaction_id')
         self.merchant_transaction_id = attributes[:'merchant_transaction_id']
       end
@@ -251,8 +268,8 @@ module OpenapiClient
         self.redirect_url = attributes[:'redirect_url']
       end
 
-      if attributes.key?(:'authentication_redirect')
-        self.authentication_redirect = attributes[:'authentication_redirect']
+      if attributes.key?(:'authentication_response')
+        self.authentication_response = attributes[:'authentication_response']
       end
 
       if attributes.key?(:'scheme_transaction_id')
@@ -271,6 +288,14 @@ module OpenapiClient
         self.account_updater_response = attributes[:'account_updater_response']
       end
 
+      if attributes.key?(:'ach_response')
+        self.ach_response = attributes[:'ach_response']
+      end
+
+      if attributes.key?(:'currency_conversion_response')
+        self.currency_conversion_response = attributes[:'currency_conversion_response']
+      end
+
       if attributes.key?(:'error')
         self.error = attributes[:'error']
       end
@@ -280,6 +305,10 @@ module OpenapiClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
+      if !@merchant_id.nil? && @merchant_id.to_s.length > 30
+        invalid_properties.push('invalid value for "merchant_id", the character length must be smaller than or equal to 30.')
+      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
@@ -294,6 +323,7 @@ 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 !@merchant_id.nil? && @merchant_id.to_s.length > 30
       return false if !@merchant_transaction_id.nil? && @merchant_transaction_id.to_s.length > 40
       transaction_status_validator = EnumAttributeValidator.new('String', ["APPROVED", "WAITING", "VALIDATION_FAILED", "PROCESSING_FAILED", "DECLINED"])
       return false unless transaction_status_validator.valid?(@transaction_status)
@@ -303,6 +333,16 @@ module OpenapiClient
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] merchant_id Value to be assigned
+    def merchant_id=(merchant_id)
+      if !merchant_id.nil? && merchant_id.to_s.length > 30
+        fail ArgumentError, 'invalid value for "merchant_id", the character length must be smaller than or equal to 30.'
+      end
+
+      @merchant_id = merchant_id
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] merchant_transaction_id Value to be assigned
     def merchant_transaction_id=(merchant_transaction_id)
@@ -359,6 +399,7 @@ module OpenapiClient
           payment_method_details == o.payment_method_details &&
           country == o.country &&
           terminal_id == o.terminal_id &&
+          merchant_id == o.merchant_id &&
           merchant_transaction_id == o.merchant_transaction_id &&
           transaction_time == o.transaction_time &&
           approved_amount == o.approved_amount &&
@@ -366,11 +407,13 @@ module OpenapiClient
           transaction_state == o.transaction_state &&
           secure3d_response == o.secure3d_response &&
           redirect_url == o.redirect_url &&
-          authentication_redirect == o.authentication_redirect &&
+          authentication_response == o.authentication_response &&
           scheme_transaction_id == o.scheme_transaction_id &&
           processor == o.processor &&
           additional_details == o.additional_details &&
           account_updater_response == o.account_updater_response &&
+          ach_response == o.ach_response &&
+          currency_conversion_response == o.currency_conversion_response &&
           error == o.error
     end
 
@@ -383,7 +426,7 @@ module OpenapiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [client_request_id, api_trace_id, response_type, ipg_transaction_id, order_id, transaction_type, payment_token, transaction_origin, payment_method_details, country, terminal_id, merchant_transaction_id, transaction_time, approved_amount, transaction_status, transaction_state, secure3d_response, redirect_url, authentication_redirect, scheme_transaction_id, processor, additional_details, account_updater_response, error].hash
+      [client_request_id, api_trace_id, response_type, ipg_transaction_id, order_id, transaction_type, payment_token, transaction_origin, payment_method_details, country, terminal_id, merchant_id, merchant_transaction_id, transaction_time, approved_amount, transaction_status, transaction_state, secure3d_response, redirect_url, authentication_response, scheme_transaction_id, processor, additional_details, account_updater_response, ach_response, currency_conversion_response, error].hash
     end
 
     # Builds the object from hash
@@ -396,17 +439,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
 
@@ -450,7 +493,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
 
@@ -468,11 +516,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/transaction_origin.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.9.1.20191223.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
 

data/lib/openapi_client/models/transaction_response.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.9.1.20191223.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
 
@@ -43,6 +43,9 @@ module OpenapiClient
     # The terminal that is processing the transaction.
     attr_accessor :terminal_id
 
+    # The unique (on Acquirer level) mechant ID. Usually this value has been chosen from the merchant itself and will be used in communication with the endpoint.
+    attr_accessor :merchant_id
+
     # The unique merchant transaction ID from the request header, if supplied.
     attr_accessor :merchant_transaction_id
 
@@ -51,10 +54,10 @@ module OpenapiClient
 
     attr_accessor :approved_amount
 
-    # The status of the transaction. APPROVED/WAITING are returned by the endpoints.  VALIDATION_FAILED/DECLINED are errors. See ErrorResponse object for details.
+    # Represents the status of a transaction immediately following the original processing request. This value is not stored for the transaction and is only available in the response when the transaction is processed. TransactionStatus is not returned on either the transaction inquiry or on the order inquiry.
     attr_accessor :transaction_status
 
-    # The state of the transaction.
+    # Shows the state of the current transaction.
     attr_accessor :transaction_state
 
     attr_accessor :secure3d_response
@@ -62,7 +65,7 @@ module OpenapiClient
     # The endpoint redirection URL.
     attr_accessor :redirect_url
 
-    attr_accessor :authentication_redirect
+    attr_accessor :authentication_response
 
     # The transaction ID received from schemes for the initial transaction of card on file flows.
     attr_accessor :scheme_transaction_id
@@ -73,6 +76,10 @@ module OpenapiClient
 
     attr_accessor :account_updater_response
 
+    attr_accessor :ach_response
+
+    attr_accessor :currency_conversion_response
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -109,6 +116,7 @@ module OpenapiClient
         :'payment_method_details' => :'paymentMethodDetails',
         :'country' => :'country',
         :'terminal_id' => :'terminalId',
+        :'merchant_id' => :'merchantId',
         :'merchant_transaction_id' => :'merchantTransactionId',
         :'transaction_time' => :'transactionTime',
         :'approved_amount' => :'approvedAmount',
@@ -116,11 +124,13 @@ module OpenapiClient
         :'transaction_state' => :'transactionState',
         :'secure3d_response' => :'secure3dResponse',
         :'redirect_url' => :'redirectURL',
-        :'authentication_redirect' => :'authenticationRedirect',
+        :'authentication_response' => :'authenticationResponse',
         :'scheme_transaction_id' => :'schemeTransactionId',
         :'processor' => :'processor',
         :'additional_details' => :'additionalDetails',
-        :'account_updater_response' => :'accountUpdaterResponse'
+        :'account_updater_response' => :'accountUpdaterResponse',
+        :'ach_response' => :'achResponse',
+        :'currency_conversion_response' => :'currencyConversionResponse'
       }
     end
 
@@ -138,6 +148,7 @@ module OpenapiClient
         :'payment_method_details' => :'PaymentMethodDetails',
         :'country' => :'String',
         :'terminal_id' => :'String',
+        :'merchant_id' => :'String',
         :'merchant_transaction_id' => :'String',
         :'transaction_time' => :'Integer',
         :'approved_amount' => :'Amount',
@@ -145,11 +156,13 @@ module OpenapiClient
         :'transaction_state' => :'String',
         :'secure3d_response' => :'Secure3dResponse',
         :'redirect_url' => :'String',
-        :'authentication_redirect' => :'AuthenticationRedirect',
+        :'authentication_response' => :'Secure3DAuthenticationResponse',
         :'scheme_transaction_id' => :'String',
         :'processor' => :'ProcessorData',
         :'additional_details' => :'AdditionalTransactionDetails',
-        :'account_updater_response' => :'AccountUpdaterResponse'
+        :'account_updater_response' => :'AccountUpdaterResponse',
+        :'ach_response' => :'AchResponse',
+        :'currency_conversion_response' => :'CurrencyConversionResponse'
       }
     end
 
@@ -219,6 +232,10 @@ module OpenapiClient
         self.terminal_id = attributes[:'terminal_id']
       end
 
+      if attributes.key?(:'merchant_id')
+        self.merchant_id = attributes[:'merchant_id']
+      end
+
       if attributes.key?(:'merchant_transaction_id')
         self.merchant_transaction_id = attributes[:'merchant_transaction_id']
       end
@@ -247,8 +264,8 @@ module OpenapiClient
         self.redirect_url = attributes[:'redirect_url']
       end
 
-      if attributes.key?(:'authentication_redirect')
-        self.authentication_redirect = attributes[:'authentication_redirect']
+      if attributes.key?(:'authentication_response')
+        self.authentication_response = attributes[:'authentication_response']
       end
 
       if attributes.key?(:'scheme_transaction_id')
@@ -266,12 +283,24 @@ module OpenapiClient
       if attributes.key?(:'account_updater_response')
         self.account_updater_response = attributes[:'account_updater_response']
       end
+
+      if attributes.key?(:'ach_response')
+        self.ach_response = attributes[:'ach_response']
+      end
+
+      if attributes.key?(:'currency_conversion_response')
+        self.currency_conversion_response = attributes[:'currency_conversion_response']
+      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 !@merchant_id.nil? && @merchant_id.to_s.length > 30
+        invalid_properties.push('invalid value for "merchant_id", the character length must be smaller than or equal to 30.')
+      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
@@ -286,6 +315,7 @@ 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 !@merchant_id.nil? && @merchant_id.to_s.length > 30
       return false if !@merchant_transaction_id.nil? && @merchant_transaction_id.to_s.length > 40
       transaction_status_validator = EnumAttributeValidator.new('String', ["APPROVED", "WAITING", "VALIDATION_FAILED", "PROCESSING_FAILED", "DECLINED"])
       return false unless transaction_status_validator.valid?(@transaction_status)
@@ -295,6 +325,16 @@ module OpenapiClient
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] merchant_id Value to be assigned
+    def merchant_id=(merchant_id)
+      if !merchant_id.nil? && merchant_id.to_s.length > 30
+        fail ArgumentError, 'invalid value for "merchant_id", the character length must be smaller than or equal to 30.'
+      end
+
+      @merchant_id = merchant_id
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] merchant_transaction_id Value to be assigned
     def merchant_transaction_id=(merchant_transaction_id)
@@ -351,6 +391,7 @@ module OpenapiClient
           payment_method_details == o.payment_method_details &&
           country == o.country &&
           terminal_id == o.terminal_id &&
+          merchant_id == o.merchant_id &&
           merchant_transaction_id == o.merchant_transaction_id &&
           transaction_time == o.transaction_time &&
           approved_amount == o.approved_amount &&
@@ -358,11 +399,13 @@ module OpenapiClient
           transaction_state == o.transaction_state &&
           secure3d_response == o.secure3d_response &&
           redirect_url == o.redirect_url &&
-          authentication_redirect == o.authentication_redirect &&
+          authentication_response == o.authentication_response &&
           scheme_transaction_id == o.scheme_transaction_id &&
           processor == o.processor &&
           additional_details == o.additional_details &&
-          account_updater_response == o.account_updater_response
+          account_updater_response == o.account_updater_response &&
+          ach_response == o.ach_response &&
+          currency_conversion_response == o.currency_conversion_response
     end
 
     # @see the `==` method
@@ -374,7 +417,7 @@ module OpenapiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [client_request_id, api_trace_id, response_type, ipg_transaction_id, order_id, transaction_type, payment_token, transaction_origin, payment_method_details, country, terminal_id, merchant_transaction_id, transaction_time, approved_amount, transaction_status, transaction_state, secure3d_response, redirect_url, authentication_redirect, scheme_transaction_id, processor, additional_details, account_updater_response].hash
+      [client_request_id, api_trace_id, response_type, ipg_transaction_id, order_id, transaction_type, payment_token, transaction_origin, payment_method_details, country, terminal_id, merchant_id, merchant_transaction_id, transaction_time, approved_amount, transaction_status, transaction_state, secure3d_response, redirect_url, authentication_response, scheme_transaction_id, processor, additional_details, account_updater_response, ach_response, currency_conversion_response].hash
     end
 
     # Builds the object from hash
@@ -387,17 +430,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
 
@@ -441,7 +484,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
 
@@ -459,11 +507,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