proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/annuity_calculator_annuity_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,29 +14,29 @@ require 'date'
 
 module ProtonApi
   class AnnuityCalculatorAnnuityAmountRequest
-    attr_accessor :annuity_amount
-
-    attr_accessor :aggregation_account_ids
+    attr_accessor :inflation_rate
 
-    attr_accessor :tax_rate
+    attr_accessor :decumulation_horizon
 
     attr_accessor :account_ids
 
-    attr_accessor :initial_balance
+    attr_accessor :tax_rate
 
-    attr_accessor :create_log
+    attr_accessor :accumulation_horizon
 
-    attr_accessor :inflation_rate
+    attr_accessor :annuity_amount
 
-    attr_accessor :decumulation_horizon
+    attr_accessor :portfolio_return
 
-    attr_accessor :accumulation_horizon
+    attr_accessor :deposit_schedule
 
     attr_accessor :annuity_frequency_interval
 
-    attr_accessor :portfolio_return
+    attr_accessor :initial_balance
 
-    attr_accessor :deposit_schedule
+    attr_accessor :aggregation_account_ids
+
+    attr_accessor :create_log
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -63,36 +63,36 @@ module ProtonApi
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'annuity_amount' => :'annuity_amount',
-        :'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',
         :'decumulation_horizon' => :'decumulation_horizon',
+        :'account_ids' => :'account_ids',
+        :'tax_rate' => :'tax_rate',
         :'accumulation_horizon' => :'accumulation_horizon',
-        :'annuity_frequency_interval' => :'annuity_frequency_interval',
+        :'annuity_amount' => :'annuity_amount',
         :'portfolio_return' => :'portfolio_return',
-        :'deposit_schedule' => :'deposit_schedule'
+        :'deposit_schedule' => :'deposit_schedule',
+        :'annuity_frequency_interval' => :'annuity_frequency_interval',
+        :'initial_balance' => :'initial_balance',
+        :'aggregation_account_ids' => :'aggregation_account_ids',
+        :'create_log' => :'create_log'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'annuity_amount' => :'Float',
-        :'aggregation_account_ids' => :'Array<String>',
-        :'tax_rate' => :'Float',
-        :'account_ids' => :'Array<String>',
-        :'initial_balance' => :'Float',
-        :'create_log' => :'BOOLEAN',
         :'inflation_rate' => :'Float',
         :'decumulation_horizon' => :'Integer',
+        :'account_ids' => :'Array<String>',
+        :'tax_rate' => :'Float',
         :'accumulation_horizon' => :'Integer',
-        :'annuity_frequency_interval' => :'String',
+        :'annuity_amount' => :'Float',
         :'portfolio_return' => :'Float',
-        :'deposit_schedule' => :'AnnuityDepositSchedule'
+        :'deposit_schedule' => :'AnnuityDepositSchedule',
+        :'annuity_frequency_interval' => :'String',
+        :'initial_balance' => :'Float',
+        :'aggregation_account_ids' => :'Array<String>',
+        :'create_log' => :'BOOLEAN'
       }
     end
 
@@ -104,22 +104,14 @@ 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?(:'annuity_amount')
-        self.annuity_amount = attributes[:'annuity_amount']
+      if attributes.has_key?(:'inflation_rate')
+        self.inflation_rate = attributes[:'inflation_rate']
       else
-        self.annuity_amount = 1.0
-      end
-
-      if attributes.has_key?(:'aggregation_account_ids')
-        if (value = attributes[:'aggregation_account_ids']).is_a?(Array)
-          self.aggregation_account_ids = value
-        end
+        self.inflation_rate = 0.0
       end
 
-      if attributes.has_key?(:'tax_rate')
-        self.tax_rate = attributes[:'tax_rate']
-      else
-        self.tax_rate = 0.0
+      if attributes.has_key?(:'decumulation_horizon')
+        self.decumulation_horizon = attributes[:'decumulation_horizon']
       end
 
       if attributes.has_key?(:'account_ids')
@@ -128,30 +120,28 @@ module ProtonApi
         end
       end
 
-      if attributes.has_key?(:'initial_balance')
-        self.initial_balance = attributes[:'initial_balance']
+      if attributes.has_key?(:'tax_rate')
+        self.tax_rate = attributes[:'tax_rate']
       else
-        self.initial_balance = 0.0
+        self.tax_rate = 0.0
       end
 
-      if attributes.has_key?(:'create_log')
-        self.create_log = attributes[:'create_log']
-      else
-        self.create_log = false
+      if attributes.has_key?(:'accumulation_horizon')
+        self.accumulation_horizon = attributes[:'accumulation_horizon']
       end
 
-      if attributes.has_key?(:'inflation_rate')
-        self.inflation_rate = attributes[:'inflation_rate']
+      if attributes.has_key?(:'annuity_amount')
+        self.annuity_amount = attributes[:'annuity_amount']
       else
-        self.inflation_rate = 0.0
+        self.annuity_amount = 1.0
       end
 
-      if attributes.has_key?(:'decumulation_horizon')
-        self.decumulation_horizon = attributes[:'decumulation_horizon']
+      if attributes.has_key?(:'portfolio_return')
+        self.portfolio_return = attributes[:'portfolio_return']
       end
 
-      if attributes.has_key?(:'accumulation_horizon')
-        self.accumulation_horizon = attributes[:'accumulation_horizon']
+      if attributes.has_key?(:'deposit_schedule')
+        self.deposit_schedule = attributes[:'deposit_schedule']
       end
 
       if attributes.has_key?(:'annuity_frequency_interval')
@@ -160,12 +150,22 @@ module ProtonApi
         self.annuity_frequency_interval = 'year'
       end
 
-      if attributes.has_key?(:'portfolio_return')
-        self.portfolio_return = attributes[:'portfolio_return']
+      if attributes.has_key?(:'initial_balance')
+        self.initial_balance = attributes[:'initial_balance']
+      else
+        self.initial_balance = 0.0
       end
 
-      if attributes.has_key?(:'deposit_schedule')
-        self.deposit_schedule = attributes[:'deposit_schedule']
+      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?(:'create_log')
+        self.create_log = attributes[:'create_log']
+      else
+        self.create_log = false
       end
     end
 
@@ -173,22 +173,6 @@ module ProtonApi
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if !@annuity_amount.nil? && @annuity_amount < 0
-        invalid_properties.push('invalid value for "annuity_amount", must be greater than or equal to 0.')
-      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
-
-      if !@tax_rate.nil? && @tax_rate < 0
-        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 > 20
         invalid_properties.push('invalid value for "inflation_rate", must be smaller than or equal to 20.')
       end
@@ -205,6 +189,14 @@ module ProtonApi
         invalid_properties.push('invalid value for "decumulation_horizon", 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
+
+      if !@tax_rate.nil? && @tax_rate < 0
+        invalid_properties.push('invalid value for "tax_rate", must be greater than or equal to 0.')
+      end
+
       if @accumulation_horizon.nil?
         invalid_properties.push('invalid value for "accumulation_horizon", accumulation_horizon cannot be nil.')
       end
@@ -213,66 +205,40 @@ module ProtonApi
         invalid_properties.push('invalid value for "accumulation_horizon", must be greater than or equal to 0.')
       end
 
+      if !@annuity_amount.nil? && @annuity_amount < 0
+        invalid_properties.push('invalid value for "annuity_amount", 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.')
       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 !@annuity_amount.nil? && @annuity_amount < 0
-      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 > 20
       return false if !@inflation_rate.nil? && @inflation_rate < -1
       return false if @decumulation_horizon.nil?
       return false if @decumulation_horizon < 1
+      return false if !@tax_rate.nil? && @tax_rate > 1
+      return false if !@tax_rate.nil? && @tax_rate < 0
       return false if @accumulation_horizon.nil?
       return false if @accumulation_horizon < 0
+      return false if !@annuity_amount.nil? && @annuity_amount < 0
+      return false if @portfolio_return.nil?
       annuity_frequency_interval_validator = EnumAttributeValidator.new('String', ['year', 'quarter', 'month', 'week', 'day'])
       return false unless annuity_frequency_interval_validator.valid?(@annuity_frequency_interval)
-      return false if @portfolio_return.nil?
+      return false if !@initial_balance.nil? && @initial_balance < 0
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] annuity_amount Value to be assigned
-    def annuity_amount=(annuity_amount)
-      if !annuity_amount.nil? && annuity_amount < 0
-        fail ArgumentError, 'invalid value for "annuity_amount", must be greater than or equal to 0.'
-      end
-
-      @annuity_amount = annuity_amount
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] tax_rate Value to be assigned
-    def tax_rate=(tax_rate)
-      if !tax_rate.nil? && tax_rate > 1
-        fail ArgumentError, 'invalid value for "tax_rate", must be smaller than or equal to 1.'
-      end
-
-      if !tax_rate.nil? && tax_rate < 0
-        fail ArgumentError, 'invalid value for "tax_rate", must be greater than or equal to 0.'
-      end
-
-      @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)
@@ -301,6 +267,20 @@ module ProtonApi
       @decumulation_horizon = decumulation_horizon
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] tax_rate Value to be assigned
+    def tax_rate=(tax_rate)
+      if !tax_rate.nil? && tax_rate > 1
+        fail ArgumentError, 'invalid value for "tax_rate", must be smaller than or equal to 1.'
+      end
+
+      if !tax_rate.nil? && tax_rate < 0
+        fail ArgumentError, 'invalid value for "tax_rate", must be greater than or equal to 0.'
+      end
+
+      @tax_rate = tax_rate
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] accumulation_horizon Value to be assigned
     def accumulation_horizon=(accumulation_horizon)
@@ -315,6 +295,16 @@ module ProtonApi
       @accumulation_horizon = accumulation_horizon
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] annuity_amount Value to be assigned
+    def annuity_amount=(annuity_amount)
+      if !annuity_amount.nil? && annuity_amount < 0
+        fail ArgumentError, 'invalid value for "annuity_amount", must be greater than or equal to 0.'
+      end
+
+      @annuity_amount = annuity_amount
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] annuity_frequency_interval Object to be assigned
     def annuity_frequency_interval=(annuity_frequency_interval)
@@ -325,23 +315,33 @@ module ProtonApi
       @annuity_frequency_interval = annuity_frequency_interval
     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
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          annuity_amount == o.annuity_amount &&
-          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 &&
           decumulation_horizon == o.decumulation_horizon &&
+          account_ids == o.account_ids &&
+          tax_rate == o.tax_rate &&
           accumulation_horizon == o.accumulation_horizon &&
-          annuity_frequency_interval == o.annuity_frequency_interval &&
+          annuity_amount == o.annuity_amount &&
           portfolio_return == o.portfolio_return &&
-          deposit_schedule == o.deposit_schedule
+          deposit_schedule == o.deposit_schedule &&
+          annuity_frequency_interval == o.annuity_frequency_interval &&
+          initial_balance == o.initial_balance &&
+          aggregation_account_ids == o.aggregation_account_ids &&
+          create_log == o.create_log
     end
 
     # @see the `==` method
@@ -353,7 +353,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [annuity_amount, aggregation_account_ids, tax_rate, account_ids, initial_balance, create_log, inflation_rate, decumulation_horizon, accumulation_horizon, annuity_frequency_interval, portfolio_return, deposit_schedule].hash
+      [inflation_rate, decumulation_horizon, account_ids, tax_rate, accumulation_horizon, annuity_amount, portfolio_return, deposit_schedule, annuity_frequency_interval, initial_balance, aggregation_account_ids, create_log].hash
     end
 
     # Builds the object from hash
@@ -375,17 +375,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
@@ -417,8 +416,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
@@ -441,8 +439,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/annuity_calculator_decumulation_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,29 +14,29 @@ require 'date'
 
 module ProtonApi
   class AnnuityCalculatorDecumulationHorizonRequest
-    attr_accessor :annuity_amount
-
-    attr_accessor :aggregation_account_ids
+    attr_accessor :inflation_rate
 
-    attr_accessor :tax_rate
+    attr_accessor :decumulation_horizon
 
     attr_accessor :account_ids
 
-    attr_accessor :initial_balance
+    attr_accessor :tax_rate
 
-    attr_accessor :create_log
+    attr_accessor :accumulation_horizon
 
-    attr_accessor :inflation_rate
+    attr_accessor :annuity_amount
 
-    attr_accessor :decumulation_horizon
+    attr_accessor :portfolio_return
 
-    attr_accessor :accumulation_horizon
+    attr_accessor :deposit_schedule
 
     attr_accessor :annuity_frequency_interval
 
-    attr_accessor :portfolio_return
+    attr_accessor :initial_balance
 
-    attr_accessor :deposit_schedule
+    attr_accessor :aggregation_account_ids
+
+    attr_accessor :create_log
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -63,36 +63,36 @@ module ProtonApi
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'annuity_amount' => :'annuity_amount',
-        :'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',
         :'decumulation_horizon' => :'decumulation_horizon',
+        :'account_ids' => :'account_ids',
+        :'tax_rate' => :'tax_rate',
         :'accumulation_horizon' => :'accumulation_horizon',
-        :'annuity_frequency_interval' => :'annuity_frequency_interval',
+        :'annuity_amount' => :'annuity_amount',
         :'portfolio_return' => :'portfolio_return',
-        :'deposit_schedule' => :'deposit_schedule'
+        :'deposit_schedule' => :'deposit_schedule',
+        :'annuity_frequency_interval' => :'annuity_frequency_interval',
+        :'initial_balance' => :'initial_balance',
+        :'aggregation_account_ids' => :'aggregation_account_ids',
+        :'create_log' => :'create_log'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'annuity_amount' => :'Float',
-        :'aggregation_account_ids' => :'Array<String>',
-        :'tax_rate' => :'Float',
-        :'account_ids' => :'Array<String>',
-        :'initial_balance' => :'Float',
-        :'create_log' => :'BOOLEAN',
         :'inflation_rate' => :'Float',
         :'decumulation_horizon' => :'Integer',
+        :'account_ids' => :'Array<String>',
+        :'tax_rate' => :'Float',
         :'accumulation_horizon' => :'Integer',
-        :'annuity_frequency_interval' => :'String',
+        :'annuity_amount' => :'Float',
         :'portfolio_return' => :'Float',
-        :'deposit_schedule' => :'AnnuityDepositSchedule'
+        :'deposit_schedule' => :'AnnuityDepositSchedule',
+        :'annuity_frequency_interval' => :'String',
+        :'initial_balance' => :'Float',
+        :'aggregation_account_ids' => :'Array<String>',
+        :'create_log' => :'BOOLEAN'
       }
     end
 
@@ -104,20 +104,14 @@ 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?(:'annuity_amount')
-        self.annuity_amount = attributes[:'annuity_amount']
-      end
-
-      if attributes.has_key?(:'aggregation_account_ids')
-        if (value = attributes[:'aggregation_account_ids']).is_a?(Array)
-          self.aggregation_account_ids = value
-        end
+      if attributes.has_key?(:'inflation_rate')
+        self.inflation_rate = attributes[:'inflation_rate']
+      else
+        self.inflation_rate = 0.0
       end
 
-      if attributes.has_key?(:'tax_rate')
-        self.tax_rate = attributes[:'tax_rate']
-      else
-        self.tax_rate = 0.0
+      if attributes.has_key?(:'decumulation_horizon')
+        self.decumulation_horizon = attributes[:'decumulation_horizon']
       end
 
       if attributes.has_key?(:'account_ids')
@@ -126,30 +120,26 @@ module ProtonApi
         end
       end
 
-      if attributes.has_key?(:'initial_balance')
-        self.initial_balance = attributes[:'initial_balance']
+      if attributes.has_key?(:'tax_rate')
+        self.tax_rate = attributes[:'tax_rate']
       else
-        self.initial_balance = 0.0
+        self.tax_rate = 0.0
       end
 
-      if attributes.has_key?(:'create_log')
-        self.create_log = attributes[:'create_log']
-      else
-        self.create_log = false
+      if attributes.has_key?(:'accumulation_horizon')
+        self.accumulation_horizon = attributes[:'accumulation_horizon']
       end
 
-      if attributes.has_key?(:'inflation_rate')
-        self.inflation_rate = attributes[:'inflation_rate']
-      else
-        self.inflation_rate = 0.0
+      if attributes.has_key?(:'annuity_amount')
+        self.annuity_amount = attributes[:'annuity_amount']
       end
 
-      if attributes.has_key?(:'decumulation_horizon')
-        self.decumulation_horizon = attributes[:'decumulation_horizon']
+      if attributes.has_key?(:'portfolio_return')
+        self.portfolio_return = attributes[:'portfolio_return']
       end
 
-      if attributes.has_key?(:'accumulation_horizon')
-        self.accumulation_horizon = attributes[:'accumulation_horizon']
+      if attributes.has_key?(:'deposit_schedule')
+        self.deposit_schedule = attributes[:'deposit_schedule']
       end
 
       if attributes.has_key?(:'annuity_frequency_interval')
@@ -158,12 +148,22 @@ module ProtonApi
         self.annuity_frequency_interval = 'year'
       end
 
-      if attributes.has_key?(:'portfolio_return')
-        self.portfolio_return = attributes[:'portfolio_return']
+      if attributes.has_key?(:'initial_balance')
+        self.initial_balance = attributes[:'initial_balance']
+      else
+        self.initial_balance = 0.0
       end
 
-      if attributes.has_key?(:'deposit_schedule')
-        self.deposit_schedule = attributes[:'deposit_schedule']
+      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?(:'create_log')
+        self.create_log = attributes[:'create_log']
+      else
+        self.create_log = false
       end
     end
 
@@ -171,26 +171,6 @@ module ProtonApi
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @annuity_amount.nil?
-        invalid_properties.push('invalid value for "annuity_amount", annuity_amount cannot be nil.')
-      end
-
-      if @annuity_amount < 0
-        invalid_properties.push('invalid value for "annuity_amount", must be greater than or equal to 0.')
-      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
-
-      if !@tax_rate.nil? && @tax_rate < 0
-        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 > 20
         invalid_properties.push('invalid value for "inflation_rate", must be smaller than or equal to 20.')
       end
@@ -203,6 +183,14 @@ module ProtonApi
         invalid_properties.push('invalid value for "decumulation_horizon", 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
+
+      if !@tax_rate.nil? && @tax_rate < 0
+        invalid_properties.push('invalid value for "tax_rate", must be greater than or equal to 0.')
+      end
+
       if @accumulation_horizon.nil?
         invalid_properties.push('invalid value for "accumulation_horizon", accumulation_horizon cannot be nil.')
       end
@@ -211,70 +199,44 @@ module ProtonApi
         invalid_properties.push('invalid value for "accumulation_horizon", must be greater than or equal to 0.')
       end
 
+      if @annuity_amount.nil?
+        invalid_properties.push('invalid value for "annuity_amount", annuity_amount cannot be nil.')
+      end
+
+      if @annuity_amount < 0
+        invalid_properties.push('invalid value for "annuity_amount", 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.')
       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 @annuity_amount.nil?
-      return false if @annuity_amount < 0
-      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 > 20
       return false if !@inflation_rate.nil? && @inflation_rate < -1
       return false if !@decumulation_horizon.nil? && @decumulation_horizon < 1
+      return false if !@tax_rate.nil? && @tax_rate > 1
+      return false if !@tax_rate.nil? && @tax_rate < 0
       return false if @accumulation_horizon.nil?
       return false if @accumulation_horizon < 0
+      return false if @annuity_amount.nil?
+      return false if @annuity_amount < 0
+      return false if @portfolio_return.nil?
       annuity_frequency_interval_validator = EnumAttributeValidator.new('String', ['year', 'quarter', 'month', 'week', 'day'])
       return false unless annuity_frequency_interval_validator.valid?(@annuity_frequency_interval)
-      return false if @portfolio_return.nil?
+      return false if !@initial_balance.nil? && @initial_balance < 0
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] annuity_amount Value to be assigned
-    def annuity_amount=(annuity_amount)
-      if annuity_amount.nil?
-        fail ArgumentError, 'annuity_amount cannot be nil'
-      end
-
-      if annuity_amount < 0
-        fail ArgumentError, 'invalid value for "annuity_amount", must be greater than or equal to 0.'
-      end
-
-      @annuity_amount = annuity_amount
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] tax_rate Value to be assigned
-    def tax_rate=(tax_rate)
-      if !tax_rate.nil? && tax_rate > 1
-        fail ArgumentError, 'invalid value for "tax_rate", must be smaller than or equal to 1.'
-      end
-
-      if !tax_rate.nil? && tax_rate < 0
-        fail ArgumentError, 'invalid value for "tax_rate", must be greater than or equal to 0.'
-      end
-
-      @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)
@@ -299,6 +261,20 @@ module ProtonApi
       @decumulation_horizon = decumulation_horizon
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] tax_rate Value to be assigned
+    def tax_rate=(tax_rate)
+      if !tax_rate.nil? && tax_rate > 1
+        fail ArgumentError, 'invalid value for "tax_rate", must be smaller than or equal to 1.'
+      end
+
+      if !tax_rate.nil? && tax_rate < 0
+        fail ArgumentError, 'invalid value for "tax_rate", must be greater than or equal to 0.'
+      end
+
+      @tax_rate = tax_rate
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] accumulation_horizon Value to be assigned
     def accumulation_horizon=(accumulation_horizon)
@@ -313,6 +289,20 @@ module ProtonApi
       @accumulation_horizon = accumulation_horizon
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] annuity_amount Value to be assigned
+    def annuity_amount=(annuity_amount)
+      if annuity_amount.nil?
+        fail ArgumentError, 'annuity_amount cannot be nil'
+      end
+
+      if annuity_amount < 0
+        fail ArgumentError, 'invalid value for "annuity_amount", must be greater than or equal to 0.'
+      end
+
+      @annuity_amount = annuity_amount
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] annuity_frequency_interval Object to be assigned
     def annuity_frequency_interval=(annuity_frequency_interval)
@@ -323,23 +313,33 @@ module ProtonApi
       @annuity_frequency_interval = annuity_frequency_interval
     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
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          annuity_amount == o.annuity_amount &&
-          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 &&
           decumulation_horizon == o.decumulation_horizon &&
+          account_ids == o.account_ids &&
+          tax_rate == o.tax_rate &&
           accumulation_horizon == o.accumulation_horizon &&
-          annuity_frequency_interval == o.annuity_frequency_interval &&
+          annuity_amount == o.annuity_amount &&
           portfolio_return == o.portfolio_return &&
-          deposit_schedule == o.deposit_schedule
+          deposit_schedule == o.deposit_schedule &&
+          annuity_frequency_interval == o.annuity_frequency_interval &&
+          initial_balance == o.initial_balance &&
+          aggregation_account_ids == o.aggregation_account_ids &&
+          create_log == o.create_log
     end
 
     # @see the `==` method
@@ -351,7 +351,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [annuity_amount, aggregation_account_ids, tax_rate, account_ids, initial_balance, create_log, inflation_rate, decumulation_horizon, accumulation_horizon, annuity_frequency_interval, portfolio_return, deposit_schedule].hash
+      [inflation_rate, decumulation_horizon, account_ids, tax_rate, accumulation_horizon, annuity_amount, portfolio_return, deposit_schedule, annuity_frequency_interval, initial_balance, aggregation_account_ids, create_log].hash
     end
 
     # Builds the object from hash
@@ -373,17 +373,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
@@ -415,8 +414,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
@@ -439,8 +437,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