proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/goal_decumulation_status_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,49 +14,49 @@ require 'date'
 
 module ProtonApi
   class GoalDecumulationStatusRequest
-    attr_accessor :thresh_type
+    attr_accessor :recommendation_config
 
-    attr_accessor :goal_id
+    attr_accessor :compounding_rate
 
-    attr_accessor :client_id
+    attr_accessor :recommend_type
 
-    attr_accessor :conf_tgt
+    attr_accessor :create_log
 
-    attr_accessor :remove_outliers
+    attr_accessor :n
 
     attr_accessor :a_horizon
 
-    attr_accessor :withdrawal_config
-
-    attr_accessor :p_ret
+    attr_accessor :p_risk
 
-    attr_accessor :compounding_rate
+    attr_accessor :remove_outliers
 
     attr_accessor :adjust_for_compounding
 
-    attr_accessor :deposit_config
-
-    attr_accessor :thresh
+    attr_accessor :goal_id
 
-    attr_accessor :horizon_frequency
+    attr_accessor :conf_tgt
 
-    attr_accessor :recommendation_config
+    attr_accessor :trading_days_per_year
 
-    attr_accessor :create_log
+    attr_accessor :thresh
 
     attr_accessor :withdrawal_tax
 
-    attr_accessor :trading_days_per_year
+    attr_accessor :d_horizon
 
-    attr_accessor :n
+    attr_accessor :client_id
 
-    attr_accessor :d_horizon
+    attr_accessor :thresh_type
 
-    attr_accessor :p_risk
+    attr_accessor :horizon_frequency
+
+    attr_accessor :withdrawal_config
 
     attr_accessor :curr_inv
 
-    attr_accessor :recommend_type
+    attr_accessor :deposit_config
+
+    attr_accessor :p_ret
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -83,56 +83,56 @@ module ProtonApi
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'thresh_type' => :'thresh_type',
-        :'goal_id' => :'goal_id',
-        :'client_id' => :'client_id',
-        :'conf_tgt' => :'conf_tgt',
-        :'remove_outliers' => :'remove_outliers',
-        :'a_horizon' => :'a_horizon',
-        :'withdrawal_config' => :'withdrawal_config',
-        :'p_ret' => :'p_ret',
+        :'recommendation_config' => :'recommendation_config',
         :'compounding_rate' => :'compounding_rate',
+        :'recommend_type' => :'recommend_type',
+        :'create_log' => :'create_log',
+        :'n' => :'n',
+        :'a_horizon' => :'a_horizon',
+        :'p_risk' => :'p_risk',
+        :'remove_outliers' => :'remove_outliers',
         :'adjust_for_compounding' => :'adjust_for_compounding',
-        :'deposit_config' => :'deposit_config',
+        :'goal_id' => :'goal_id',
+        :'conf_tgt' => :'conf_tgt',
+        :'trading_days_per_year' => :'trading_days_per_year',
         :'thresh' => :'thresh',
-        :'horizon_frequency' => :'horizon_frequency',
-        :'recommendation_config' => :'recommendation_config',
-        :'create_log' => :'create_log',
         :'withdrawal_tax' => :'withdrawal_tax',
-        :'trading_days_per_year' => :'trading_days_per_year',
-        :'n' => :'n',
         :'d_horizon' => :'d_horizon',
-        :'p_risk' => :'p_risk',
+        :'client_id' => :'client_id',
+        :'thresh_type' => :'thresh_type',
+        :'horizon_frequency' => :'horizon_frequency',
+        :'withdrawal_config' => :'withdrawal_config',
         :'curr_inv' => :'curr_inv',
-        :'recommend_type' => :'recommend_type'
+        :'deposit_config' => :'deposit_config',
+        :'p_ret' => :'p_ret'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'thresh_type' => :'String',
-        :'goal_id' => :'String',
-        :'client_id' => :'String',
-        :'conf_tgt' => :'Float',
-        :'remove_outliers' => :'BOOLEAN',
-        :'a_horizon' => :'Integer',
-        :'withdrawal_config' => :'Array<GoalWithdrawalConfig>',
-        :'p_ret' => :'Array<Float>',
+        :'recommendation_config' => :'RecommendationConfig',
         :'compounding_rate' => :'Float',
+        :'recommend_type' => :'String',
+        :'create_log' => :'BOOLEAN',
+        :'n' => :'Integer',
+        :'a_horizon' => :'Integer',
+        :'p_risk' => :'Array<Float>',
+        :'remove_outliers' => :'BOOLEAN',
         :'adjust_for_compounding' => :'BOOLEAN',
-        :'deposit_config' => :'Array<DecumulationGoalDepositConfig>',
+        :'goal_id' => :'String',
+        :'conf_tgt' => :'Float',
+        :'trading_days_per_year' => :'Integer',
         :'thresh' => :'Float',
-        :'horizon_frequency' => :'String',
-        :'recommendation_config' => :'RecommendationConfig',
-        :'create_log' => :'BOOLEAN',
         :'withdrawal_tax' => :'Float',
-        :'trading_days_per_year' => :'Integer',
-        :'n' => :'Integer',
         :'d_horizon' => :'Integer',
-        :'p_risk' => :'Array<Float>',
+        :'client_id' => :'String',
+        :'thresh_type' => :'String',
+        :'horizon_frequency' => :'String',
+        :'withdrawal_config' => :'Array<GoalWithdrawalConfig>',
         :'curr_inv' => :'Float',
-        :'recommend_type' => :'String'
+        :'deposit_config' => :'Array<DecumulationGoalDepositConfig>',
+        :'p_ret' => :'Array<Float>'
       }
     end
 
@@ -144,52 +144,48 @@ 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?(:'thresh_type')
-        self.thresh_type = attributes[:'thresh_type']
-      else
-        self.thresh_type = 'perc'
+      if attributes.has_key?(:'recommendation_config')
+        self.recommendation_config = attributes[:'recommendation_config']
       end
 
-      if attributes.has_key?(:'goal_id')
-        self.goal_id = attributes[:'goal_id']
+      if attributes.has_key?(:'compounding_rate')
+        self.compounding_rate = attributes[:'compounding_rate']
+      else
+        self.compounding_rate = 0.0
       end
 
-      if attributes.has_key?(:'client_id')
-        self.client_id = attributes[:'client_id']
+      if attributes.has_key?(:'recommend_type')
+        self.recommend_type = attributes[:'recommend_type']
+      else
+        self.recommend_type = 'horizon'
       end
 
-      if attributes.has_key?(:'conf_tgt')
-        self.conf_tgt = attributes[:'conf_tgt']
+      if attributes.has_key?(:'create_log')
+        self.create_log = attributes[:'create_log']
       else
-        self.conf_tgt = 0.9
+        self.create_log = false
       end
 
-      if attributes.has_key?(:'remove_outliers')
-        self.remove_outliers = attributes[:'remove_outliers']
+      if attributes.has_key?(:'n')
+        self.n = attributes[:'n']
       else
-        self.remove_outliers = true
+        self.n = 1000
       end
 
       if attributes.has_key?(:'a_horizon')
         self.a_horizon = attributes[:'a_horizon']
       end
 
-      if attributes.has_key?(:'withdrawal_config')
-        if (value = attributes[:'withdrawal_config']).is_a?(Array)
-          self.withdrawal_config = value
-        end
-      end
-
-      if attributes.has_key?(:'p_ret')
-        if (value = attributes[:'p_ret']).is_a?(Array)
-          self.p_ret = value
+      if attributes.has_key?(:'p_risk')
+        if (value = attributes[:'p_risk']).is_a?(Array)
+          self.p_risk = value
         end
       end
 
-      if attributes.has_key?(:'compounding_rate')
-        self.compounding_rate = attributes[:'compounding_rate']
+      if attributes.has_key?(:'remove_outliers')
+        self.remove_outliers = attributes[:'remove_outliers']
       else
-        self.compounding_rate = 0.0
+        self.remove_outliers = true
       end
 
       if attributes.has_key?(:'adjust_for_compounding')
@@ -198,30 +194,24 @@ module ProtonApi
         self.adjust_for_compounding = false
       end
 
-      if attributes.has_key?(:'deposit_config')
-        if (value = attributes[:'deposit_config']).is_a?(Array)
-          self.deposit_config = value
-        end
-      end
-
-      if attributes.has_key?(:'thresh')
-        self.thresh = attributes[:'thresh']
+      if attributes.has_key?(:'goal_id')
+        self.goal_id = attributes[:'goal_id']
       end
 
-      if attributes.has_key?(:'horizon_frequency')
-        self.horizon_frequency = attributes[:'horizon_frequency']
+      if attributes.has_key?(:'conf_tgt')
+        self.conf_tgt = attributes[:'conf_tgt']
       else
-        self.horizon_frequency = 'year'
+        self.conf_tgt = 0.9
       end
 
-      if attributes.has_key?(:'recommendation_config')
-        self.recommendation_config = attributes[:'recommendation_config']
+      if attributes.has_key?(:'trading_days_per_year')
+        self.trading_days_per_year = attributes[:'trading_days_per_year']
+      else
+        self.trading_days_per_year = 252
       end
 
-      if attributes.has_key?(:'create_log')
-        self.create_log = attributes[:'create_log']
-      else
-        self.create_log = false
+      if attributes.has_key?(:'thresh')
+        self.thresh = attributes[:'thresh']
       end
 
       if attributes.has_key?(:'withdrawal_tax')
@@ -230,25 +220,29 @@ module ProtonApi
         self.withdrawal_tax = 0.0
       end
 
-      if attributes.has_key?(:'trading_days_per_year')
-        self.trading_days_per_year = attributes[:'trading_days_per_year']
-      else
-        self.trading_days_per_year = 252
+      if attributes.has_key?(:'d_horizon')
+        self.d_horizon = attributes[:'d_horizon']
       end
 
-      if attributes.has_key?(:'n')
-        self.n = attributes[:'n']
+      if attributes.has_key?(:'client_id')
+        self.client_id = attributes[:'client_id']
+      end
+
+      if attributes.has_key?(:'thresh_type')
+        self.thresh_type = attributes[:'thresh_type']
       else
-        self.n = 1000
+        self.thresh_type = 'perc'
       end
 
-      if attributes.has_key?(:'d_horizon')
-        self.d_horizon = attributes[:'d_horizon']
+      if attributes.has_key?(:'horizon_frequency')
+        self.horizon_frequency = attributes[:'horizon_frequency']
+      else
+        self.horizon_frequency = 'year'
       end
 
-      if attributes.has_key?(:'p_risk')
-        if (value = attributes[:'p_risk']).is_a?(Array)
-          self.p_risk = value
+      if attributes.has_key?(:'withdrawal_config')
+        if (value = attributes[:'withdrawal_config']).is_a?(Array)
+          self.withdrawal_config = value
         end
       end
 
@@ -256,10 +250,16 @@ module ProtonApi
         self.curr_inv = attributes[:'curr_inv']
       end
 
-      if attributes.has_key?(:'recommend_type')
-        self.recommend_type = attributes[:'recommend_type']
-      else
-        self.recommend_type = 'horizon'
+      if attributes.has_key?(:'deposit_config')
+        if (value = attributes[:'deposit_config']).is_a?(Array)
+          self.deposit_config = value
+        end
+      end
+
+      if attributes.has_key?(:'p_ret')
+        if (value = attributes[:'p_ret']).is_a?(Array)
+          self.p_ret = value
+        end
       end
     end
 
@@ -267,12 +267,16 @@ module ProtonApi
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if !@conf_tgt.nil? && @conf_tgt > 1
-        invalid_properties.push('invalid value for "conf_tgt", must be smaller than or equal to 1.')
+      if !@compounding_rate.nil? && @compounding_rate < -1
+        invalid_properties.push('invalid value for "compounding_rate", must be greater than or equal to -1.')
       end
 
-      if !@conf_tgt.nil? && @conf_tgt < 0
-        invalid_properties.push('invalid value for "conf_tgt", must be greater than or equal to 0.')
+      if !@n.nil? && @n > 10000
+        invalid_properties.push('invalid value for "n", must be smaller than or equal to 10000.')
+      end
+
+      if !@n.nil? && @n < 1
+        invalid_properties.push('invalid value for "n", must be greater than or equal to 1.')
       end
 
       if !@a_horizon.nil? && @a_horizon > 350
@@ -283,24 +287,16 @@ module ProtonApi
         invalid_properties.push('invalid value for "a_horizon", must be greater than or equal to 0.')
       end
 
-      if @p_ret.nil?
-        invalid_properties.push('invalid value for "p_ret", p_ret cannot be nil.')
-      end
-
-      if !@compounding_rate.nil? && @compounding_rate < -1
-        invalid_properties.push('invalid value for "compounding_rate", must be greater than or equal to -1.')
-      end
-
-      if !@thresh.nil? && @thresh < 0
-        invalid_properties.push('invalid value for "thresh", must be greater than or equal to 0.')
+      if @p_risk.nil?
+        invalid_properties.push('invalid value for "p_risk", p_risk cannot be nil.')
       end
 
-      if !@withdrawal_tax.nil? && @withdrawal_tax > 1
-        invalid_properties.push('invalid value for "withdrawal_tax", must be smaller than or equal to 1.')
+      if !@conf_tgt.nil? && @conf_tgt > 1
+        invalid_properties.push('invalid value for "conf_tgt", must be smaller than or equal to 1.')
       end
 
-      if !@withdrawal_tax.nil? && @withdrawal_tax < 0
-        invalid_properties.push('invalid value for "withdrawal_tax", must be greater than or equal to 0.')
+      if !@conf_tgt.nil? && @conf_tgt < 0
+        invalid_properties.push('invalid value for "conf_tgt", must be greater than or equal to 0.')
       end
 
       if !@trading_days_per_year.nil? && @trading_days_per_year > 365
@@ -311,12 +307,16 @@ module ProtonApi
         invalid_properties.push('invalid value for "trading_days_per_year", must be greater than or equal to 1.')
       end
 
-      if !@n.nil? && @n > 10000
-        invalid_properties.push('invalid value for "n", must be smaller than or equal to 10000.')
+      if !@thresh.nil? && @thresh < 0
+        invalid_properties.push('invalid value for "thresh", must be greater than or equal to 0.')
       end
 
-      if !@n.nil? && @n < 1
-        invalid_properties.push('invalid value for "n", must be greater than or equal to 1.')
+      if !@withdrawal_tax.nil? && @withdrawal_tax > 1
+        invalid_properties.push('invalid value for "withdrawal_tax", must be smaller than or equal to 1.')
+      end
+
+      if !@withdrawal_tax.nil? && @withdrawal_tax < 0
+        invalid_properties.push('invalid value for "withdrawal_tax", must be greater than or equal to 0.')
       end
 
       if !@d_horizon.nil? && @d_horizon > 350
@@ -327,68 +327,78 @@ module ProtonApi
         invalid_properties.push('invalid value for "d_horizon", must be greater than or equal to 0.')
       end
 
-      if @p_risk.nil?
-        invalid_properties.push('invalid value for "p_risk", p_risk cannot be nil.')
-      end
-
       if !@curr_inv.nil? && @curr_inv < 0
         invalid_properties.push('invalid value for "curr_inv", must be greater than or equal to 0.')
       end
 
+      if @p_ret.nil?
+        invalid_properties.push('invalid value for "p_ret", p_ret 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?
-      thresh_type_validator = EnumAttributeValidator.new('String', ['amnt', 'perc'])
-      return false unless thresh_type_validator.valid?(@thresh_type)
-      return false if !@conf_tgt.nil? && @conf_tgt > 1
-      return false if !@conf_tgt.nil? && @conf_tgt < 0
+      return false if !@compounding_rate.nil? && @compounding_rate < -1
+      recommend_type_validator = EnumAttributeValidator.new('String', ['recurring', 'one-time', 'combo', 'horizon'])
+      return false unless recommend_type_validator.valid?(@recommend_type)
+      return false if !@n.nil? && @n > 10000
+      return false if !@n.nil? && @n < 1
       return false if !@a_horizon.nil? && @a_horizon > 350
       return false if !@a_horizon.nil? && @a_horizon < 0
-      return false if @p_ret.nil?
-      return false if !@compounding_rate.nil? && @compounding_rate < -1
+      return false if @p_risk.nil?
+      return false if !@conf_tgt.nil? && @conf_tgt > 1
+      return false if !@conf_tgt.nil? && @conf_tgt < 0
+      return false if !@trading_days_per_year.nil? && @trading_days_per_year > 365
+      return false if !@trading_days_per_year.nil? && @trading_days_per_year < 1
       return false if !@thresh.nil? && @thresh < 0
-      horizon_frequency_validator = EnumAttributeValidator.new('String', ['year', 'six_months', 'quarter', 'month', 'two_weeks', 'week', 'day'])
-      return false unless horizon_frequency_validator.valid?(@horizon_frequency)
       return false if !@withdrawal_tax.nil? && @withdrawal_tax > 1
       return false if !@withdrawal_tax.nil? && @withdrawal_tax < 0
-      return false if !@trading_days_per_year.nil? && @trading_days_per_year > 365
-      return false if !@trading_days_per_year.nil? && @trading_days_per_year < 1
-      return false if !@n.nil? && @n > 10000
-      return false if !@n.nil? && @n < 1
       return false if !@d_horizon.nil? && @d_horizon > 350
       return false if !@d_horizon.nil? && @d_horizon < 0
-      return false if @p_risk.nil?
+      thresh_type_validator = EnumAttributeValidator.new('String', ['amnt', 'perc'])
+      return false unless thresh_type_validator.valid?(@thresh_type)
+      horizon_frequency_validator = EnumAttributeValidator.new('String', ['year', 'six_months', 'quarter', 'month', 'two_weeks', 'week', 'day'])
+      return false unless horizon_frequency_validator.valid?(@horizon_frequency)
       return false if !@curr_inv.nil? && @curr_inv < 0
-      recommend_type_validator = EnumAttributeValidator.new('String', ['recurring', 'one-time', 'combo', 'horizon'])
-      return false unless recommend_type_validator.valid?(@recommend_type)
+      return false if @p_ret.nil?
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] compounding_rate Value to be assigned
+    def compounding_rate=(compounding_rate)
+      if !compounding_rate.nil? && compounding_rate < -1
+        fail ArgumentError, 'invalid value for "compounding_rate", must be greater than or equal to -1.'
+      end
+
+      @compounding_rate = compounding_rate
+    end
+
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] thresh_type Object to be assigned
-    def thresh_type=(thresh_type)
-      validator = EnumAttributeValidator.new('String', ['amnt', 'perc'])
-      unless validator.valid?(thresh_type)
-        fail ArgumentError, 'invalid value for "thresh_type", must be one of #{validator.allowable_values}.'
+    # @param [Object] recommend_type Object to be assigned
+    def recommend_type=(recommend_type)
+      validator = EnumAttributeValidator.new('String', ['recurring', 'one-time', 'combo', 'horizon'])
+      unless validator.valid?(recommend_type)
+        fail ArgumentError, 'invalid value for "recommend_type", must be one of #{validator.allowable_values}.'
       end
-      @thresh_type = thresh_type
+      @recommend_type = recommend_type
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] conf_tgt Value to be assigned
-    def conf_tgt=(conf_tgt)
-      if !conf_tgt.nil? && conf_tgt > 1
-        fail ArgumentError, 'invalid value for "conf_tgt", must be smaller than or equal to 1.'
+    # @param [Object] n Value to be assigned
+    def n=(n)
+      if !n.nil? && n > 10000
+        fail ArgumentError, 'invalid value for "n", must be smaller than or equal to 10000.'
       end
 
-      if !conf_tgt.nil? && conf_tgt < 0
-        fail ArgumentError, 'invalid value for "conf_tgt", must be greater than or equal to 0.'
+      if !n.nil? && n < 1
+        fail ArgumentError, 'invalid value for "n", must be greater than or equal to 1.'
       end
 
-      @conf_tgt = conf_tgt
+      @n = n
     end
 
     # Custom attribute writer method with validation
@@ -406,13 +416,31 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] compounding_rate Value to be assigned
-    def compounding_rate=(compounding_rate)
-      if !compounding_rate.nil? && compounding_rate < -1
-        fail ArgumentError, 'invalid value for "compounding_rate", must be greater than or equal to -1.'
+    # @param [Object] conf_tgt Value to be assigned
+    def conf_tgt=(conf_tgt)
+      if !conf_tgt.nil? && conf_tgt > 1
+        fail ArgumentError, 'invalid value for "conf_tgt", must be smaller than or equal to 1.'
       end
 
-      @compounding_rate = compounding_rate
+      if !conf_tgt.nil? && conf_tgt < 0
+        fail ArgumentError, 'invalid value for "conf_tgt", must be greater than or equal to 0.'
+      end
+
+      @conf_tgt = conf_tgt
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] trading_days_per_year Value to be assigned
+    def trading_days_per_year=(trading_days_per_year)
+      if !trading_days_per_year.nil? && trading_days_per_year > 365
+        fail ArgumentError, 'invalid value for "trading_days_per_year", must be smaller than or equal to 365.'
+      end
+
+      if !trading_days_per_year.nil? && trading_days_per_year < 1
+        fail ArgumentError, 'invalid value for "trading_days_per_year", must be greater than or equal to 1.'
+      end
+
+      @trading_days_per_year = trading_days_per_year
     end
 
     # Custom attribute writer method with validation
@@ -425,16 +453,6 @@ module ProtonApi
       @thresh = thresh
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] horizon_frequency Object to be assigned
-    def horizon_frequency=(horizon_frequency)
-      validator = EnumAttributeValidator.new('String', ['year', 'six_months', 'quarter', 'month', 'two_weeks', 'week', 'day'])
-      unless validator.valid?(horizon_frequency)
-        fail ArgumentError, 'invalid value for "horizon_frequency", must be one of #{validator.allowable_values}.'
-      end
-      @horizon_frequency = horizon_frequency
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] withdrawal_tax Value to be assigned
     def withdrawal_tax=(withdrawal_tax)
@@ -449,34 +467,6 @@ module ProtonApi
       @withdrawal_tax = withdrawal_tax
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] trading_days_per_year Value to be assigned
-    def trading_days_per_year=(trading_days_per_year)
-      if !trading_days_per_year.nil? && trading_days_per_year > 365
-        fail ArgumentError, 'invalid value for "trading_days_per_year", must be smaller than or equal to 365.'
-      end
-
-      if !trading_days_per_year.nil? && trading_days_per_year < 1
-        fail ArgumentError, 'invalid value for "trading_days_per_year", must be greater than or equal to 1.'
-      end
-
-      @trading_days_per_year = trading_days_per_year
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] n Value to be assigned
-    def n=(n)
-      if !n.nil? && n > 10000
-        fail ArgumentError, 'invalid value for "n", must be smaller than or equal to 10000.'
-      end
-
-      if !n.nil? && n < 1
-        fail ArgumentError, 'invalid value for "n", must be greater than or equal to 1.'
-      end
-
-      @n = n
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] d_horizon Value to be assigned
     def d_horizon=(d_horizon)
@@ -491,6 +481,26 @@ module ProtonApi
       @d_horizon = d_horizon
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] thresh_type Object to be assigned
+    def thresh_type=(thresh_type)
+      validator = EnumAttributeValidator.new('String', ['amnt', 'perc'])
+      unless validator.valid?(thresh_type)
+        fail ArgumentError, 'invalid value for "thresh_type", must be one of #{validator.allowable_values}.'
+      end
+      @thresh_type = thresh_type
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] horizon_frequency Object to be assigned
+    def horizon_frequency=(horizon_frequency)
+      validator = EnumAttributeValidator.new('String', ['year', 'six_months', 'quarter', 'month', 'two_weeks', 'week', 'day'])
+      unless validator.valid?(horizon_frequency)
+        fail ArgumentError, 'invalid value for "horizon_frequency", must be one of #{validator.allowable_values}.'
+      end
+      @horizon_frequency = horizon_frequency
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] curr_inv Value to be assigned
     def curr_inv=(curr_inv)
@@ -501,43 +511,33 @@ module ProtonApi
       @curr_inv = curr_inv
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] recommend_type Object to be assigned
-    def recommend_type=(recommend_type)
-      validator = EnumAttributeValidator.new('String', ['recurring', 'one-time', 'combo', 'horizon'])
-      unless validator.valid?(recommend_type)
-        fail ArgumentError, 'invalid value for "recommend_type", must be one of #{validator.allowable_values}.'
-      end
-      @recommend_type = recommend_type
-    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 &&
-          thresh_type == o.thresh_type &&
-          goal_id == o.goal_id &&
-          client_id == o.client_id &&
-          conf_tgt == o.conf_tgt &&
-          remove_outliers == o.remove_outliers &&
-          a_horizon == o.a_horizon &&
-          withdrawal_config == o.withdrawal_config &&
-          p_ret == o.p_ret &&
+          recommendation_config == o.recommendation_config &&
           compounding_rate == o.compounding_rate &&
+          recommend_type == o.recommend_type &&
+          create_log == o.create_log &&
+          n == o.n &&
+          a_horizon == o.a_horizon &&
+          p_risk == o.p_risk &&
+          remove_outliers == o.remove_outliers &&
           adjust_for_compounding == o.adjust_for_compounding &&
-          deposit_config == o.deposit_config &&
+          goal_id == o.goal_id &&
+          conf_tgt == o.conf_tgt &&
+          trading_days_per_year == o.trading_days_per_year &&
           thresh == o.thresh &&
-          horizon_frequency == o.horizon_frequency &&
-          recommendation_config == o.recommendation_config &&
-          create_log == o.create_log &&
           withdrawal_tax == o.withdrawal_tax &&
-          trading_days_per_year == o.trading_days_per_year &&
-          n == o.n &&
           d_horizon == o.d_horizon &&
-          p_risk == o.p_risk &&
+          client_id == o.client_id &&
+          thresh_type == o.thresh_type &&
+          horizon_frequency == o.horizon_frequency &&
+          withdrawal_config == o.withdrawal_config &&
           curr_inv == o.curr_inv &&
-          recommend_type == o.recommend_type
+          deposit_config == o.deposit_config &&
+          p_ret == o.p_ret
     end
 
     # @see the `==` method
@@ -549,7 +549,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [thresh_type, goal_id, client_id, conf_tgt, remove_outliers, a_horizon, withdrawal_config, p_ret, compounding_rate, adjust_for_compounding, deposit_config, thresh, horizon_frequency, recommendation_config, create_log, withdrawal_tax, trading_days_per_year, n, d_horizon, p_risk, curr_inv, recommend_type].hash
+      [recommendation_config, compounding_rate, recommend_type, create_log, n, a_horizon, p_risk, remove_outliers, adjust_for_compounding, goal_id, conf_tgt, trading_days_per_year, thresh, withdrawal_tax, d_horizon, client_id, thresh_type, horizon_frequency, withdrawal_config, curr_inv, deposit_config, p_ret].hash
     end
 
     # Builds the object from hash
@@ -571,17 +571,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
@@ -613,8 +612,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
@@ -637,8 +635,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