proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/risk_allocation_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,19 +14,19 @@ require 'date'
 
 module ProtonApi
   class RiskAllocationRequest
-    attr_accessor :market_data_source
-
-    attr_accessor :allocations
-
     attr_accessor :client_id
 
+    attr_accessor :allocation_method
+
     attr_accessor :opt_config
 
+    attr_accessor :market_data_source
+
     attr_accessor :risk_score
 
     attr_accessor :use_proxy_data
 
-    attr_accessor :allocation_method
+    attr_accessor :allocations
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -53,26 +53,26 @@ module ProtonApi
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'market_data_source' => :'market_data_source',
-        :'allocations' => :'allocations',
         :'client_id' => :'client_id',
+        :'allocation_method' => :'allocation_method',
         :'opt_config' => :'opt_config',
+        :'market_data_source' => :'market_data_source',
         :'risk_score' => :'risk_score',
         :'use_proxy_data' => :'use_proxy_data',
-        :'allocation_method' => :'allocation_method'
+        :'allocations' => :'allocations'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'market_data_source' => :'String',
-        :'allocations' => :'Array<String>',
         :'client_id' => :'String',
+        :'allocation_method' => :'String',
         :'opt_config' => :'OptConfig',
+        :'market_data_source' => :'String',
         :'risk_score' => :'Float',
         :'use_proxy_data' => :'BOOLEAN',
-        :'allocation_method' => :'String'
+        :'allocations' => :'Array<String>'
       }
     end
 
@@ -84,26 +84,24 @@ 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?(:'market_data_source')
-        self.market_data_source = attributes[:'market_data_source']
-      else
-        self.market_data_source = 'nucleus'
-      end
-
-      if attributes.has_key?(:'allocations')
-        if (value = attributes[:'allocations']).is_a?(Array)
-          self.allocations = value
-        end
-      end
-
       if attributes.has_key?(:'client_id')
         self.client_id = attributes[:'client_id']
       end
 
+      if attributes.has_key?(:'allocation_method')
+        self.allocation_method = attributes[:'allocation_method']
+      end
+
       if attributes.has_key?(:'opt_config')
         self.opt_config = attributes[:'opt_config']
       end
 
+      if attributes.has_key?(:'market_data_source')
+        self.market_data_source = attributes[:'market_data_source']
+      else
+        self.market_data_source = 'nucleus'
+      end
+
       if attributes.has_key?(:'risk_score')
         self.risk_score = attributes[:'risk_score']
       end
@@ -114,8 +112,10 @@ module ProtonApi
         self.use_proxy_data = false
       end
 
-      if attributes.has_key?(:'allocation_method')
-        self.allocation_method = attributes[:'allocation_method']
+      if attributes.has_key?(:'allocations')
+        if (value = attributes[:'allocations']).is_a?(Array)
+          self.allocations = value
+        end
       end
     end
 
@@ -123,6 +123,10 @@ module ProtonApi
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
+      if @allocation_method.nil?
+        invalid_properties.push('invalid value for "allocation_method", allocation_method cannot be nil.')
+      end
+
       if !@risk_score.nil? && @risk_score > 100
         invalid_properties.push('invalid value for "risk_score", must be smaller than or equal to 100.')
       end
@@ -131,26 +135,32 @@ module ProtonApi
         invalid_properties.push('invalid value for "risk_score", must be greater than or equal to 0.')
       end
 
-      if @allocation_method.nil?
-        invalid_properties.push('invalid value for "allocation_method", allocation_method cannot be nil.')
-      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 @allocation_method.nil?
+      allocation_method_validator = EnumAttributeValidator.new('String', ['select', 'create'])
+      return false unless allocation_method_validator.valid?(@allocation_method)
       market_data_source_validator = EnumAttributeValidator.new('String', ['nucleus', 'integration'])
       return false unless market_data_source_validator.valid?(@market_data_source)
       return false if !@risk_score.nil? && @risk_score > 100
       return false if !@risk_score.nil? && @risk_score < 0
-      return false if @allocation_method.nil?
-      allocation_method_validator = EnumAttributeValidator.new('String', ['select', 'create'])
-      return false unless allocation_method_validator.valid?(@allocation_method)
       true
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] allocation_method Object to be assigned
+    def allocation_method=(allocation_method)
+      validator = EnumAttributeValidator.new('String', ['select', 'create'])
+      unless validator.valid?(allocation_method)
+        fail ArgumentError, 'invalid value for "allocation_method", must be one of #{validator.allowable_values}.'
+      end
+      @allocation_method = allocation_method
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] market_data_source Object to be assigned
     def market_data_source=(market_data_source)
@@ -175,28 +185,18 @@ module ProtonApi
       @risk_score = risk_score
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] allocation_method Object to be assigned
-    def allocation_method=(allocation_method)
-      validator = EnumAttributeValidator.new('String', ['select', 'create'])
-      unless validator.valid?(allocation_method)
-        fail ArgumentError, 'invalid value for "allocation_method", must be one of #{validator.allowable_values}.'
-      end
-      @allocation_method = allocation_method
-    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 &&
-          market_data_source == o.market_data_source &&
-          allocations == o.allocations &&
           client_id == o.client_id &&
+          allocation_method == o.allocation_method &&
           opt_config == o.opt_config &&
+          market_data_source == o.market_data_source &&
           risk_score == o.risk_score &&
           use_proxy_data == o.use_proxy_data &&
-          allocation_method == o.allocation_method
+          allocations == o.allocations
     end
 
     # @see the `==` method
@@ -208,7 +208,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [market_data_source, allocations, client_id, opt_config, risk_score, use_proxy_data, allocation_method].hash
+      [client_id, allocation_method, opt_config, market_data_source, risk_score, use_proxy_data, allocations].hash
     end
 
     # Builds the object from hash
@@ -230,17 +230,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
@@ -272,8 +271,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
@@ -296,8 +294,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/risk_score_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,39 +14,39 @@ require 'date'
 
 module ProtonApi
   class RiskScoreRequest
-    attr_accessor :post_score
+    attr_accessor :questionnaire_id
 
-    attr_accessor :weights
+    attr_accessor :client_id
+
+    attr_accessor :post_score
 
     attr_accessor :max_answers
 
-    attr_accessor :client_id
+    attr_accessor :weights
 
     attr_accessor :answers
 
-    attr_accessor :questionnaire_id
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'questionnaire_id' => :'questionnaire_id',
+        :'client_id' => :'client_id',
         :'post_score' => :'post_score',
-        :'weights' => :'weights',
         :'max_answers' => :'max_answers',
-        :'client_id' => :'client_id',
-        :'answers' => :'answers',
-        :'questionnaire_id' => :'questionnaire_id'
+        :'weights' => :'weights',
+        :'answers' => :'answers'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
+        :'questionnaire_id' => :'String',
+        :'client_id' => :'String',
         :'post_score' => :'BOOLEAN',
-        :'weights' => :'Array<Float>',
         :'max_answers' => :'Array<Float>',
-        :'client_id' => :'String',
-        :'answers' => :'Array<Float>',
-        :'questionnaire_id' => :'String'
+        :'weights' => :'Array<Float>',
+        :'answers' => :'Array<Float>'
       }
     end
 
@@ -58,26 +58,30 @@ 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?(:'questionnaire_id')
+        self.questionnaire_id = attributes[:'questionnaire_id']
+      end
+
+      if attributes.has_key?(:'client_id')
+        self.client_id = attributes[:'client_id']
+      end
+
       if attributes.has_key?(:'post_score')
         self.post_score = attributes[:'post_score']
       else
         self.post_score = false
       end
 
-      if attributes.has_key?(:'weights')
-        if (value = attributes[:'weights']).is_a?(Array)
-          self.weights = value
-        end
-      end
-
       if attributes.has_key?(:'max_answers')
         if (value = attributes[:'max_answers']).is_a?(Array)
           self.max_answers = value
         end
       end
 
-      if attributes.has_key?(:'client_id')
-        self.client_id = attributes[:'client_id']
+      if attributes.has_key?(:'weights')
+        if (value = attributes[:'weights']).is_a?(Array)
+          self.weights = value
+        end
       end
 
       if attributes.has_key?(:'answers')
@@ -85,10 +89,6 @@ module ProtonApi
           self.answers = value
         end
       end
-
-      if attributes.has_key?(:'questionnaire_id')
-        self.questionnaire_id = attributes[:'questionnaire_id']
-      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -114,12 +114,12 @@ module ProtonApi
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          questionnaire_id == o.questionnaire_id &&
+          client_id == o.client_id &&
           post_score == o.post_score &&
-          weights == o.weights &&
           max_answers == o.max_answers &&
-          client_id == o.client_id &&
-          answers == o.answers &&
-          questionnaire_id == o.questionnaire_id
+          weights == o.weights &&
+          answers == o.answers
     end
 
     # @see the `==` method
@@ -131,7 +131,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [post_score, weights, max_answers, client_id, answers, questionnaire_id].hash
+      [questionnaire_id, client_id, post_score, max_answers, weights, answers].hash
     end
 
     # Builds the object from hash
@@ -153,17 +153,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
@@ -195,8 +194,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
@@ -219,8 +217,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/savings_calculator_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,25 +14,25 @@ require 'date'
 
 module ProtonApi
   class SavingsCalculatorRequest
-    attr_accessor :aggregation_account_ids
-
-    attr_accessor :tax_rate
+    attr_accessor :inflation_rate
 
     attr_accessor :account_ids
 
-    attr_accessor :initial_balance
+    attr_accessor :tax_rate
 
-    attr_accessor :create_log
+    attr_accessor :horizon_frequency_interval
 
-    attr_accessor :inflation_rate
+    attr_accessor :deposit_schedule
 
     attr_accessor :horizon
 
-    attr_accessor :horizon_frequency_interval
+    attr_accessor :return_schedule
 
-    attr_accessor :deposit_schedule
+    attr_accessor :create_log
 
-    attr_accessor :return_schedule
+    attr_accessor :initial_balance
+
+    attr_accessor :aggregation_account_ids
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -59,32 +59,32 @@ module ProtonApi
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'aggregation_account_ids' => :'aggregation_account_ids',
-        :'tax_rate' => :'tax_rate',
-        :'account_ids' => :'account_ids',
-        :'initial_balance' => :'initial_balance',
-        :'create_log' => :'create_log',
         :'inflation_rate' => :'inflation_rate',
-        :'horizon' => :'horizon',
+        :'account_ids' => :'account_ids',
+        :'tax_rate' => :'tax_rate',
         :'horizon_frequency_interval' => :'horizon_frequency_interval',
         :'deposit_schedule' => :'deposit_schedule',
-        :'return_schedule' => :'return_schedule'
+        :'horizon' => :'horizon',
+        :'return_schedule' => :'return_schedule',
+        :'create_log' => :'create_log',
+        :'initial_balance' => :'initial_balance',
+        :'aggregation_account_ids' => :'aggregation_account_ids'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'aggregation_account_ids' => :'Array<String>',
-        :'tax_rate' => :'Float',
-        :'account_ids' => :'Array<String>',
-        :'initial_balance' => :'Float',
-        :'create_log' => :'BOOLEAN',
         :'inflation_rate' => :'Float',
-        :'horizon' => :'Integer',
+        :'account_ids' => :'Array<String>',
+        :'tax_rate' => :'Float',
         :'horizon_frequency_interval' => :'String',
         :'deposit_schedule' => :'Array<SavingsDepositSchedule>',
-        :'return_schedule' => :'Array<Float>'
+        :'horizon' => :'Integer',
+        :'return_schedule' => :'Array<Float>',
+        :'create_log' => :'BOOLEAN',
+        :'initial_balance' => :'Float',
+        :'aggregation_account_ids' => :'Array<String>'
       }
     end
 
@@ -96,16 +96,10 @@ 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?(:'tax_rate')
-        self.tax_rate = attributes[:'tax_rate']
+      if attributes.has_key?(:'inflation_rate')
+        self.inflation_rate = attributes[:'inflation_rate']
       else
-        self.tax_rate = 0.0
+        self.inflation_rate = 0.0
       end
 
       if attributes.has_key?(:'account_ids')
@@ -114,24 +108,10 @@ module ProtonApi
         end
       end
 
-      if attributes.has_key?(:'initial_balance')
-        self.initial_balance = attributes[:'initial_balance']
-      end
-
-      if attributes.has_key?(:'create_log')
-        self.create_log = attributes[:'create_log']
-      else
-        self.create_log = false
-      end
-
-      if attributes.has_key?(:'inflation_rate')
-        self.inflation_rate = attributes[:'inflation_rate']
+      if attributes.has_key?(:'tax_rate')
+        self.tax_rate = attributes[:'tax_rate']
       else
-        self.inflation_rate = 0.0
-      end
-
-      if attributes.has_key?(:'horizon')
-        self.horizon = attributes[:'horizon']
+        self.tax_rate = 0.0
       end
 
       if attributes.has_key?(:'horizon_frequency_interval')
@@ -146,17 +126,41 @@ module ProtonApi
         end
       end
 
+      if attributes.has_key?(:'horizon')
+        self.horizon = attributes[:'horizon']
+      end
+
       if attributes.has_key?(:'return_schedule')
         if (value = attributes[:'return_schedule']).is_a?(Array)
           self.return_schedule = value
         end
       end
+
+      if attributes.has_key?(:'create_log')
+        self.create_log = attributes[:'create_log']
+      else
+        self.create_log = false
+      end
+
+      if attributes.has_key?(:'initial_balance')
+        self.initial_balance = attributes[:'initial_balance']
+      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 !@inflation_rate.nil? && @inflation_rate < -1
+        invalid_properties.push('invalid value for "inflation_rate", must be greater than or equal to -1.')
+      end
+
       if !@tax_rate.nil? && @tax_rate > 1
         invalid_properties.push('invalid value for "tax_rate", must be smaller than or equal to 1.')
       end
@@ -165,14 +169,6 @@ module ProtonApi
         invalid_properties.push('invalid value for "tax_rate", must be greater than or equal to 0.')
       end
 
-      if !@initial_balance.nil? && @initial_balance < 0
-        invalid_properties.push('invalid value for "initial_balance", 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 @horizon.nil?
         invalid_properties.push('invalid value for "horizon", horizon cannot be nil.')
       end
@@ -185,24 +181,38 @@ module ProtonApi
         invalid_properties.push('invalid value for "return_schedule", return_schedule cannot be nil.')
       end
 
+      if !@initial_balance.nil? && @initial_balance < 0
+        invalid_properties.push('invalid value for "initial_balance", must be greater than or equal to 0.')
+      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 !@inflation_rate.nil? && @inflation_rate < -1
       return false if !@tax_rate.nil? && @tax_rate > 1
       return false if !@tax_rate.nil? && @tax_rate < 0
-      return false if !@initial_balance.nil? && @initial_balance < 0
-      return false if !@inflation_rate.nil? && @inflation_rate < -1
-      return false if @horizon.nil?
-      return false if @horizon < 0
       horizon_frequency_interval_validator = EnumAttributeValidator.new('String', ['year', 'quarter', 'month', 'week', 'day'])
       return false unless horizon_frequency_interval_validator.valid?(@horizon_frequency_interval)
+      return false if @horizon.nil?
+      return false if @horizon < 0
       return false if @return_schedule.nil?
+      return false if !@initial_balance.nil? && @initial_balance < 0
       true
     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
+
     # Custom attribute writer method with validation
     # @param [Object] tax_rate Value to be assigned
     def tax_rate=(tax_rate)
@@ -217,24 +227,14 @@ module ProtonApi
       @tax_rate = tax_rate
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] initial_balance Value to be assigned
-    def initial_balance=(initial_balance)
-      if !initial_balance.nil? && initial_balance < 0
-        fail ArgumentError, 'invalid value for "initial_balance", must be greater than or equal to 0.'
-      end
-
-      @initial_balance = initial_balance
-    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.'
+    # 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', 'day'])
+      unless validator.valid?(horizon_frequency_interval)
+        fail ArgumentError, 'invalid value for "horizon_frequency_interval", must be one of #{validator.allowable_values}.'
       end
-
-      @inflation_rate = inflation_rate
+      @horizon_frequency_interval = horizon_frequency_interval
     end
 
     # Custom attribute writer method with validation
@@ -251,14 +251,14 @@ module ProtonApi
       @horizon = horizon
     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', 'day'])
-      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] initial_balance Value to be assigned
+    def initial_balance=(initial_balance)
+      if !initial_balance.nil? && initial_balance < 0
+        fail ArgumentError, 'invalid value for "initial_balance", must be greater than or equal to 0.'
       end
-      @horizon_frequency_interval = horizon_frequency_interval
+
+      @initial_balance = initial_balance
     end
 
     # Checks equality by comparing each attribute.
@@ -266,16 +266,16 @@ module ProtonApi
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          aggregation_account_ids == o.aggregation_account_ids &&
-          tax_rate == o.tax_rate &&
-          account_ids == o.account_ids &&
-          initial_balance == o.initial_balance &&
-          create_log == o.create_log &&
           inflation_rate == o.inflation_rate &&
-          horizon == o.horizon &&
+          account_ids == o.account_ids &&
+          tax_rate == o.tax_rate &&
           horizon_frequency_interval == o.horizon_frequency_interval &&
           deposit_schedule == o.deposit_schedule &&
-          return_schedule == o.return_schedule
+          horizon == o.horizon &&
+          return_schedule == o.return_schedule &&
+          create_log == o.create_log &&
+          initial_balance == o.initial_balance &&
+          aggregation_account_ids == o.aggregation_account_ids
     end
 
     # @see the `==` method
@@ -287,7 +287,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [aggregation_account_ids, tax_rate, account_ids, initial_balance, create_log, inflation_rate, horizon, horizon_frequency_interval, deposit_schedule, return_schedule].hash
+      [inflation_rate, account_ids, tax_rate, horizon_frequency_interval, deposit_schedule, horizon, return_schedule, create_log, initial_balance, aggregation_account_ids].hash
     end
 
     # Builds the object from hash
@@ -309,17 +309,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
@@ -351,8 +350,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
@@ -375,8 +373,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