moneykit 0.0.3 → 0.0.5

data/lib/moneykit/models/response401_update_link_links_id_patch.rb

@@ -5,291 +5,97 @@
 # The version of the OpenAPI document: 0.1.0
 #
 # Generated by: https://openapi-generator.tech
-# OpenAPI Generator version: 6.5.0
+# OpenAPI Generator version: 7.1.0
 #
 
 require 'date'
 require 'time'
 
 module MoneyKit
-  class Response401UpdateLinkLinksIdPatch
-    attr_accessor :error_code, :error_message, :documentation_url
-
-    class EnumAttributeValidator
-      attr_reader :datatype, :allowable_values
-
-      def initialize(datatype, allowable_values)
-        @allowable_values = allowable_values.map do |value|
-          case datatype.to_s
-          when /Integer/i
-            value.to_i
-          when /Float/i
-            value.to_f
-          else
-            value
-          end
-        end
+  module Response401UpdateLinkLinksIdPatch
+    class << self
+      # List of class defined in anyOf (OpenAPI v3)
+      def openapi_any_of
+        %i[
+          APIErrorAuthExpiredAccessTokenResponse
+          APIErrorAuthUnauthorizedResponse
+          LinkErrorUnauthorizedAccessResponse
+        ]
       end
 
-      def valid?(value)
-        !value || allowable_values.include?(value)
-      end
-    end
-
-    # Attribute mapping from ruby-style variable name to JSON key.
-    def self.attribute_map
-      {
-        'error_code': :error_code,
-        'error_message': :error_message,
-        'documentation_url': :documentation_url
-      }
-    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
-      {
-        'error_code': :String,
-        'error_message': :String,
-        'documentation_url': :String
-      }
-    end
-
-    # List of attributes with nullable: true
-    def self.openapi_nullable
-      Set.new([
-                :documentation_url
-              ])
-    end
-
-    # List of class defined in anyOf (OpenAPI v3)
-    def self.openapi_any_of
-      %i[
-        APIErrorAuthExpiredAccessTokenResponse
-        APIErrorAuthUnauthorizedResponse
-        LinkErrorUnauthorizedAccessResponse
-      ]
-    end
-
-    # Initializes the object
-    # @param [Hash] attributes Model attributes in the form of hash
-    def initialize(attributes = {})
-      unless attributes.is_a?(Hash)
-        raise ArgumentError,
-              'The input argument (attributes) must be a hash in `MoneyKit::Response401UpdateLinkLinksIdPatch` initialize method'
-      end
-
-      # check to see if the attribute exists and convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) do |(k, v), h|
-        unless self.class.attribute_map.key?(k.to_sym)
-          raise ArgumentError,
-                "`#{k}` is not a valid attribute in `MoneyKit::Response401UpdateLinkLinksIdPatch`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+      # Builds the object
+      # @param [Mixed] Data to be matched against the list of anyOf items
+      # @return [Object] Returns the model or the data itself
+      def build(data)
+        # Go through the list of anyOf items and attempt to identify the appropriate one.
+        # Note:
+        # - No advanced validation of types in some cases (e.g. "x: { type: string }" will happily match { x: 123 })
+        #   due to the way the deserialization is made in the base_object template (it just casts without verifying).
+        # - TODO: scalar values are de facto behaving as if they were nullable.
+        # - TODO: logging when debugging is set.
+        openapi_any_of.each do |klass|
+          next if klass == :AnyType # "nullable: true"
+
+          typed_data = find_and_cast_into_type(klass, data)
+          return typed_data if typed_data
+        rescue StandardError # rescue all errors so we keep iterating even if the current item lookup raises
         end
 
-        h[k.to_sym] = v
-      end
-
-      self.error_code = if attributes.key?(:error_code)
-                          attributes[:error_code]
-                        else
-                          'link_error.unauthorized_access'
-                        end
-
-      self.error_message = if attributes.key?(:error_message)
-                             attributes[:error_message]
-                           else
-                             'Unauthorized link access.'
-                           end
-
-      return unless attributes.key?(:documentation_url)
-
-      self.documentation_url = attributes[:documentation_url]
-    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 = []
-      invalid_properties.push('invalid value for "error_message", error_message cannot be nil.') if @error_message.nil?
-
-      invalid_properties
-    end
-
-    # Check to see if the all the properties in the model are valid
-    # @return true if the model is valid
-    def valid?
-      error_code_validator = EnumAttributeValidator.new('String', ['link_error.unauthorized_access'])
-      return false unless error_code_validator.valid?(@error_code)
-      return false if @error_message.nil?
-
-      _any_of_found = false
-      self.class.openapi_any_of.each do |_class|
-        _any_of = MoneyKit.const_get(_class).build_from_hash(to_hash)
-        _any_of_found = true if _any_of.valid?
-      end
-
-      return false unless _any_of_found
-
-      true
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] error_code Object to be assigned
-    def error_code=(error_code)
-      validator = EnumAttributeValidator.new('String', ['link_error.unauthorized_access'])
-      unless validator.valid?(error_code)
-        raise ArgumentError, "invalid value for \"error_code\", must be one of #{validator.allowable_values}."
+        openapi_any_of.include?(:AnyType) ? data : nil
       end
 
-      @error_code = error_code
-    end
-
-    # Checks equality by comparing each attribute.
-    # @param [Object] Object to be compared
-    def ==(other)
-      return true if equal?(other)
-
-      self.class == other.class &&
-        error_code == other.error_code &&
-        error_message == other.error_message &&
-        documentation_url == other.documentation_url
-    end
-
-    # @see the `==` method
-    # @param [Object] Object to be compared
-    def eql?(other)
-      self == other
-    end
-
-    # Calculates hash code according to all attributes.
-    # @return [Integer] Hash code
-    def hash
-      [error_code, error_message, documentation_url].hash
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # 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)
-      return nil unless attributes.is_a?(Hash)
-
-      attributes = attributes.transform_keys(&:to_sym)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          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)
-            send("#{key}=", attributes[self.class.attribute_map[key]].map do |v|
-                              _deserialize(::Regexp.last_match(1), v)
-                            end)
+      private
+
+      SchemaMismatchError = Class.new(StandardError)
+
+      # NOTE: 'File' is missing here because in the regular case we get the data _after_ a call to JSON.parse.
+      def find_and_cast_into_type(klass, data)
+        return if data.nil?
+
+        case klass.to_s
+        when 'Boolean'
+          return data if data.instance_of?(TrueClass) || data.instance_of?(FalseClass)
+        when 'Float'
+          return data if data.instance_of?(Float)
+        when 'Integer'
+          return data if data.instance_of?(Integer)
+        when 'Time'
+          return Time.parse(data)
+        when 'Date'
+          return Date.parse(data)
+        when 'String'
+          return data if data.instance_of?(String)
+        when 'Object' # "type: object"
+          return data if data.instance_of?(Hash)
+        when /\AArray<(?<sub_type>.+)>\z/ # "type: array"
+          if data.instance_of?(Array)
+            sub_type = Regexp.last_match[:sub_type]
+            return data.map { |item| find_and_cast_into_type(sub_type, item) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
-      end
-
-      self
-    end
-
-    # Deserializes the data based on type
-    # @param string type Data type
-    # @param string value Value to be deserialized
-    # @return [Object] Deserialized data
-    def _deserialize(type, value)
-      case type.to_sym
-      when :Time
-        Time.parse(value)
-      when :Date
-        Date.parse(value)
-      when :String
-        value.to_s
-      when :Integer
-        value.to_i
-      when :Float
-        value.to_f
-      when :Boolean
-        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
-          true
-        else
-          false
-        end
-      when :Object
-        # generic object (usually a Hash), return directly
-        value
-      when /\AArray<(?<inner_type>.+)>\z/
-        inner_type = Regexp.last_match[:inner_type]
-        value.map { |v| _deserialize(inner_type, v) }
-      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
-        k_type = Regexp.last_match[:k_type]
-        v_type = Regexp.last_match[:v_type]
-        {}.tap do |hash|
-          value.each do |k, v|
-            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+        when /\AHash<String, (?<sub_type>.+)>\z/ # "type: object" with "additionalProperties: { ... }"
+          if data.instance_of?(Hash) && data.keys.all? { |k| k.instance_of?(Symbol) || k.instance_of?(String) }
+            sub_type = Regexp.last_match[:sub_type]
+            return data.each_with_object({}) { |(k, v), hsh| hsh[k] = find_and_cast_into_type(sub_type, v) }
+          end
+        else # model
+          const = MoneyKit.const_get(klass)
+          if const
+            if const.respond_to?(:openapi_any_of) # nested anyOf model
+              model = const.build(data)
+              return model if model
+            else
+              # raise if data contains keys that are not known to the model
+              raise unless (data.keys - const.acceptable_attributes).empty?
+
+              model = const.build_from_hash(data)
+              return model if model
+            end
           end
-        end
-      else # model
-        # models (e.g. Pet) or oneOf
-        klass = MoneyKit.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
-      end
-    end
-
-    # Returns the string representation of the object
-    # @return [String] String presentation of the object
-    def to_s
-      to_hash.to_s
-    end
-
-    # to_body is an alias to to_hash (backward compatibility)
-    # @return [Hash] Returns the object in the form of hash
-    def to_body
-      to_hash
-    end
-
-    # Returns the object in the form of hash
-    # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = send(attr)
-        if value.nil?
-          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
-    end
-
-    # Outputs non-array value in the form of hash
-    # For object, use to_hash. Otherwise, just return the value
-    # @param [Object] value Any valid value
-    # @return [Hash] Returns the value in the form of hash
-    def _to_hash(value)
-      if value.is_a?(Array)
-        value.compact.map { |v| _to_hash(v) }
-      elsif value.is_a?(Hash)
-        {}.tap do |hash|
-          value.each { |k, v| hash[k] = _to_hash(v) }
-        end
-      elsif value.respond_to? :to_hash
-        value.to_hash
-      else
-        value
+        raise # if no match by now, raise
+      rescue StandardError
+        raise SchemaMismatchError, "#{data} doesn't match the #{klass} type"
       end
     end
   end

data/lib/moneykit/models/transaction.rb

@@ -5,7 +5,7 @@
 # The version of the OpenAPI document: 0.1.0
 #
 # Generated by: https://openapi-generator.tech
-# OpenAPI Generator version: 6.5.0
+# OpenAPI Generator version: 7.1.0
 #
 
 require 'date'
@@ -27,9 +27,12 @@ module MoneyKit
     # The ISO-4217 currency code of the transaction.
     attr_accessor :currency
 
-    # The effective (posted) date the transaction, in ISO-8601 format.  For pending transactions,             this date is when the transaction was initiated.
+    # The effective (posted) date of the transaction, in ISO-8601 format.  For pending transactions,             this date is when the transaction was initiated.
     attr_accessor :date
 
+    # If the institution has provided the actual time of the transaction, this field             contains the full date and time of the transaction, in ISO-8601 format.  If the time is             not available, this field will be null.             <p>Note that the time is generally reported in the timezone of the institution or the account holder.
+    attr_accessor :datetime
+
     # A normalized, cleaned transaction description suitable for presentation to the end user.             Commonly this will be the merchant or counterparty name.
     attr_accessor :description
 
@@ -72,6 +75,7 @@ module MoneyKit
         'type': :type,
         'currency': :currency,
         'date': :date,
+        'datetime': :datetime,
         'description': :description,
         'raw_description': :raw_description,
         'pending': :pending,
@@ -93,6 +97,7 @@ module MoneyKit
         'type': :TransactionType,
         'currency': :String,
         'date': :Date,
+        'datetime': :Time,
         'description': :String,
         'raw_description': :String,
         'pending': :Boolean,
@@ -102,11 +107,7 @@ module MoneyKit
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      Set.new(%i[
-                description
-                raw_description
-                category
-              ])
+      Set.new([])
     end
 
     # Initializes the object
@@ -127,23 +128,25 @@ module MoneyKit
         h[k.to_sym] = v
       end
 
-      self.transaction_id = attributes[:transaction_id] if attributes.key?(:transaction_id)
+      self.transaction_id = (attributes[:transaction_id] if attributes.key?(:transaction_id))
+
+      self.account_id = (attributes[:account_id] if attributes.key?(:account_id))
 
-      self.account_id = attributes[:account_id] if attributes.key?(:account_id)
+      self.amount = (attributes[:amount] if attributes.key?(:amount))
 
-      self.amount = attributes[:amount] if attributes.key?(:amount)
+      self.type = (attributes[:type] if attributes.key?(:type))
 
-      self.type = attributes[:type] if attributes.key?(:type)
+      self.currency = (attributes[:currency] if attributes.key?(:currency))
 
-      self.currency = attributes[:currency] if attributes.key?(:currency)
+      self.date = (attributes[:date] if attributes.key?(:date))
 
-      self.date = attributes[:date] if attributes.key?(:date)
+      self.datetime = attributes[:datetime] if attributes.key?(:datetime)
 
       self.description = attributes[:description] if attributes.key?(:description)
 
       self.raw_description = attributes[:raw_description] if attributes.key?(:raw_description)
 
-      self.pending = attributes[:pending] if attributes.key?(:pending)
+      self.pending = (attributes[:pending] if attributes.key?(:pending))
 
       return unless attributes.key?(:category)
 
@@ -153,6 +156,7 @@ module MoneyKit
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = []
       if @transaction_id.nil?
         invalid_properties.push('invalid value for "transaction_id", transaction_id cannot be nil.')
@@ -176,6 +180,7 @@ module MoneyKit
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @transaction_id.nil?
       return false if @account_id.nil?
       return false if @amount.nil?
@@ -199,6 +204,7 @@ module MoneyKit
         type == other.type &&
         currency == other.currency &&
         date == other.date &&
+        datetime == other.datetime &&
         description == other.description &&
         raw_description == other.raw_description &&
         pending == other.pending &&
@@ -214,47 +220,41 @@ module MoneyKit
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [transaction_id, account_id, amount, type, currency, date, description, raw_description, pending, category].hash
+      [transaction_id, account_id, amount, type, currency, date, datetime, description, raw_description, pending,
+       category].hash
     end
 
     # Builds the object from hash
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # 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)
       return nil unless attributes.is_a?(Hash)
 
       attributes = attributes.transform_keys(&:to_sym)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          send("#{key}=", nil)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{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)
-            send("#{key}=", attributes[self.class.attribute_map[key]].map do |v|
-                              _deserialize(::Regexp.last_match(1), v)
-                            end)
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map do |v|
+              _deserialize(::Regexp.last_match(1), v)
+            end
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
       when :Time
         Time.parse(value)
@@ -289,7 +289,7 @@ module MoneyKit
       else # model
         # models (e.g. Pet) or oneOf
         klass = MoneyKit.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end