proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/purchase_calculator_amount_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,24 +14,24 @@ require 'date'
 
 module ProtonApi
   class PurchaseCalculatorAmountRequest
-    attr_accessor :aggregation_account_ids
-
-    attr_accessor :current_savings
-
     attr_accessor :account_ids
 
-    attr_accessor :investment_tax
+    attr_accessor :horizon_frequency_interval
 
     attr_accessor :purchase_horizon
 
-    attr_accessor :inflation_rate
-
-    attr_accessor :horizon_frequency_interval
+    attr_accessor :investment_tax
 
     attr_accessor :portfolio_return
 
     attr_accessor :deposit_schedule
 
+    attr_accessor :current_savings
+
+    attr_accessor :inflation_rate
+
+    attr_accessor :aggregation_account_ids
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -57,30 +57,30 @@ module ProtonApi
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'aggregation_account_ids' => :'aggregation_account_ids',
-        :'current_savings' => :'current_savings',
         :'account_ids' => :'account_ids',
-        :'investment_tax' => :'investment_tax',
-        :'purchase_horizon' => :'purchase_horizon',
-        :'inflation_rate' => :'inflation_rate',
         :'horizon_frequency_interval' => :'horizon_frequency_interval',
+        :'purchase_horizon' => :'purchase_horizon',
+        :'investment_tax' => :'investment_tax',
         :'portfolio_return' => :'portfolio_return',
-        :'deposit_schedule' => :'deposit_schedule'
+        :'deposit_schedule' => :'deposit_schedule',
+        :'current_savings' => :'current_savings',
+        :'inflation_rate' => :'inflation_rate',
+        :'aggregation_account_ids' => :'aggregation_account_ids'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'aggregation_account_ids' => :'Array<String>',
-        :'current_savings' => :'Float',
         :'account_ids' => :'Array<String>',
-        :'investment_tax' => :'Float',
-        :'purchase_horizon' => :'Integer',
-        :'inflation_rate' => :'Float',
         :'horizon_frequency_interval' => :'String',
+        :'purchase_horizon' => :'Integer',
+        :'investment_tax' => :'Float',
         :'portfolio_return' => :'Float',
-        :'deposit_schedule' => :'CalculatorDepositSchedule1'
+        :'deposit_schedule' => :'CalculatorDepositSchedule1',
+        :'current_savings' => :'Float',
+        :'inflation_rate' => :'Float',
+        :'aggregation_account_ids' => :'Array<String>'
       }
     end
 
@@ -92,44 +92,26 @@ 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?(:'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
         end
       end
 
-      if attributes.has_key?(:'investment_tax')
-        self.investment_tax = attributes[:'investment_tax']
+      if attributes.has_key?(:'horizon_frequency_interval')
+        self.horizon_frequency_interval = attributes[:'horizon_frequency_interval']
       else
-        self.investment_tax = 0.0
+        self.horizon_frequency_interval = 'year'
       end
 
       if attributes.has_key?(:'purchase_horizon')
         self.purchase_horizon = attributes[:'purchase_horizon']
       end
 
-      if attributes.has_key?(:'inflation_rate')
-        self.inflation_rate = attributes[:'inflation_rate']
-      else
-        self.inflation_rate = 0.0
-      end
-
-      if attributes.has_key?(:'horizon_frequency_interval')
-        self.horizon_frequency_interval = attributes[:'horizon_frequency_interval']
+      if attributes.has_key?(:'investment_tax')
+        self.investment_tax = attributes[:'investment_tax']
       else
-        self.horizon_frequency_interval = 'year'
+        self.investment_tax = 0.0
       end
 
       if attributes.has_key?(:'portfolio_return')
@@ -139,24 +121,30 @@ 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 !@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?(:'current_savings')
+        self.current_savings = attributes[:'current_savings']
+      else
+        self.current_savings = 0.0
       end
 
-      if !@investment_tax.nil? && @investment_tax > 1
-        invalid_properties.push('invalid value for "investment_tax", must be smaller than or equal to 1.')
+      if attributes.has_key?(:'inflation_rate')
+        self.inflation_rate = attributes[:'inflation_rate']
+      else
+        self.inflation_rate = 0.0
       end
 
-      if !@investment_tax.nil? && @investment_tax < 0
-        invalid_properties.push('invalid value for "investment_tax", must be greater than or equal to 0.')
+      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 @purchase_horizon.nil?
         invalid_properties.push('invalid value for "purchase_horizon", purchase_horizon cannot be nil.')
       end
@@ -165,8 +153,12 @@ module ProtonApi
         invalid_properties.push('invalid value for "purchase_horizon", 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.')
+      if !@investment_tax.nil? && @investment_tax > 1
+        invalid_properties.push('invalid value for "investment_tax", must be smaller than or equal to 1.')
+      end
+
+      if !@investment_tax.nil? && @investment_tax < 0
+        invalid_properties.push('invalid value for "investment_tax", must be greater than or equal to 0.')
       end
 
       if @portfolio_return.nil?
@@ -177,47 +169,41 @@ 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 !@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 !@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 @purchase_horizon.nil?
-      return false if @purchase_horizon < 0
-      return false if !@inflation_rate.nil? && @inflation_rate < -1
       horizon_frequency_interval_validator = EnumAttributeValidator.new('String', ['year', 'quarter', 'month', 'week'])
       return false unless horizon_frequency_interval_validator.valid?(@horizon_frequency_interval)
+      return false if @purchase_horizon.nil?
+      return false if @purchase_horizon < 0
+      return false if !@investment_tax.nil? && @investment_tax > 1
+      return false if !@investment_tax.nil? && @investment_tax < 0
       return false if @portfolio_return.nil?
       return false if @portfolio_return < -1
+      return false if !@current_savings.nil? && @current_savings < 0
+      return false if !@inflation_rate.nil? && @inflation_rate < -1
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] current_savings Value to be assigned
-    def current_savings=(current_savings)
-      if !current_savings.nil? && current_savings < 0
-        fail ArgumentError, 'invalid value for "current_savings", must be greater than or equal to 0.'
-      end
-
-      @current_savings = current_savings
-    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.'
-      end
-
-      if !investment_tax.nil? && investment_tax < 0
-        fail ArgumentError, 'invalid value for "investment_tax", must be greater than or equal to 0.'
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] horizon_frequency_interval Object to be assigned
+    def horizon_frequency_interval=(horizon_frequency_interval)
+      validator = EnumAttributeValidator.new('String', ['year', 'quarter', 'month', 'week'])
+      unless validator.valid?(horizon_frequency_interval)
+        fail ArgumentError, 'invalid value for "horizon_frequency_interval", must be one of #{validator.allowable_values}.'
       end
-
-      @investment_tax = investment_tax
+      @horizon_frequency_interval = horizon_frequency_interval
     end
 
     # Custom attribute writer method with validation
@@ -235,23 +221,17 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] inflation_rate Value to be assigned
-    def inflation_rate=(inflation_rate)
-      if !inflation_rate.nil? && inflation_rate < -1
-        fail ArgumentError, 'invalid value for "inflation_rate", must be greater than or equal to -1.'
+    # @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
 
-      @inflation_rate = inflation_rate
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] horizon_frequency_interval Object to be assigned
-    def horizon_frequency_interval=(horizon_frequency_interval)
-      validator = EnumAttributeValidator.new('String', ['year', 'quarter', 'month', 'week'])
-      unless validator.valid?(horizon_frequency_interval)
-        fail ArgumentError, 'invalid value for "horizon_frequency_interval", must be one of #{validator.allowable_values}.'
+      if !investment_tax.nil? && investment_tax < 0
+        fail ArgumentError, 'invalid value for "investment_tax", must be greater than or equal to 0.'
       end
-      @horizon_frequency_interval = horizon_frequency_interval
+
+      @investment_tax = investment_tax
     end
 
     # Custom attribute writer method with validation
@@ -268,20 +248,40 @@ module ProtonApi
       @portfolio_return = portfolio_return
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] current_savings Value to be assigned
+    def current_savings=(current_savings)
+      if !current_savings.nil? && current_savings < 0
+        fail ArgumentError, 'invalid value for "current_savings", must be greater than or equal to 0.'
+      end
+
+      @current_savings = current_savings
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] inflation_rate Value to be assigned
+    def inflation_rate=(inflation_rate)
+      if !inflation_rate.nil? && inflation_rate < -1
+        fail ArgumentError, 'invalid value for "inflation_rate", must be greater than or equal to -1.'
+      end
+
+      @inflation_rate = inflation_rate
+    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 &&
-          aggregation_account_ids == o.aggregation_account_ids &&
-          current_savings == o.current_savings &&
           account_ids == o.account_ids &&
-          investment_tax == o.investment_tax &&
-          purchase_horizon == o.purchase_horizon &&
-          inflation_rate == o.inflation_rate &&
           horizon_frequency_interval == o.horizon_frequency_interval &&
+          purchase_horizon == o.purchase_horizon &&
+          investment_tax == o.investment_tax &&
           portfolio_return == o.portfolio_return &&
-          deposit_schedule == o.deposit_schedule
+          deposit_schedule == o.deposit_schedule &&
+          current_savings == o.current_savings &&
+          inflation_rate == o.inflation_rate &&
+          aggregation_account_ids == o.aggregation_account_ids
     end
 
     # @see the `==` method
@@ -293,7 +293,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [aggregation_account_ids, current_savings, account_ids, investment_tax, purchase_horizon, inflation_rate, horizon_frequency_interval, portfolio_return, deposit_schedule].hash
+      [account_ids, horizon_frequency_interval, purchase_horizon, investment_tax, portfolio_return, deposit_schedule, current_savings, inflation_rate, aggregation_account_ids].hash
     end
 
     # Builds the object from hash
@@ -315,17 +315,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
@@ -357,8 +356,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
@@ -381,8 +379,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/purchase_calculator_deposit_amount_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,26 +14,26 @@ require 'date'
 
 module ProtonApi
   class PurchaseCalculatorDepositAmountRequest
-    attr_accessor :purchase_amount
-
-    attr_accessor :aggregation_account_ids
-
-    attr_accessor :current_savings
-
     attr_accessor :account_ids
 
-    attr_accessor :investment_tax
+    attr_accessor :horizon_frequency_interval
 
     attr_accessor :purchase_horizon
 
-    attr_accessor :inflation_rate
-
-    attr_accessor :horizon_frequency_interval
+    attr_accessor :investment_tax
 
     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
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -59,32 +59,32 @@ module ProtonApi
     # 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',
-        :'purchase_horizon' => :'purchase_horizon',
-        :'inflation_rate' => :'inflation_rate',
         :'horizon_frequency_interval' => :'horizon_frequency_interval',
+        :'purchase_horizon' => :'purchase_horizon',
+        :'investment_tax' => :'investment_tax',
         :'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',
-        :'purchase_horizon' => :'Integer',
-        :'inflation_rate' => :'Float',
         :'horizon_frequency_interval' => :'String',
+        :'purchase_horizon' => :'Integer',
+        :'investment_tax' => :'Float',
         :'portfolio_return' => :'Float',
-        :'deposit_schedule' => :'CalculatorDepositSchedule'
+        :'deposit_schedule' => :'CalculatorDepositSchedule',
+        :'current_savings' => :'Float',
+        :'purchase_amount' => :'Float',
+        :'inflation_rate' => :'Float',
+        :'aggregation_account_ids' => :'Array<String>'
       }
     end
 
@@ -96,26 +96,20 @@ 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
+      if attributes.has_key?(:'account_ids')
+        if (value = attributes[:'account_ids']).is_a?(Array)
+          self.account_ids = value
         end
       end
 
-      if attributes.has_key?(:'current_savings')
-        self.current_savings = attributes[:'current_savings']
+      if attributes.has_key?(:'horizon_frequency_interval')
+        self.horizon_frequency_interval = attributes[:'horizon_frequency_interval']
       else
-        self.current_savings = 0.0
+        self.horizon_frequency_interval = 'year'
       end
 
-      if attributes.has_key?(:'account_ids')
-        if (value = attributes[:'account_ids']).is_a?(Array)
-          self.account_ids = value
-        end
+      if attributes.has_key?(:'purchase_horizon')
+        self.purchase_horizon = attributes[:'purchase_horizon']
       end
 
       if attributes.has_key?(:'investment_tax')
@@ -124,28 +118,34 @@ module ProtonApi
         self.investment_tax = 0.0
       end
 
-      if attributes.has_key?(:'purchase_horizon')
-        self.purchase_horizon = attributes[:'purchase_horizon']
+      if attributes.has_key?(:'portfolio_return')
+        self.portfolio_return = attributes[:'portfolio_return']
       end
 
-      if attributes.has_key?(:'inflation_rate')
-        self.inflation_rate = attributes[:'inflation_rate']
-      else
-        self.inflation_rate = 0.0
+      if attributes.has_key?(:'deposit_schedule')
+        self.deposit_schedule = attributes[:'deposit_schedule']
       end
 
-      if attributes.has_key?(:'horizon_frequency_interval')
-        self.horizon_frequency_interval = attributes[:'horizon_frequency_interval']
+      if attributes.has_key?(:'current_savings')
+        self.current_savings = attributes[:'current_savings']
       else
-        self.horizon_frequency_interval = 'year'
+        self.current_savings = 0.0
       end
 
-      if attributes.has_key?(:'portfolio_return')
-        self.portfolio_return = attributes[:'portfolio_return']
+      if attributes.has_key?(:'purchase_amount')
+        self.purchase_amount = attributes[:'purchase_amount']
       end
 
-      if attributes.has_key?(:'deposit_schedule')
-        self.deposit_schedule = attributes[:'deposit_schedule']
+      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
 
@@ -153,16 +153,12 @@ module ProtonApi
     # @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.')
-      end
-
-      if @purchase_amount < 0
-        invalid_properties.push('invalid value for "purchase_amount", must be greater than or equal to 0.')
+      if @purchase_horizon.nil?
+        invalid_properties.push('invalid value for "purchase_horizon", purchase_horizon cannot be nil.')
       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 @purchase_horizon < 0
+        invalid_properties.push('invalid value for "purchase_horizon", must be greater than or equal to 0.')
       end
 
       if !@investment_tax.nil? && @investment_tax > 1
@@ -173,24 +169,28 @@ module ProtonApi
         invalid_properties.push('invalid value for "investment_tax", must be greater than or equal to 0.')
       end
 
-      if @purchase_horizon.nil?
-        invalid_properties.push('invalid value for "purchase_horizon", purchase_horizon cannot be nil.')
+      if @portfolio_return.nil?
+        invalid_properties.push('invalid value for "portfolio_return", portfolio_return cannot be nil.')
       end
 
-      if @purchase_horizon < 0
-        invalid_properties.push('invalid value for "purchase_horizon", must be greater than or equal to 0.')
+      if @portfolio_return < -1
+        invalid_properties.push('invalid value for "portfolio_return", must be greater than or equal to -1.')
       end
 
-      if !@inflation_rate.nil? && @inflation_rate < -1
-        invalid_properties.push('invalid value for "inflation_rate", must be greater than or equal to -1.')
+      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 @portfolio_return.nil?
-        invalid_properties.push('invalid value for "portfolio_return", portfolio_return cannot be nil.')
+      if @purchase_amount.nil?
+        invalid_properties.push('invalid value for "purchase_amount", purchase_amount cannot be nil.')
       end
 
-      if @portfolio_return < -1
-        invalid_properties.push('invalid value for "portfolio_return", must be greater than or equal to -1.')
+      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
@@ -199,43 +199,43 @@ 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 @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 @purchase_horizon.nil?
-      return false if @purchase_horizon < 0
-      return false if !@inflation_rate.nil? && @inflation_rate < -1
       horizon_frequency_interval_validator = EnumAttributeValidator.new('String', ['year', 'quarter', 'month', 'week'])
       return false unless horizon_frequency_interval_validator.valid?(@horizon_frequency_interval)
+      return false if @purchase_horizon.nil?
+      return false if @purchase_horizon < 0
+      return false if !@investment_tax.nil? && @investment_tax > 1
+      return false if !@investment_tax.nil? && @investment_tax < 0
       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'
-      end
-
-      if purchase_amount < 0
-        fail ArgumentError, 'invalid value for "purchase_amount", must be greater than or equal to 0.'
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] horizon_frequency_interval Object to be assigned
+    def horizon_frequency_interval=(horizon_frequency_interval)
+      validator = EnumAttributeValidator.new('String', ['year', 'quarter', 'month', 'week'])
+      unless validator.valid?(horizon_frequency_interval)
+        fail ArgumentError, 'invalid value for "horizon_frequency_interval", must be one of #{validator.allowable_values}.'
       end
-
-      @purchase_amount = purchase_amount
+      @horizon_frequency_interval = horizon_frequency_interval
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] current_savings Value to be assigned
-    def current_savings=(current_savings)
-      if !current_savings.nil? && current_savings < 0
-        fail ArgumentError, 'invalid value for "current_savings", must be greater than or equal to 0.'
+    # @param [Object] purchase_horizon Value to be assigned
+    def purchase_horizon=(purchase_horizon)
+      if purchase_horizon.nil?
+        fail ArgumentError, 'purchase_horizon cannot be nil'
       end
 
-      @current_savings = current_savings
+      if purchase_horizon < 0
+        fail ArgumentError, 'invalid value for "purchase_horizon", must be greater than or equal to 0.'
+      end
+
+      @purchase_horizon = purchase_horizon
     end
 
     # Custom attribute writer method with validation
@@ -253,51 +253,51 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] purchase_horizon Value to be assigned
-    def purchase_horizon=(purchase_horizon)
-      if purchase_horizon.nil?
-        fail ArgumentError, 'purchase_horizon cannot be nil'
+    # @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 purchase_horizon < 0
-        fail ArgumentError, 'invalid value for "purchase_horizon", must be greater than or equal to 0.'
+      if portfolio_return < -1
+        fail ArgumentError, 'invalid value for "portfolio_return", must be greater than or equal to -1.'
       end
 
-      @purchase_horizon = purchase_horizon
+      @portfolio_return = portfolio_return
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] inflation_rate Value to be assigned
-    def inflation_rate=(inflation_rate)
-      if !inflation_rate.nil? && inflation_rate < -1
-        fail ArgumentError, 'invalid value for "inflation_rate", must be greater than or equal to -1.'
+    # @param [Object] current_savings Value to be assigned
+    def current_savings=(current_savings)
+      if !current_savings.nil? && current_savings < 0
+        fail ArgumentError, 'invalid value for "current_savings", must be greater than or equal to 0.'
       end
 
-      @inflation_rate = inflation_rate
+      @current_savings = current_savings
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] horizon_frequency_interval Object to be assigned
-    def horizon_frequency_interval=(horizon_frequency_interval)
-      validator = EnumAttributeValidator.new('String', ['year', 'quarter', 'month', 'week'])
-      unless validator.valid?(horizon_frequency_interval)
-        fail ArgumentError, 'invalid value for "horizon_frequency_interval", must be one of #{validator.allowable_values}.'
+    # 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'
       end
-      @horizon_frequency_interval = horizon_frequency_interval
-    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'
+      if purchase_amount < 0
+        fail ArgumentError, 'invalid value for "purchase_amount", must be greater than or equal to 0.'
       end
 
-      if portfolio_return < -1
-        fail ArgumentError, 'invalid value for "portfolio_return", must be greater than or equal to -1.'
+      @purchase_amount = purchase_amount
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] inflation_rate Value to be assigned
+    def inflation_rate=(inflation_rate)
+      if !inflation_rate.nil? && inflation_rate < -1
+        fail ArgumentError, 'invalid value for "inflation_rate", must be greater than or equal to -1.'
       end
 
-      @portfolio_return = portfolio_return
+      @inflation_rate = inflation_rate
     end
 
     # Checks equality by comparing each attribute.
@@ -305,16 +305,16 @@ module ProtonApi
     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 &&
-          purchase_horizon == o.purchase_horizon &&
-          inflation_rate == o.inflation_rate &&
           horizon_frequency_interval == o.horizon_frequency_interval &&
+          purchase_horizon == o.purchase_horizon &&
+          investment_tax == o.investment_tax &&
           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
@@ -326,7 +326,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, purchase_horizon, inflation_rate, horizon_frequency_interval, portfolio_return, deposit_schedule].hash
+      [account_ids, horizon_frequency_interval, purchase_horizon, investment_tax, portfolio_return, deposit_schedule, current_savings, purchase_amount, inflation_rate, aggregation_account_ids].hash
     end
 
     # Builds the object from hash
@@ -348,17 +348,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
@@ -390,8 +389,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
@@ -414,8 +412,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