card-management-sdk 1.0.0 → 1.1.0

data/lib/shell_card_management_ap_is/exceptions/{error_user_access_error1_exception.rb → fleetmanagement_v1_customer_customer403_error_exception.rb}

@@ -4,8 +4,8 @@
 # ( https://apimatic.io ).
 
 module ShellCardManagementApIs
-  # ErrorUserAccess_Error1 class.
-  class ErrorUserAccessError1Exception < APIException
+  # Fleetmanagement V1 Customer Customer 403 Error class.
+  class FleetmanagementV1CustomerCustomer403ErrorException < APIException
     SKIP = Object.new
     private_constant :SKIP
 

data/lib/shell_card_management_ap_is/exceptions/{default_error_exception.rb → fleetmanagement_v1_customer_payers400_error_exception.rb}

@@ -4,13 +4,13 @@
 # ( https://apimatic.io ).
 
 module ShellCardManagementApIs
-  # Error response
-  class DefaultErrorException < APIException
+  # Fleetmanagement V1 Customer Payers 400 Error class.
+  class FleetmanagementV1CustomerPayers400ErrorException < APIException
     SKIP = Object.new
     private_constant :SKIP
 
-    # Error object
-    # @return [DefaultErrorFault]
+    # TODO: Write general description for this method
+    # @return [Fault]
     attr_accessor :fault
 
     # The constructor.
@@ -26,7 +26,7 @@ module ShellCardManagementApIs
     # @param [Hash] The deserialized response sent by the server in the
     # response body.
     def unbox(hash)
-      @fault = DefaultErrorFault.from_hash(hash['fault']) if hash['fault']
+      @fault = Fault.from_hash(hash['fault']) if hash['fault']
     end
   end
 end

data/lib/shell_card_management_ap_is/exceptions/fleetmanagement_v1_customer_payers404_error_exception.rb

@@ -0,0 +1,32 @@
+# shell_card_management_ap_is
+#
+# This file was automatically generated by APIMATIC v2.0
+# ( https://apimatic.io ).
+
+module ShellCardManagementApIs
+  # Fleetmanagement V1 Customer Payers 404 Error class.
+  class FleetmanagementV1CustomerPayers404ErrorException < APIException
+    SKIP = Object.new
+    private_constant :SKIP
+
+    # TODO: Write general description for this method
+    # @return [Fault]
+    attr_accessor :fault
+
+    # The constructor.
+    # @param [String] The reason for raising an exception.
+    # @param [HttpResponse] The HttpReponse of the API call.
+    def initialize(reason, response)
+      super(reason, response)
+      hash = APIHelper.json_deserialize(@response.raw_body)
+      unbox(hash)
+    end
+
+    # Populates this object by extracting properties from a hash.
+    # @param [Hash] The deserialized response sent by the server in the
+    # response body.
+    def unbox(hash)
+      @fault = Fault.from_hash(hash['fault']) if hash['fault']
+    end
+  end
+end

data/lib/shell_card_management_ap_is/exceptions/fleetmanagement_v1_user_loggedinuser400_error_exception.rb

@@ -0,0 +1,32 @@
+# shell_card_management_ap_is
+#
+# This file was automatically generated by APIMATIC v2.0
+# ( https://apimatic.io ).
+
+module ShellCardManagementApIs
+  # Fleetmanagement V1 User Loggedinuser 400 Error class.
+  class FleetmanagementV1UserLoggedinuser400ErrorException < APIException
+    SKIP = Object.new
+    private_constant :SKIP
+
+    # TODO: Write general description for this method
+    # @return [Fault]
+    attr_accessor :fault
+
+    # The constructor.
+    # @param [String] The reason for raising an exception.
+    # @param [HttpResponse] The HttpReponse of the API call.
+    def initialize(reason, response)
+      super(reason, response)
+      hash = APIHelper.json_deserialize(@response.raw_body)
+      unbox(hash)
+    end
+
+    # Populates this object by extracting properties from a hash.
+    # @param [Hash] The deserialized response sent by the server in the
+    # response body.
+    def unbox(hash)
+      @fault = Fault.from_hash(hash['fault']) if hash['fault']
+    end
+  end
+end

data/lib/shell_card_management_ap_is/exceptions/fleetmanagement_v1_user_loggedinuser401_error_exception.rb

@@ -0,0 +1,32 @@
+# shell_card_management_ap_is
+#
+# This file was automatically generated by APIMATIC v2.0
+# ( https://apimatic.io ).
+
+module ShellCardManagementApIs
+  # Fleetmanagement V1 User Loggedinuser 401 Error class.
+  class FleetmanagementV1UserLoggedinuser401ErrorException < APIException
+    SKIP = Object.new
+    private_constant :SKIP
+
+    # TODO: Write general description for this method
+    # @return [Fault]
+    attr_accessor :fault
+
+    # The constructor.
+    # @param [String] The reason for raising an exception.
+    # @param [HttpResponse] The HttpReponse of the API call.
+    def initialize(reason, response)
+      super(reason, response)
+      hash = APIHelper.json_deserialize(@response.raw_body)
+      unbox(hash)
+    end
+
+    # Populates this object by extracting properties from a hash.
+    # @param [Hash] The deserialized response sent by the server in the
+    # response body.
+    def unbox(hash)
+      @fault = Fault.from_hash(hash['fault']) if hash['fault']
+    end
+  end
+end

data/lib/shell_card_management_ap_is/exceptions/fleetmanagement_v1_user_loggedinuser403_error_exception.rb

@@ -0,0 +1,32 @@
+# shell_card_management_ap_is
+#
+# This file was automatically generated by APIMATIC v2.0
+# ( https://apimatic.io ).
+
+module ShellCardManagementApIs
+  # Fleetmanagement V1 User Loggedinuser 403 Error class.
+  class FleetmanagementV1UserLoggedinuser403ErrorException < APIException
+    SKIP = Object.new
+    private_constant :SKIP
+
+    # TODO: Write general description for this method
+    # @return [ErrorUserAccessError]
+    attr_accessor :error
+
+    # The constructor.
+    # @param [String] The reason for raising an exception.
+    # @param [HttpResponse] The HttpReponse of the API call.
+    def initialize(reason, response)
+      super(reason, response)
+      hash = APIHelper.json_deserialize(@response.raw_body)
+      unbox(hash)
+    end
+
+    # Populates this object by extracting properties from a hash.
+    # @param [Hash] The deserialized response sent by the server in the
+    # response body.
+    def unbox(hash)
+      @error = ErrorUserAccessError.from_hash(hash['Error']) if hash['Error']
+    end
+  end
+end

data/lib/shell_card_management_ap_is/exceptions/fleetmanagement_v1_user_loggedinuser404_error_exception.rb

@@ -0,0 +1,32 @@
+# shell_card_management_ap_is
+#
+# This file was automatically generated by APIMATIC v2.0
+# ( https://apimatic.io ).
+
+module ShellCardManagementApIs
+  # Fleetmanagement V1 User Loggedinuser 404 Error class.
+  class FleetmanagementV1UserLoggedinuser404ErrorException < APIException
+    SKIP = Object.new
+    private_constant :SKIP
+
+    # TODO: Write general description for this method
+    # @return [Fault]
+    attr_accessor :fault
+
+    # The constructor.
+    # @param [String] The reason for raising an exception.
+    # @param [HttpResponse] The HttpReponse of the API call.
+    def initialize(reason, response)
+      super(reason, response)
+      hash = APIHelper.json_deserialize(@response.raw_body)
+      unbox(hash)
+    end
+
+    # Populates this object by extracting properties from a hash.
+    # @param [Hash] The deserialized response sent by the server in the
+    # response body.
+    def unbox(hash)
+      @fault = Fault.from_hash(hash['fault']) if hash['fault']
+    end
+  end
+end

data/lib/shell_card_management_ap_is/exceptions/fleetmanagement_v1_user_loggedinuser500_error_exception.rb

@@ -0,0 +1,32 @@
+# shell_card_management_ap_is
+#
+# This file was automatically generated by APIMATIC v2.0
+# ( https://apimatic.io ).
+
+module ShellCardManagementApIs
+  # Fleetmanagement V1 User Loggedinuser 500 Error class.
+  class FleetmanagementV1UserLoggedinuser500ErrorException < APIException
+    SKIP = Object.new
+    private_constant :SKIP
+
+    # TODO: Write general description for this method
+    # @return [Fault]
+    attr_accessor :fault
+
+    # The constructor.
+    # @param [String] The reason for raising an exception.
+    # @param [HttpResponse] The HttpReponse of the API call.
+    def initialize(reason, response)
+      super(reason, response)
+      hash = APIHelper.json_deserialize(@response.raw_body)
+      unbox(hash)
+    end
+
+    # Populates this object by extracting properties from a hash.
+    # @param [Hash] The deserialized response sent by the server in the
+    # response body.
+    def unbox(hash)
+      @fault = Fault.from_hash(hash['fault']) if hash['fault']
+    end
+  end
+end

data/lib/shell_card_management_ap_is/exceptions/fleetmanagement_v2_restriction_searchcard401_error_exception.rb

@@ -0,0 +1,32 @@
+# shell_card_management_ap_is
+#
+# This file was automatically generated by APIMATIC v2.0
+# ( https://apimatic.io ).
+
+module ShellCardManagementApIs
+  # Fleetmanagement V2 Restriction Searchcard 401 Error class.
+  class FleetmanagementV2RestrictionSearchcard401ErrorException < APIException
+    SKIP = Object.new
+    private_constant :SKIP
+
+    # TODO: Write general description for this method
+    # @return [Fault]
+    attr_accessor :fault
+
+    # The constructor.
+    # @param [String] The reason for raising an exception.
+    # @param [HttpResponse] The HttpReponse of the API call.
+    def initialize(reason, response)
+      super(reason, response)
+      hash = APIHelper.json_deserialize(@response.raw_body)
+      unbox(hash)
+    end
+
+    # Populates this object by extracting properties from a hash.
+    # @param [Hash] The deserialized response sent by the server in the
+    # response body.
+    def unbox(hash)
+      @fault = Fault.from_hash(hash['fault']) if hash['fault']
+    end
+  end
+end

data/lib/shell_card_management_ap_is/exceptions/fleetmanagement_v2_restriction_searchcard500_error_exception.rb

@@ -0,0 +1,32 @@
+# shell_card_management_ap_is
+#
+# This file was automatically generated by APIMATIC v2.0
+# ( https://apimatic.io ).
+
+module ShellCardManagementApIs
+  # Fleetmanagement V2 Restriction Searchcard 500 Error class.
+  class FleetmanagementV2RestrictionSearchcard500ErrorException < APIException
+    SKIP = Object.new
+    private_constant :SKIP
+
+    # TODO: Write general description for this method
+    # @return [Fault]
+    attr_accessor :fault
+
+    # The constructor.
+    # @param [String] The reason for raising an exception.
+    # @param [HttpResponse] The HttpReponse of the API call.
+    def initialize(reason, response)
+      super(reason, response)
+      hash = APIHelper.json_deserialize(@response.raw_body)
+      unbox(hash)
+    end
+
+    # Populates this object by extracting properties from a hash.
+    # @param [Hash] The deserialized response sent by the server in the
+    # response body.
+    def unbox(hash)
+      @fault = Fault.from_hash(hash['fault']) if hash['fault']
+    end
+  end
+end

data/lib/shell_card_management_ap_is/http/auth/bearer_token.rb

@@ -15,23 +15,27 @@ module ShellCardManagementApIs
 
     # Initialization constructor.
     def initialize(bearer_token_credentials, config)
-      auth_params = {}
       @_o_auth_client_id = bearer_token_credentials.o_auth_client_id unless
         bearer_token_credentials.nil? || bearer_token_credentials.o_auth_client_id.nil?
       @_o_auth_client_secret = bearer_token_credentials.o_auth_client_secret unless
         bearer_token_credentials.nil? || bearer_token_credentials.o_auth_client_secret.nil?
       @_o_auth_token = bearer_token_credentials.o_auth_token unless
         bearer_token_credentials.nil? || bearer_token_credentials.o_auth_token.nil?
+      @_o_auth_clock_skew = bearer_token_credentials.o_auth_clock_skew unless
+        bearer_token_credentials.nil? || bearer_token_credentials.o_auth_clock_skew.nil?
+      @_o_auth_token_provider = bearer_token_credentials.o_auth_token_provider unless
+        bearer_token_credentials.nil? || bearer_token_credentials.o_auth_token_provider.nil?
+      @_o_auth_on_token_update = bearer_token_credentials.o_auth_on_token_update unless
+        bearer_token_credentials.nil? || bearer_token_credentials.o_auth_on_token_update.nil?
       @_o_auth_api = OAuthAuthorizationController.new(config)
-      auth_params['Authorization'] = "Bearer #{@_o_auth_token.access_token}" unless @_o_auth_token.nil?
-
-      super auth_params
+      super({})
     end
 
     # Validates the oAuth token.
     # @return [Boolean] true if the token is present and not expired.
     def valid
-      !@_o_auth_token.nil? && !token_expired?(@_o_auth_token)
+      @_o_auth_token = get_token_from_provider
+      @_o_auth_token.is_a?(OAuthToken) && !token_expired?(@_o_auth_token)
     end
 
     # Builds the basic auth header for endpoints in the OAuth Authorization Controller.
@@ -58,32 +62,72 @@ module ShellCardManagementApIs
     # @param [OAuthToken] token The oAuth token instance.
     # @return [Boolean] true if the token's expiry exist and also the token is expired, false otherwise.
     def token_expired?(token)
-      token.respond_to?('expiry') && AuthHelper.token_expired?(token.expiry)
+      token.respond_to?('expiry') && AuthHelper.token_expired?(token.expiry, @_o_auth_clock_skew)
+    end
+
+    def apply(http_request)
+      auth_params = { 'Authorization' => "Bearer #{@_o_auth_token.access_token}" }
+      AuthHelper.apply(auth_params, http_request.method(:add_header))
+    end
+
+    private
+
+    # This provides the OAuth Token from either the user configured callbacks or from default provider.
+    # @return [OAuthToken] The fetched oauth token.
+    def get_token_from_provider
+      return @_o_auth_token if @_o_auth_token && !token_expired?(@_o_auth_token)
+
+      if @_o_auth_token_provider
+        o_auth_token = @_o_auth_token_provider.call(@_o_auth_token, self)
+        @_o_auth_on_token_update&.call(o_auth_token)
+        return o_auth_token
+      end
+      begin
+        o_auth_token = fetch_token
+        @_o_auth_on_token_update&.call(o_auth_token)
+        o_auth_token
+      rescue ApiException
+        @_o_auth_token
+      end
     end
   end
 
   # Data class for BearerTokenCredentials.
   class BearerTokenCredentials
-    attr_reader :o_auth_client_id, :o_auth_client_secret, :o_auth_token
+    attr_reader :o_auth_client_id, :o_auth_client_secret, :o_auth_token,
+                :o_auth_token_provider, :o_auth_on_token_update,
+                :o_auth_clock_skew
 
-    def initialize(o_auth_client_id:, o_auth_client_secret:, o_auth_token: nil)
+    def initialize(o_auth_client_id:, o_auth_client_secret:, o_auth_token: nil,
+                   o_auth_token_provider: nil, o_auth_on_token_update: nil,
+                   o_auth_clock_skew: nil)
       raise ArgumentError, 'o_auth_client_id cannot be nil' if o_auth_client_id.nil?
       raise ArgumentError, 'o_auth_client_secret cannot be nil' if o_auth_client_secret.nil?
 
       @o_auth_client_id = o_auth_client_id
       @o_auth_client_secret = o_auth_client_secret
       @o_auth_token = o_auth_token
+      @o_auth_token_provider = o_auth_token_provider
+      @o_auth_on_token_update = o_auth_on_token_update
+      @o_auth_clock_skew = o_auth_clock_skew
     end
 
     def clone_with(o_auth_client_id: nil, o_auth_client_secret: nil,
-                   o_auth_token: nil)
+                   o_auth_token: nil, o_auth_token_provider: nil,
+                   o_auth_on_token_update: nil, o_auth_clock_skew: nil)
       o_auth_client_id ||= self.o_auth_client_id
       o_auth_client_secret ||= self.o_auth_client_secret
       o_auth_token ||= self.o_auth_token
+      o_auth_token_provider ||= self.o_auth_token_provider
+      o_auth_on_token_update ||= self.o_auth_on_token_update
+      o_auth_clock_skew ||= self.o_auth_clock_skew
 
       BearerTokenCredentials.new(o_auth_client_id: o_auth_client_id,
                                  o_auth_client_secret: o_auth_client_secret,
-                                 o_auth_token: o_auth_token)
+                                 o_auth_token: o_auth_token,
+                                 o_auth_token_provider: o_auth_token_provider,
+                                 o_auth_on_token_update: o_auth_on_token_update,
+                                 o_auth_clock_skew: o_auth_clock_skew)
     end
   end
 end

data/lib/shell_card_management_ap_is/models/account_access.rb

@@ -82,14 +82,9 @@ module ShellCardManagementApIs
       ]
     end
 
-    def initialize(colco_id = SKIP,
-                   colco_code = SKIP,
-                   payer_id = SKIP,
-                   payer_number = SKIP,
-                   payer_name = SKIP,
-                   account_id = SKIP,
-                   account_number = SKIP,
-                   account_name = SKIP)
+    def initialize(colco_id = SKIP, colco_code = SKIP, payer_id = SKIP,
+                   payer_number = SKIP, payer_name = SKIP, account_id = SKIP,
+                   account_number = SKIP, account_name = SKIP)
       @colco_id = colco_id unless colco_id == SKIP
       @colco_code = colco_code unless colco_code == SKIP
       @payer_id = payer_id unless payer_id == SKIP

data/lib/shell_card_management_ap_is/models/account_request.rb

@@ -167,21 +167,12 @@ module ShellCardManagementApIs
       ]
     end
 
-    def initialize(status = SKIP,
-                   include_card_summary = true,
-                   payer_id = SKIP,
-                   payer_number = SKIP,
-                   page_size = SKIP,
-                   request_id = SKIP,
-                   col_co_code = SKIP,
-                   col_co_country_code = SKIP,
-                   current_page = SKIP,
-                   invoice_points_only = false,
-                   col_co_id = SKIP,
-                   return_tolls_customer_id = SKIP,
-                   accounts = SKIP,
-                   account_name = SKIP,
-                   status_list = SKIP)
+    def initialize(status = SKIP, include_card_summary = true, payer_id = SKIP,
+                   payer_number = SKIP, page_size = SKIP, request_id = SKIP,
+                   col_co_code = SKIP, col_co_country_code = SKIP,
+                   current_page = SKIP, invoice_points_only = false,
+                   col_co_id = SKIP, return_tolls_customer_id = SKIP,
+                   accounts = SKIP, account_name = SKIP, status_list = SKIP)
       @status = status unless status == SKIP
       @include_card_summary = include_card_summary unless include_card_summary == SKIP
       @payer_id = payer_id unless payer_id == SKIP

data/lib/shell_card_management_ap_is/models/account_response.rb

@@ -64,12 +64,8 @@ module ShellCardManagementApIs
       []
     end
 
-    def initialize(accounts = SKIP,
-                   current_page = SKIP,
-                   row_count = SKIP,
-                   total_pages = SKIP,
-                   error = SKIP,
-                   request_id = SKIP)
+    def initialize(accounts = SKIP, current_page = SKIP, row_count = SKIP,
+                   total_pages = SKIP, error = SKIP, request_id = SKIP)
       @accounts = accounts unless accounts == SKIP
       @current_page = current_page unless current_page == SKIP
       @row_count = row_count unless row_count == SKIP

data/lib/shell_card_management_ap_is/models/account_response_accounts_items.rb

@@ -435,60 +435,36 @@ module ShellCardManagementApIs
       ]
     end
 
-    def initialize(account_full_name = SKIP,
-                   account_id = SKIP,
-                   account_number = SKIP,
-                   account_short_name = SKIP,
-                   best_of_indicator = SKIP,
-                   billing_frequency_type = SKIP,
+    def initialize(account_full_name = SKIP, account_id = SKIP,
+                   account_number = SKIP, account_short_name = SKIP,
+                   best_of_indicator = SKIP, billing_frequency_type = SKIP,
                    billing_frequency_type_id = SKIP,
                    billing_run_frequency = SKIP,
                    billing_run_frequency_type_id = SKIP,
-                   col_co_country_code = SKIP,
-                   currency_code = SKIP,
-                   currency_symbol = SKIP,
-                   day1_run = SKIP,
-                   day2_run = SKIP,
-                   day3_run = SKIP,
-                   day4_run = SKIP,
-                   frequency_type = SKIP,
-                   gross_amount = SKIP,
-                   international_pos_language_code = SKIP,
+                   col_co_country_code = SKIP, currency_code = SKIP,
+                   currency_symbol = SKIP, day1_run = SKIP, day2_run = SKIP,
+                   day3_run = SKIP, day4_run = SKIP, frequency_type = SKIP,
+                   gross_amount = SKIP, international_pos_language_code = SKIP,
                    international_pos_language_id = SKIP,
-                   invoice_account_id = SKIP,
-                   invoice_account_number = SKIP,
+                   invoice_account_id = SKIP, invoice_account_number = SKIP,
                    invoice_account_short_name = SKIP,
-                   invoice_distribution_methods = SKIP,
-                   is_international = SKIP,
-                   is_invoice_point = SKIP,
-                   last_modified_date = SKIP,
-                   local_currency_code = SKIP,
-                   local_currency_symbol = SKIP,
-                   local_pos_language_code = SKIP,
-                   local_pos_language_id = SKIP,
-                   net_amount = SKIP,
-                   outstanding_balance = SKIP,
-                   paid_amount = SKIP,
-                   status = SKIP,
-                   status_reason = SKIP,
-                   total_active_card_groups = SKIP,
-                   total_active_cards = SKIP,
-                   total_blocked_cards = SKIP,
-                   total_cancelled_cards = SKIP,
-                   total_cards = SKIP,
-                   total_expired_cards = SKIP,
-                   total_fraud_cards = SKIP,
-                   total_new_cards = SKIP,
+                   invoice_distribution_methods = SKIP, is_international = SKIP,
+                   is_invoice_point = SKIP, last_modified_date = SKIP,
+                   local_currency_code = SKIP, local_currency_symbol = SKIP,
+                   local_pos_language_code = SKIP, local_pos_language_id = SKIP,
+                   net_amount = SKIP, outstanding_balance = SKIP,
+                   paid_amount = SKIP, status = SKIP, status_reason = SKIP,
+                   total_active_card_groups = SKIP, total_active_cards = SKIP,
+                   total_blocked_cards = SKIP, total_cancelled_cards = SKIP,
+                   total_cards = SKIP, total_expired_cards = SKIP,
+                   total_fraud_cards = SKIP, total_new_cards = SKIP,
                    total_renewal_pending_cards = SKIP,
                    total_replaced_cards = SKIP,
                    total_temporary_block_cards_by_customer = SKIP,
                    total_temporary_block_cards_by_shell = SKIP,
-                   vat_amount = SKIP,
-                   is_partner_card = SKIP,
-                   tolls_customer_id = SKIP,
-                   tolls_colco_country_type_id = SKIP,
-                   contracts = SKIP,
-                   is_consortium_member = SKIP)
+                   vat_amount = SKIP, is_partner_card = SKIP,
+                   tolls_customer_id = SKIP, tolls_colco_country_type_id = SKIP,
+                   contracts = SKIP, is_consortium_member = SKIP)
       @account_full_name = account_full_name unless account_full_name == SKIP
       @account_id = account_id unless account_id == SKIP
       @account_number = account_number unless account_number == SKIP

data/lib/shell_card_management_ap_is/models/account_restriction_request.rb

@@ -38,21 +38,30 @@ module ShellCardManagementApIs
     # @return [String]
     attr_accessor :payer_number
 
+    # Account ID of the customer on which the restrictions will be applied.
+    # Optional if AccountNumber is passed, else Mandatory. 
+    # Example: 123456
+    # @return [Integer]
+    attr_accessor :account_id
+
     # Account Number of the customer on which the restrictions will be applied.
     # Optional if AccountId is passed, else Mandatory.
+    # Example: GB000000123
     # @return [String]
     attr_accessor :account_number
 
+    # True/False.
     # If true, the usage restrictions applied on the account will be removed.
     # Optional
     # Default: False
     # @return [TrueClass | FalseClass]
     attr_accessor :reset_usage_restrictions
 
+    # True/False.
     # If true, the usage restrictions applied on the account will be removed.
     # Optional
     # Default: False
-    # @return [UsageRestrictions]
+    # @return [UsageRestrictionsCard]
     attr_accessor :usage_restrictions
 
     # A mapping from model property names to API property names.
@@ -62,6 +71,7 @@ module ShellCardManagementApIs
       @_hash['col_co_code'] = 'ColCoCode'
       @_hash['payer_id'] = 'PayerId'
       @_hash['payer_number'] = 'PayerNumber'
+      @_hash['account_id'] = 'AccountId'
       @_hash['account_number'] = 'AccountNumber'
       @_hash['reset_usage_restrictions'] = 'ResetUsageRestrictions'
       @_hash['usage_restrictions'] = 'UsageRestrictions'
@@ -75,6 +85,7 @@ module ShellCardManagementApIs
         col_co_code
         payer_id
         payer_number
+        account_id
         account_number
         reset_usage_restrictions
         usage_restrictions
@@ -84,21 +95,26 @@ module ShellCardManagementApIs
     # An array for nullable fields
     def self.nullables
       %w[
+        col_co_id
+        col_co_code
         payer_id
+        payer_number
+        account_id
+        account_number
+        reset_usage_restrictions
+        usage_restrictions
       ]
     end
 
-    def initialize(col_co_id = SKIP,
-                   col_co_code = SKIP,
-                   payer_id = SKIP,
-                   payer_number = SKIP,
-                   account_number = SKIP,
-                   reset_usage_restrictions = false,
+    def initialize(col_co_id = SKIP, col_co_code = SKIP, payer_id = SKIP,
+                   payer_number = SKIP, account_id = SKIP,
+                   account_number = SKIP, reset_usage_restrictions = SKIP,
                    usage_restrictions = SKIP)
       @col_co_id = col_co_id unless col_co_id == SKIP
       @col_co_code = col_co_code unless col_co_code == SKIP
       @payer_id = payer_id unless payer_id == SKIP
       @payer_number = payer_number unless payer_number == SKIP
+      @account_id = account_id unless account_id == SKIP
       @account_number = account_number unless account_number == SKIP
       @reset_usage_restrictions = reset_usage_restrictions unless reset_usage_restrictions == SKIP
       @usage_restrictions = usage_restrictions unless usage_restrictions == SKIP
@@ -113,9 +129,11 @@ module ShellCardManagementApIs
       col_co_code = hash.key?('ColCoCode') ? hash['ColCoCode'] : SKIP
       payer_id = hash.key?('PayerId') ? hash['PayerId'] : SKIP
       payer_number = hash.key?('PayerNumber') ? hash['PayerNumber'] : SKIP
+      account_id = hash.key?('AccountId') ? hash['AccountId'] : SKIP
       account_number = hash.key?('AccountNumber') ? hash['AccountNumber'] : SKIP
-      reset_usage_restrictions = hash['ResetUsageRestrictions'] ||= false
-      usage_restrictions = UsageRestrictions.from_hash(hash['UsageRestrictions']) if
+      reset_usage_restrictions =
+        hash.key?('ResetUsageRestrictions') ? hash['ResetUsageRestrictions'] : SKIP
+      usage_restrictions = UsageRestrictionsCard.from_hash(hash['UsageRestrictions']) if
         hash['UsageRestrictions']
 
       # Create object from extracted values.
@@ -123,6 +141,7 @@ module ShellCardManagementApIs
                                     col_co_code,
                                     payer_id,
                                     payer_number,
+                                    account_id,
                                     account_number,
                                     reset_usage_restrictions,
                                     usage_restrictions)