proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/purchase_calculator_horizon_request.rb

@@ -3,10 +3,10 @@
 
 #Financial engineering module of Hydrogen Atom
 
-OpenAPI spec version: 1.8.0
+OpenAPI spec version: 1.9.0
 Contact: info@hydrogenplatform.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.17
+Swagger Codegen version: 2.4.19
 
 =end
 
@@ -14,47 +14,47 @@ require 'date'
 
 module ProtonApi
   class PurchaseCalculatorHorizonRequest
-    attr_accessor :purchase_amount
-
-    attr_accessor :aggregation_account_ids
-
-    attr_accessor :current_savings
-
     attr_accessor :account_ids
 
     attr_accessor :investment_tax
 
-    attr_accessor :inflation_rate
-
     attr_accessor :portfolio_return
 
     attr_accessor :deposit_schedule
 
+    attr_accessor :current_savings
+
+    attr_accessor :purchase_amount
+
+    attr_accessor :inflation_rate
+
+    attr_accessor :aggregation_account_ids
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'purchase_amount' => :'purchase_amount',
-        :'aggregation_account_ids' => :'aggregation_account_ids',
-        :'current_savings' => :'current_savings',
         :'account_ids' => :'account_ids',
         :'investment_tax' => :'investment_tax',
-        :'inflation_rate' => :'inflation_rate',
         :'portfolio_return' => :'portfolio_return',
-        :'deposit_schedule' => :'deposit_schedule'
+        :'deposit_schedule' => :'deposit_schedule',
+        :'current_savings' => :'current_savings',
+        :'purchase_amount' => :'purchase_amount',
+        :'inflation_rate' => :'inflation_rate',
+        :'aggregation_account_ids' => :'aggregation_account_ids'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'purchase_amount' => :'Float',
-        :'aggregation_account_ids' => :'Array<String>',
-        :'current_savings' => :'Float',
         :'account_ids' => :'Array<String>',
         :'investment_tax' => :'Float',
-        :'inflation_rate' => :'Float',
         :'portfolio_return' => :'Float',
-        :'deposit_schedule' => :'CalculatorDepositSchedule1'
+        :'deposit_schedule' => :'CalculatorDepositSchedule1',
+        :'current_savings' => :'Float',
+        :'purchase_amount' => :'Float',
+        :'inflation_rate' => :'Float',
+        :'aggregation_account_ids' => :'Array<String>'
       }
     end
 
@@ -66,22 +66,6 @@ module ProtonApi
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'purchase_amount')
-        self.purchase_amount = attributes[:'purchase_amount']
-      end
-
-      if attributes.has_key?(:'aggregation_account_ids')
-        if (value = attributes[:'aggregation_account_ids']).is_a?(Array)
-          self.aggregation_account_ids = value
-        end
-      end
-
-      if attributes.has_key?(:'current_savings')
-        self.current_savings = attributes[:'current_savings']
-      else
-        self.current_savings = 0.0
-      end
-
       if attributes.has_key?(:'account_ids')
         if (value = attributes[:'account_ids']).is_a?(Array)
           self.account_ids = value
@@ -94,12 +78,6 @@ module ProtonApi
         self.investment_tax = 0.0
       end
 
-      if attributes.has_key?(:'inflation_rate')
-        self.inflation_rate = attributes[:'inflation_rate']
-      else
-        self.inflation_rate = 0.0
-      end
-
       if attributes.has_key?(:'portfolio_return')
         self.portfolio_return = attributes[:'portfolio_return']
       end
@@ -107,24 +85,34 @@ module ProtonApi
       if attributes.has_key?(:'deposit_schedule')
         self.deposit_schedule = attributes[:'deposit_schedule']
       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 @purchase_amount.nil?
-        invalid_properties.push('invalid value for "purchase_amount", purchase_amount cannot be nil.')
+      if attributes.has_key?(:'current_savings')
+        self.current_savings = attributes[:'current_savings']
+      else
+        self.current_savings = 0.0
       end
 
-      if @purchase_amount < 0
-        invalid_properties.push('invalid value for "purchase_amount", must be greater than or equal to 0.')
+      if attributes.has_key?(:'purchase_amount')
+        self.purchase_amount = attributes[:'purchase_amount']
       end
 
-      if !@current_savings.nil? && @current_savings < 0
-        invalid_properties.push('invalid value for "current_savings", must be greater than or equal to 0.')
+      if attributes.has_key?(:'inflation_rate')
+        self.inflation_rate = attributes[:'inflation_rate']
+      else
+        self.inflation_rate = 0.0
       end
 
+      if attributes.has_key?(:'aggregation_account_ids')
+        if (value = attributes[:'aggregation_account_ids']).is_a?(Array)
+          self.aggregation_account_ids = value
+        end
+      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 !@investment_tax.nil? && @investment_tax > 1
         invalid_properties.push('invalid value for "investment_tax", must be smaller than or equal to 1.')
       end
@@ -133,10 +121,6 @@ module ProtonApi
         invalid_properties.push('invalid value for "investment_tax", must be greater than or equal to 0.')
       end
 
-      if !@inflation_rate.nil? && @inflation_rate < -1
-        invalid_properties.push('invalid value for "inflation_rate", must be greater than or equal to -1.')
-      end
-
       if @portfolio_return.nil?
         invalid_properties.push('invalid value for "portfolio_return", portfolio_return cannot be nil.')
       end
@@ -145,35 +129,65 @@ module ProtonApi
         invalid_properties.push('invalid value for "portfolio_return", must be greater than or equal to -1.')
       end
 
+      if !@current_savings.nil? && @current_savings < 0
+        invalid_properties.push('invalid value for "current_savings", must be greater than or equal to 0.')
+      end
+
+      if @purchase_amount.nil?
+        invalid_properties.push('invalid value for "purchase_amount", purchase_amount cannot be nil.')
+      end
+
+      if @purchase_amount < 0
+        invalid_properties.push('invalid value for "purchase_amount", must be greater than or equal to 0.')
+      end
+
+      if !@inflation_rate.nil? && @inflation_rate < -1
+        invalid_properties.push('invalid value for "inflation_rate", must be greater than or equal to -1.')
+      end
+
       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?
-      return false if @purchase_amount.nil?
-      return false if @purchase_amount < 0
-      return false if !@current_savings.nil? && @current_savings < 0
       return false if !@investment_tax.nil? && @investment_tax > 1
       return false if !@investment_tax.nil? && @investment_tax < 0
-      return false if !@inflation_rate.nil? && @inflation_rate < -1
       return false if @portfolio_return.nil?
       return false if @portfolio_return < -1
+      return false if !@current_savings.nil? && @current_savings < 0
+      return false if @purchase_amount.nil?
+      return false if @purchase_amount < 0
+      return false if !@inflation_rate.nil? && @inflation_rate < -1
       true
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] purchase_amount Value to be assigned
-    def purchase_amount=(purchase_amount)
-      if purchase_amount.nil?
-        fail ArgumentError, 'purchase_amount cannot be nil'
+    # @param [Object] investment_tax Value to be assigned
+    def investment_tax=(investment_tax)
+      if !investment_tax.nil? && investment_tax > 1
+        fail ArgumentError, 'invalid value for "investment_tax", must be smaller than or equal to 1.'
       end
 
-      if purchase_amount < 0
-        fail ArgumentError, 'invalid value for "purchase_amount", must be greater than or equal to 0.'
+      if !investment_tax.nil? && investment_tax < 0
+        fail ArgumentError, 'invalid value for "investment_tax", must be greater than or equal to 0.'
       end
 
-      @purchase_amount = purchase_amount
+      @investment_tax = investment_tax
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] portfolio_return Value to be assigned
+    def portfolio_return=(portfolio_return)
+      if portfolio_return.nil?
+        fail ArgumentError, 'portfolio_return cannot be nil'
+      end
+
+      if portfolio_return < -1
+        fail ArgumentError, 'invalid value for "portfolio_return", must be greater than or equal to -1.'
+      end
+
+      @portfolio_return = portfolio_return
     end
 
     # Custom attribute writer method with validation
@@ -187,17 +201,17 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] investment_tax Value to be assigned
-    def investment_tax=(investment_tax)
-      if !investment_tax.nil? && investment_tax > 1
-        fail ArgumentError, 'invalid value for "investment_tax", must be smaller than or equal to 1.'
+    # @param [Object] purchase_amount Value to be assigned
+    def purchase_amount=(purchase_amount)
+      if purchase_amount.nil?
+        fail ArgumentError, 'purchase_amount cannot be nil'
       end
 
-      if !investment_tax.nil? && investment_tax < 0
-        fail ArgumentError, 'invalid value for "investment_tax", must be greater than or equal to 0.'
+      if purchase_amount < 0
+        fail ArgumentError, 'invalid value for "purchase_amount", must be greater than or equal to 0.'
       end
 
-      @investment_tax = investment_tax
+      @purchase_amount = purchase_amount
     end
 
     # Custom attribute writer method with validation
@@ -210,33 +224,19 @@ module ProtonApi
       @inflation_rate = inflation_rate
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] portfolio_return Value to be assigned
-    def portfolio_return=(portfolio_return)
-      if portfolio_return.nil?
-        fail ArgumentError, 'portfolio_return cannot be nil'
-      end
-
-      if portfolio_return < -1
-        fail ArgumentError, 'invalid value for "portfolio_return", must be greater than or equal to -1.'
-      end
-
-      @portfolio_return = portfolio_return
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          purchase_amount == o.purchase_amount &&
-          aggregation_account_ids == o.aggregation_account_ids &&
-          current_savings == o.current_savings &&
           account_ids == o.account_ids &&
           investment_tax == o.investment_tax &&
-          inflation_rate == o.inflation_rate &&
           portfolio_return == o.portfolio_return &&
-          deposit_schedule == o.deposit_schedule
+          deposit_schedule == o.deposit_schedule &&
+          current_savings == o.current_savings &&
+          purchase_amount == o.purchase_amount &&
+          inflation_rate == o.inflation_rate &&
+          aggregation_account_ids == o.aggregation_account_ids
     end
 
     # @see the `==` method
@@ -248,7 +248,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [purchase_amount, aggregation_account_ids, current_savings, account_ids, investment_tax, inflation_rate, portfolio_return, deposit_schedule].hash
+      [account_ids, investment_tax, portfolio_return, deposit_schedule, current_savings, purchase_amount, inflation_rate, aggregation_account_ids].hash
     end
 
     # Builds the object from hash
@@ -270,17 +270,16 @@ module ProtonApi
 
       self
     end
-
-    # Deserializes the data based on type
+# 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 :DateTime
-        DateTime.parse(value)
+        value
       when :Date
-        Date.parse(value)
+        value
       when :String
         value.to_s
       when :Integer
@@ -312,8 +311,7 @@ module ProtonApi
         temp_model.build_from_hash(value)
       end
     end
-
-    # Returns the string representation of the object
+# Returns the string representation of the object
     # @return [String] String presentation of the object
     def to_s
       to_hash.to_s
@@ -336,8 +334,7 @@ module ProtonApi
       end
       hash
     end
-
-    # Outputs non-array value in the form of hash
+# 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

data/lib/proton_api/models/ratio_targets.rb

@@ -3,10 +3,10 @@
 
 #Financial engineering module of Hydrogen Atom
 
-OpenAPI spec version: 1.8.0
+OpenAPI spec version: 1.9.0
 Contact: info@hydrogenplatform.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.17
+Swagger Codegen version: 2.4.19
 
 =end
 
@@ -14,39 +14,39 @@ require 'date'
 
 module ProtonApi
   class RatioTargets
+    attr_accessor :liquidity_ratio_liabilities
+
     attr_accessor :current_ratio
 
-    attr_accessor :liquidity_ratio_expenses
+    attr_accessor :asset_allocation_ratio
 
-    attr_accessor :liquidity_ratio_liabilities
+    attr_accessor :savings_ratio_net
 
     attr_accessor :savings_ratio_gross
 
-    attr_accessor :savings_ratio_net
-
-    attr_accessor :asset_allocation_ratio
+    attr_accessor :liquidity_ratio_expenses
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'current_ratio' => :'current_ratio',
-        :'liquidity_ratio_expenses' => :'liquidity_ratio_expenses',
         :'liquidity_ratio_liabilities' => :'liquidity_ratio_liabilities',
-        :'savings_ratio_gross' => :'savings_ratio_gross',
+        :'current_ratio' => :'current_ratio',
+        :'asset_allocation_ratio' => :'asset_allocation_ratio',
         :'savings_ratio_net' => :'savings_ratio_net',
-        :'asset_allocation_ratio' => :'asset_allocation_ratio'
+        :'savings_ratio_gross' => :'savings_ratio_gross',
+        :'liquidity_ratio_expenses' => :'liquidity_ratio_expenses'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'current_ratio' => :'Float',
-        :'liquidity_ratio_expenses' => :'Float',
         :'liquidity_ratio_liabilities' => :'Float',
-        :'savings_ratio_gross' => :'Float',
+        :'current_ratio' => :'Float',
+        :'asset_allocation_ratio' => :'Float',
         :'savings_ratio_net' => :'Float',
-        :'asset_allocation_ratio' => :'Float'
+        :'savings_ratio_gross' => :'Float',
+        :'liquidity_ratio_expenses' => :'Float'
       }
     end
 
@@ -58,22 +58,28 @@ module ProtonApi
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
+      if attributes.has_key?(:'liquidity_ratio_liabilities')
+        self.liquidity_ratio_liabilities = attributes[:'liquidity_ratio_liabilities']
+      else
+        self.liquidity_ratio_liabilities = 0.1
+      end
+
       if attributes.has_key?(:'current_ratio')
         self.current_ratio = attributes[:'current_ratio']
       else
         self.current_ratio = 0.5
       end
 
-      if attributes.has_key?(:'liquidity_ratio_expenses')
-        self.liquidity_ratio_expenses = attributes[:'liquidity_ratio_expenses']
+      if attributes.has_key?(:'asset_allocation_ratio')
+        self.asset_allocation_ratio = attributes[:'asset_allocation_ratio']
       else
-        self.liquidity_ratio_expenses = 2.5
+        self.asset_allocation_ratio = 1.5
       end
 
-      if attributes.has_key?(:'liquidity_ratio_liabilities')
-        self.liquidity_ratio_liabilities = attributes[:'liquidity_ratio_liabilities']
+      if attributes.has_key?(:'savings_ratio_net')
+        self.savings_ratio_net = attributes[:'savings_ratio_net']
       else
-        self.liquidity_ratio_liabilities = 0.1
+        self.savings_ratio_net = 0.1
       end
 
       if attributes.has_key?(:'savings_ratio_gross')
@@ -82,16 +88,10 @@ module ProtonApi
         self.savings_ratio_gross = 0.1
       end
 
-      if attributes.has_key?(:'savings_ratio_net')
-        self.savings_ratio_net = attributes[:'savings_ratio_net']
-      else
-        self.savings_ratio_net = 0.1
-      end
-
-      if attributes.has_key?(:'asset_allocation_ratio')
-        self.asset_allocation_ratio = attributes[:'asset_allocation_ratio']
+      if attributes.has_key?(:'liquidity_ratio_expenses')
+        self.liquidity_ratio_expenses = attributes[:'liquidity_ratio_expenses']
       else
-        self.asset_allocation_ratio = 1.5
+        self.liquidity_ratio_expenses = 2.5
       end
     end
 
@@ -99,28 +99,28 @@ module ProtonApi
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
+      if !@liquidity_ratio_liabilities.nil? && @liquidity_ratio_liabilities < 0
+        invalid_properties.push('invalid value for "liquidity_ratio_liabilities", must be greater than or equal to 0.')
+      end
+
       if !@current_ratio.nil? && @current_ratio < 0
         invalid_properties.push('invalid value for "current_ratio", must be greater than or equal to 0.')
       end
 
-      if !@liquidity_ratio_expenses.nil? && @liquidity_ratio_expenses < 0
-        invalid_properties.push('invalid value for "liquidity_ratio_expenses", must be greater than or equal to 0.')
+      if !@asset_allocation_ratio.nil? && @asset_allocation_ratio < 0
+        invalid_properties.push('invalid value for "asset_allocation_ratio", must be greater than or equal to 0.')
       end
 
-      if !@liquidity_ratio_liabilities.nil? && @liquidity_ratio_liabilities < 0
-        invalid_properties.push('invalid value for "liquidity_ratio_liabilities", must be greater than or equal to 0.')
+      if !@savings_ratio_net.nil? && @savings_ratio_net < 0
+        invalid_properties.push('invalid value for "savings_ratio_net", must be greater than or equal to 0.')
       end
 
       if !@savings_ratio_gross.nil? && @savings_ratio_gross < 0
         invalid_properties.push('invalid value for "savings_ratio_gross", must be greater than or equal to 0.')
       end
 
-      if !@savings_ratio_net.nil? && @savings_ratio_net < 0
-        invalid_properties.push('invalid value for "savings_ratio_net", must be greater than or equal to 0.')
-      end
-
-      if !@asset_allocation_ratio.nil? && @asset_allocation_ratio < 0
-        invalid_properties.push('invalid value for "asset_allocation_ratio", must be greater than or equal to 0.')
+      if !@liquidity_ratio_expenses.nil? && @liquidity_ratio_expenses < 0
+        invalid_properties.push('invalid value for "liquidity_ratio_expenses", must be greater than or equal to 0.')
       end
 
       invalid_properties
@@ -129,15 +129,25 @@ module ProtonApi
     # 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 !@current_ratio.nil? && @current_ratio < 0
-      return false if !@liquidity_ratio_expenses.nil? && @liquidity_ratio_expenses < 0
       return false if !@liquidity_ratio_liabilities.nil? && @liquidity_ratio_liabilities < 0
-      return false if !@savings_ratio_gross.nil? && @savings_ratio_gross < 0
-      return false if !@savings_ratio_net.nil? && @savings_ratio_net < 0
+      return false if !@current_ratio.nil? && @current_ratio < 0
       return false if !@asset_allocation_ratio.nil? && @asset_allocation_ratio < 0
+      return false if !@savings_ratio_net.nil? && @savings_ratio_net < 0
+      return false if !@savings_ratio_gross.nil? && @savings_ratio_gross < 0
+      return false if !@liquidity_ratio_expenses.nil? && @liquidity_ratio_expenses < 0
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] liquidity_ratio_liabilities Value to be assigned
+    def liquidity_ratio_liabilities=(liquidity_ratio_liabilities)
+      if !liquidity_ratio_liabilities.nil? && liquidity_ratio_liabilities < 0
+        fail ArgumentError, 'invalid value for "liquidity_ratio_liabilities", must be greater than or equal to 0.'
+      end
+
+      @liquidity_ratio_liabilities = liquidity_ratio_liabilities
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] current_ratio Value to be assigned
     def current_ratio=(current_ratio)
@@ -149,23 +159,23 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] liquidity_ratio_expenses Value to be assigned
-    def liquidity_ratio_expenses=(liquidity_ratio_expenses)
-      if !liquidity_ratio_expenses.nil? && liquidity_ratio_expenses < 0
-        fail ArgumentError, 'invalid value for "liquidity_ratio_expenses", must be greater than or equal to 0.'
+    # @param [Object] asset_allocation_ratio Value to be assigned
+    def asset_allocation_ratio=(asset_allocation_ratio)
+      if !asset_allocation_ratio.nil? && asset_allocation_ratio < 0
+        fail ArgumentError, 'invalid value for "asset_allocation_ratio", must be greater than or equal to 0.'
       end
 
-      @liquidity_ratio_expenses = liquidity_ratio_expenses
+      @asset_allocation_ratio = asset_allocation_ratio
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] liquidity_ratio_liabilities Value to be assigned
-    def liquidity_ratio_liabilities=(liquidity_ratio_liabilities)
-      if !liquidity_ratio_liabilities.nil? && liquidity_ratio_liabilities < 0
-        fail ArgumentError, 'invalid value for "liquidity_ratio_liabilities", must be greater than or equal to 0.'
+    # @param [Object] savings_ratio_net Value to be assigned
+    def savings_ratio_net=(savings_ratio_net)
+      if !savings_ratio_net.nil? && savings_ratio_net < 0
+        fail ArgumentError, 'invalid value for "savings_ratio_net", must be greater than or equal to 0.'
       end
 
-      @liquidity_ratio_liabilities = liquidity_ratio_liabilities
+      @savings_ratio_net = savings_ratio_net
     end
 
     # Custom attribute writer method with validation
@@ -179,23 +189,13 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] savings_ratio_net Value to be assigned
-    def savings_ratio_net=(savings_ratio_net)
-      if !savings_ratio_net.nil? && savings_ratio_net < 0
-        fail ArgumentError, 'invalid value for "savings_ratio_net", must be greater than or equal to 0.'
-      end
-
-      @savings_ratio_net = savings_ratio_net
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] asset_allocation_ratio Value to be assigned
-    def asset_allocation_ratio=(asset_allocation_ratio)
-      if !asset_allocation_ratio.nil? && asset_allocation_ratio < 0
-        fail ArgumentError, 'invalid value for "asset_allocation_ratio", must be greater than or equal to 0.'
+    # @param [Object] liquidity_ratio_expenses Value to be assigned
+    def liquidity_ratio_expenses=(liquidity_ratio_expenses)
+      if !liquidity_ratio_expenses.nil? && liquidity_ratio_expenses < 0
+        fail ArgumentError, 'invalid value for "liquidity_ratio_expenses", must be greater than or equal to 0.'
       end
 
-      @asset_allocation_ratio = asset_allocation_ratio
+      @liquidity_ratio_expenses = liquidity_ratio_expenses
     end
 
     # Checks equality by comparing each attribute.
@@ -203,12 +203,12 @@ module ProtonApi
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          current_ratio == o.current_ratio &&
-          liquidity_ratio_expenses == o.liquidity_ratio_expenses &&
           liquidity_ratio_liabilities == o.liquidity_ratio_liabilities &&
-          savings_ratio_gross == o.savings_ratio_gross &&
+          current_ratio == o.current_ratio &&
+          asset_allocation_ratio == o.asset_allocation_ratio &&
           savings_ratio_net == o.savings_ratio_net &&
-          asset_allocation_ratio == o.asset_allocation_ratio
+          savings_ratio_gross == o.savings_ratio_gross &&
+          liquidity_ratio_expenses == o.liquidity_ratio_expenses
     end
 
     # @see the `==` method
@@ -220,7 +220,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [current_ratio, liquidity_ratio_expenses, liquidity_ratio_liabilities, savings_ratio_gross, savings_ratio_net, asset_allocation_ratio].hash
+      [liquidity_ratio_liabilities, current_ratio, asset_allocation_ratio, savings_ratio_net, savings_ratio_gross, liquidity_ratio_expenses].hash
     end
 
     # Builds the object from hash
@@ -242,17 +242,16 @@ module ProtonApi
 
       self
     end
-
-    # Deserializes the data based on type
+# 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 :DateTime
-        DateTime.parse(value)
+        value
       when :Date
-        Date.parse(value)
+        value
       when :String
         value.to_s
       when :Integer
@@ -284,8 +283,7 @@ module ProtonApi
         temp_model.build_from_hash(value)
       end
     end
-
-    # Returns the string representation of the object
+# Returns the string representation of the object
     # @return [String] String presentation of the object
     def to_s
       to_hash.to_s
@@ -308,8 +306,7 @@ module ProtonApi
       end
       hash
     end
-
-    # Outputs non-array value in the form of hash
+# 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