velopayments 2.20.29.beta1 → 2.29.128.beta1

data/lib/velopayments/models/{payee.rb → get_payee_list_response2.rb}

@@ -3,57 +3,52 @@
 
 ### Terms and Definitions  Throughout this document and the Velo platform the following terms are used:  * **Payor.** An entity (typically a corporation) which wishes to pay funds to one or more payees via a payout. * **Payee.** The recipient of funds paid out by a payor. * **Payment.** A single transfer of funds from a payor to a payee. * **Payout.** A batch of Payments, typically used by a payor to logically group payments (e.g. by business day). Technically there need be no relationship between the payments in a payout - a single payout can contain payments to multiple payees and/or multiple payments to a single payee. * **Sandbox.** An integration environment provided by Velo Payments which offers a similar API experience to the production environment, but all funding and payment events are simulated, along with many other services such as OFAC sanctions list checking.  ## Overview  The Velo Payments API allows a payor to perform a number of operations. The following is a list of the main capabilities in a natural order of execution:  * Authenticate with the Velo platform * Maintain a collection of payees * Query the payor’s current balance of funds within the platform and perform additional funding * Issue payments to payees * Query the platform for a history of those payments  This document describes the main concepts and APIs required to get up and running with the Velo Payments platform. It is not an exhaustive API reference. For that, please see the separate Velo Payments API Reference.  ## API Considerations  The Velo Payments API is REST based and uses the JSON format for requests and responses.  Most calls are secured using OAuth 2 security and require a valid authentication access token for successful operation. See the Authentication section for details.  Where a dynamic value is required in the examples below, the {token} format is used, suggesting that the caller needs to supply the appropriate value of the token in question (without including the { or } characters).  Where curl examples are given, the –d @filename.json approach is used, indicating that the request body should be placed into a file named filename.json in the current directory. Each of the curl examples in this document should be considered a single line on the command-line, regardless of how they appear in print.  ## Authenticating with the Velo Platform  Once Velo backoffice staff have added your organization as a payor within the Velo platform sandbox, they will create you a payor Id, an API key and an API secret and share these with you in a secure manner.  You will need to use these values to authenticate with the Velo platform in order to gain access to the APIs. The steps to take are explained in the following:  create a string comprising the API key (e.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8) and API secret (e.g. c396b26b-137a-44fd-87f5-34631f8fd529) with a colon between them. E.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8:c396b26b-137a-44fd-87f5-34631f8fd529  base64 encode this string. E.g.: NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  create an HTTP **Authorization** header with the value set to e.g. Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  perform the Velo authentication REST call using the HTTP header created above e.g. via curl:  ```   curl -X POST \\   -H \"Content-Type: application/json\" \\   -H \"Authorization: Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==\" \\   'https://api.sandbox.velopayments.com/v1/authenticate?grant_type=client_credentials' ```  If successful, this call will result in a **200** HTTP status code and a response body such as:  ```   {     \"access_token\":\"19f6bafd-93fd-4747-b229-00507bbc991f\",     \"token_type\":\"bearer\",     \"expires_in\":1799,     \"scope\":\"...\"   } ``` ## API access following authentication Following successful authentication, the value of the access_token field in the response (indicated in green above) should then be presented with all subsequent API calls to allow the Velo platform to validate that the caller is authenticated.  This is achieved by setting the HTTP Authorization header with the value set to e.g. Bearer 19f6bafd-93fd-4747-b229-00507bbc991f such as the curl example below:  ```   -H \"Authorization: Bearer 19f6bafd-93fd-4747-b229-00507bbc991f \" ```  If you make other Velo API calls which require authorization but the Authorization header is missing or invalid then you will get a **401** HTTP status response. 
 
-The version of the OpenAPI document: 2.20.29
+The version of the OpenAPI document: 2.29.128
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 
 require 'date'
+require 'time'
 
 module VeloPayments
-  class Payee
+  class GetPayeeListResponse2
     attr_accessor :payee_id
 
     attr_accessor :payor_refs
 
     attr_accessor :email
 
-    attr_accessor :address
+    attr_accessor :onboarded_status
 
-    attr_accessor :country
+    attr_accessor :watchlist_status
 
-    attr_accessor :display_name
+    attr_accessor :watchlist_status_updated_timestamp
 
-    attr_accessor :payment_channel
-
-    attr_accessor :challenge
+    attr_accessor :watchlist_override_comment
 
+    # An IETF BCP 47 language code which has been configured for use within this Velo environment.<BR> See the /v1/supportedLanguages endpoint to list the available codes for an environment. 
     attr_accessor :language
 
-    # The timestamp when the payee last accepted T&Cs
-    attr_accessor :accept_terms_and_conditions_timestamp
-
-    attr_accessor :cellphone_number
-
-    attr_accessor :payee_type
+    attr_accessor :created
 
-    attr_accessor :company
+    attr_accessor :country
 
-    attr_accessor :individual
+    attr_accessor :display_name
 
-    attr_accessor :created
+    attr_accessor :payee_type
 
-    attr_accessor :grace_period_end_date
+    attr_accessor :disabled
 
-    attr_accessor :last_ofac_check_timestamp
+    attr_accessor :disabled_comment
 
-    attr_accessor :marketing_opt_ins
+    attr_accessor :disabled_updated_timestamp
 
-    attr_accessor :ofac_status
+    attr_accessor :individual
 
-    attr_accessor :onboarded_status
+    attr_accessor :company
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
@@ -61,49 +56,48 @@ module VeloPayments
         :'payee_id' => :'payeeId',
         :'payor_refs' => :'payorRefs',
         :'email' => :'email',
-        :'address' => :'address',
+        :'onboarded_status' => :'onboardedStatus',
+        :'watchlist_status' => :'watchlistStatus',
+        :'watchlist_status_updated_timestamp' => :'watchlistStatusUpdatedTimestamp',
+        :'watchlist_override_comment' => :'watchlistOverrideComment',
+        :'language' => :'language',
+        :'created' => :'created',
         :'country' => :'country',
         :'display_name' => :'displayName',
-        :'payment_channel' => :'paymentChannel',
-        :'challenge' => :'challenge',
-        :'language' => :'language',
-        :'accept_terms_and_conditions_timestamp' => :'acceptTermsAndConditionsTimestamp',
-        :'cellphone_number' => :'cellphoneNumber',
         :'payee_type' => :'payeeType',
-        :'company' => :'company',
+        :'disabled' => :'disabled',
+        :'disabled_comment' => :'disabledComment',
+        :'disabled_updated_timestamp' => :'disabledUpdatedTimestamp',
         :'individual' => :'individual',
-        :'created' => :'created',
-        :'grace_period_end_date' => :'gracePeriodEndDate',
-        :'last_ofac_check_timestamp' => :'lastOfacCheckTimestamp',
-        :'marketing_opt_ins' => :'marketingOptIns',
-        :'ofac_status' => :'ofacStatus',
-        :'onboarded_status' => :'onboardedStatus'
+        :'company' => :'company'
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
         :'payee_id' => :'String',
         :'payor_refs' => :'Array<PayeePayorRef>',
         :'email' => :'String',
-        :'address' => :'PayeeAddress',
+        :'onboarded_status' => :'OnboardedStatus',
+        :'watchlist_status' => :'WatchlistStatus2',
+        :'watchlist_status_updated_timestamp' => :'String',
+        :'watchlist_override_comment' => :'String',
+        :'language' => :'String',
+        :'created' => :'Time',
         :'country' => :'String',
         :'display_name' => :'String',
-        :'payment_channel' => :'PayeePaymentChannel',
-        :'challenge' => :'Challenge',
-        :'language' => :'Language',
-        :'accept_terms_and_conditions_timestamp' => :'DateTime',
-        :'cellphone_number' => :'String',
-        :'payee_type' => :'PayeeType',
-        :'company' => :'CompanyV1',
-        :'individual' => :'IndividualV1',
-        :'created' => :'DateTime',
-        :'grace_period_end_date' => :'Date',
-        :'last_ofac_check_timestamp' => :'String',
-        :'marketing_opt_ins' => :'Array<MarketingOptIn>',
-        :'ofac_status' => :'OfacStatus',
-        :'onboarded_status' => :'OnboardedStatus'
+        :'payee_type' => :'PayeeType2',
+        :'disabled' => :'Boolean',
+        :'disabled_comment' => :'String',
+        :'disabled_updated_timestamp' => :'Time',
+        :'individual' => :'GetPayeeListResponseIndividual2',
+        :'company' => :'GetPayeeListResponseCompany2'
       }
     end
 
@@ -112,10 +106,8 @@ module VeloPayments
       Set.new([
         :'payor_refs',
         :'email',
-        :'accept_terms_and_conditions_timestamp',
-        :'company',
-        :'grace_period_end_date',
-        :'last_ofac_check_timestamp',
+        :'watchlist_status_updated_timestamp',
+        :'watchlist_override_comment',
       ])
     end
 
@@ -123,13 +115,13 @@ module VeloPayments
     # @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 `VeloPayments::Payee` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `VeloPayments::GetPayeeListResponse2` 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 `VeloPayments::Payee`. 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 `VeloPayments::GetPayeeListResponse2`. 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
       }
@@ -148,74 +140,60 @@ module VeloPayments
         self.email = attributes[:'email']
       end
 
-      if attributes.key?(:'address')
-        self.address = attributes[:'address']
-      end
-
-      if attributes.key?(:'country')
-        self.country = attributes[:'country']
+      if attributes.key?(:'onboarded_status')
+        self.onboarded_status = attributes[:'onboarded_status']
       end
 
-      if attributes.key?(:'display_name')
-        self.display_name = attributes[:'display_name']
+      if attributes.key?(:'watchlist_status')
+        self.watchlist_status = attributes[:'watchlist_status']
       end
 
-      if attributes.key?(:'payment_channel')
-        self.payment_channel = attributes[:'payment_channel']
+      if attributes.key?(:'watchlist_status_updated_timestamp')
+        self.watchlist_status_updated_timestamp = attributes[:'watchlist_status_updated_timestamp']
       end
 
-      if attributes.key?(:'challenge')
-        self.challenge = attributes[:'challenge']
+      if attributes.key?(:'watchlist_override_comment')
+        self.watchlist_override_comment = attributes[:'watchlist_override_comment']
       end
 
       if attributes.key?(:'language')
         self.language = attributes[:'language']
       end
 
-      if attributes.key?(:'accept_terms_and_conditions_timestamp')
-        self.accept_terms_and_conditions_timestamp = attributes[:'accept_terms_and_conditions_timestamp']
-      end
-
-      if attributes.key?(:'cellphone_number')
-        self.cellphone_number = attributes[:'cellphone_number']
-      end
-
-      if attributes.key?(:'payee_type')
-        self.payee_type = attributes[:'payee_type']
+      if attributes.key?(:'created')
+        self.created = attributes[:'created']
       end
 
-      if attributes.key?(:'company')
-        self.company = attributes[:'company']
+      if attributes.key?(:'country')
+        self.country = attributes[:'country']
       end
 
-      if attributes.key?(:'individual')
-        self.individual = attributes[:'individual']
+      if attributes.key?(:'display_name')
+        self.display_name = attributes[:'display_name']
       end
 
-      if attributes.key?(:'created')
-        self.created = attributes[:'created']
+      if attributes.key?(:'payee_type')
+        self.payee_type = attributes[:'payee_type']
       end
 
-      if attributes.key?(:'grace_period_end_date')
-        self.grace_period_end_date = attributes[:'grace_period_end_date']
+      if attributes.key?(:'disabled')
+        self.disabled = attributes[:'disabled']
       end
 
-      if attributes.key?(:'last_ofac_check_timestamp')
-        self.last_ofac_check_timestamp = attributes[:'last_ofac_check_timestamp']
+      if attributes.key?(:'disabled_comment')
+        self.disabled_comment = attributes[:'disabled_comment']
       end
 
-      if attributes.key?(:'marketing_opt_ins')
-        if (value = attributes[:'marketing_opt_ins']).is_a?(Array)
-          self.marketing_opt_ins = value
-        end
+      if attributes.key?(:'disabled_updated_timestamp')
+        self.disabled_updated_timestamp = attributes[:'disabled_updated_timestamp']
       end
 
-      if attributes.key?(:'ofac_status')
-        self.ofac_status = attributes[:'ofac_status']
+      if attributes.key?(:'individual')
+        self.individual = attributes[:'individual']
       end
 
-      if attributes.key?(:'onboarded_status')
-        self.onboarded_status = attributes[:'onboarded_status']
+      if attributes.key?(:'company')
+        self.company = attributes[:'company']
       end
     end
 
@@ -240,23 +218,20 @@ module VeloPayments
           payee_id == o.payee_id &&
           payor_refs == o.payor_refs &&
           email == o.email &&
-          address == o.address &&
+          onboarded_status == o.onboarded_status &&
+          watchlist_status == o.watchlist_status &&
+          watchlist_status_updated_timestamp == o.watchlist_status_updated_timestamp &&
+          watchlist_override_comment == o.watchlist_override_comment &&
+          language == o.language &&
+          created == o.created &&
           country == o.country &&
           display_name == o.display_name &&
-          payment_channel == o.payment_channel &&
-          challenge == o.challenge &&
-          language == o.language &&
-          accept_terms_and_conditions_timestamp == o.accept_terms_and_conditions_timestamp &&
-          cellphone_number == o.cellphone_number &&
           payee_type == o.payee_type &&
-          company == o.company &&
+          disabled == o.disabled &&
+          disabled_comment == o.disabled_comment &&
+          disabled_updated_timestamp == o.disabled_updated_timestamp &&
           individual == o.individual &&
-          created == o.created &&
-          grace_period_end_date == o.grace_period_end_date &&
-          last_ofac_check_timestamp == o.last_ofac_check_timestamp &&
-          marketing_opt_ins == o.marketing_opt_ins &&
-          ofac_status == o.ofac_status &&
-          onboarded_status == o.onboarded_status
+          company == o.company
     end
 
     # @see the `==` method
@@ -268,7 +243,7 @@ module VeloPayments
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [payee_id, payor_refs, email, address, country, display_name, payment_channel, challenge, language, accept_terms_and_conditions_timestamp, cellphone_number, payee_type, company, individual, created, grace_period_end_date, last_ofac_check_timestamp, marketing_opt_ins, ofac_status, onboarded_status].hash
+      [payee_id, payor_refs, email, onboarded_status, watchlist_status, watchlist_status_updated_timestamp, watchlist_override_comment, language, created, country, display_name, payee_type, disabled, disabled_comment, disabled_updated_timestamp, individual, company].hash
     end
 
     # Builds the object from hash
@@ -284,7 +259,9 @@ module VeloPayments
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif 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)
@@ -292,7 +269,7 @@ module VeloPayments
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self
@@ -304,8 +281,8 @@ module VeloPayments
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -335,7 +312,9 @@ module VeloPayments
           end
         end
       else # model
-        VeloPayments.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = VeloPayments.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -361,7 +340,7 @@ module VeloPayments
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -384,5 +363,7 @@ module VeloPayments
         value
       end
     end
+
   end
+
 end

data/lib/velopayments/models/{company_response.rb → get_payee_list_response_company.rb}

@@ -3,17 +3,18 @@
 
 ### Terms and Definitions  Throughout this document and the Velo platform the following terms are used:  * **Payor.** An entity (typically a corporation) which wishes to pay funds to one or more payees via a payout. * **Payee.** The recipient of funds paid out by a payor. * **Payment.** A single transfer of funds from a payor to a payee. * **Payout.** A batch of Payments, typically used by a payor to logically group payments (e.g. by business day). Technically there need be no relationship between the payments in a payout - a single payout can contain payments to multiple payees and/or multiple payments to a single payee. * **Sandbox.** An integration environment provided by Velo Payments which offers a similar API experience to the production environment, but all funding and payment events are simulated, along with many other services such as OFAC sanctions list checking.  ## Overview  The Velo Payments API allows a payor to perform a number of operations. The following is a list of the main capabilities in a natural order of execution:  * Authenticate with the Velo platform * Maintain a collection of payees * Query the payor’s current balance of funds within the platform and perform additional funding * Issue payments to payees * Query the platform for a history of those payments  This document describes the main concepts and APIs required to get up and running with the Velo Payments platform. It is not an exhaustive API reference. For that, please see the separate Velo Payments API Reference.  ## API Considerations  The Velo Payments API is REST based and uses the JSON format for requests and responses.  Most calls are secured using OAuth 2 security and require a valid authentication access token for successful operation. See the Authentication section for details.  Where a dynamic value is required in the examples below, the {token} format is used, suggesting that the caller needs to supply the appropriate value of the token in question (without including the { or } characters).  Where curl examples are given, the –d @filename.json approach is used, indicating that the request body should be placed into a file named filename.json in the current directory. Each of the curl examples in this document should be considered a single line on the command-line, regardless of how they appear in print.  ## Authenticating with the Velo Platform  Once Velo backoffice staff have added your organization as a payor within the Velo platform sandbox, they will create you a payor Id, an API key and an API secret and share these with you in a secure manner.  You will need to use these values to authenticate with the Velo platform in order to gain access to the APIs. The steps to take are explained in the following:  create a string comprising the API key (e.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8) and API secret (e.g. c396b26b-137a-44fd-87f5-34631f8fd529) with a colon between them. E.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8:c396b26b-137a-44fd-87f5-34631f8fd529  base64 encode this string. E.g.: NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  create an HTTP **Authorization** header with the value set to e.g. Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  perform the Velo authentication REST call using the HTTP header created above e.g. via curl:  ```   curl -X POST \\   -H \"Content-Type: application/json\" \\   -H \"Authorization: Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==\" \\   'https://api.sandbox.velopayments.com/v1/authenticate?grant_type=client_credentials' ```  If successful, this call will result in a **200** HTTP status code and a response body such as:  ```   {     \"access_token\":\"19f6bafd-93fd-4747-b229-00507bbc991f\",     \"token_type\":\"bearer\",     \"expires_in\":1799,     \"scope\":\"...\"   } ``` ## API access following authentication Following successful authentication, the value of the access_token field in the response (indicated in green above) should then be presented with all subsequent API calls to allow the Velo platform to validate that the caller is authenticated.  This is achieved by setting the HTTP Authorization header with the value set to e.g. Bearer 19f6bafd-93fd-4747-b229-00507bbc991f such as the curl example below:  ```   -H \"Authorization: Bearer 19f6bafd-93fd-4747-b229-00507bbc991f \" ```  If you make other Velo API calls which require authorization but the Authorization header is missing or invalid then you will get a **401** HTTP status response. 
 
-The version of the OpenAPI document: 2.20.29
+The version of the OpenAPI document: 2.29.128
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 
 require 'date'
+require 'time'
 
 module VeloPayments
-  class CompanyResponse
+  class GetPayeeListResponseCompany
     attr_accessor :name
 
     attr_accessor :operating_name
@@ -26,6 +27,11 @@ module VeloPayments
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -45,13 +51,13 @@ module VeloPayments
     # @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 `VeloPayments::CompanyResponse` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `VeloPayments::GetPayeeListResponseCompany` 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 `VeloPayments::CompanyResponse`. 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 `VeloPayments::GetPayeeListResponseCompany`. 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
       }
@@ -69,15 +75,11 @@ module VeloPayments
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @name.nil?
-        invalid_properties.push('invalid value for "name", name cannot be nil.')
-      end
-
-      if @name.to_s.length > 40
+      if !@name.nil? && @name.to_s.length > 40
         invalid_properties.push('invalid value for "name", the character length must be smaller than or equal to 40.')
       end
 
-      if @name.to_s.length < 1
+      if !@name.nil? && @name.to_s.length < 1
         invalid_properties.push('invalid value for "name", the character length must be great than or equal to 1.')
       end
 
@@ -95,9 +97,8 @@ module VeloPayments
     # 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 @name.nil?
-      return false if @name.to_s.length > 40
-      return false if @name.to_s.length < 1
+      return false if !@name.nil? && @name.to_s.length > 40
+      return false if !@name.nil? && @name.to_s.length < 1
       return false if !@operating_name.nil? && @operating_name.to_s.length > 100
       return false if !@operating_name.nil? && @operating_name.to_s.length < 1
       true
@@ -106,15 +107,11 @@ module VeloPayments
     # Custom attribute writer method with validation
     # @param [Object] name Value to be assigned
     def name=(name)
-      if name.nil?
-        fail ArgumentError, 'name cannot be nil'
-      end
-
-      if name.to_s.length > 40
+      if !name.nil? && name.to_s.length > 40
         fail ArgumentError, 'invalid value for "name", the character length must be smaller than or equal to 40.'
       end
 
-      if name.to_s.length < 1
+      if !name.nil? && name.to_s.length < 1
         fail ArgumentError, 'invalid value for "name", the character length must be great than or equal to 1.'
       end
 
@@ -169,7 +166,9 @@ module VeloPayments
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif 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)
@@ -177,7 +176,7 @@ module VeloPayments
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self
@@ -189,8 +188,8 @@ module VeloPayments
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -220,7 +219,9 @@ module VeloPayments
           end
         end
       else # model
-        VeloPayments.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = VeloPayments.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -246,7 +247,7 @@ module VeloPayments
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -269,5 +270,7 @@ module VeloPayments
         value
       end
     end
+
   end
+
 end