proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/retirement_calculator_expenses_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
 
@@ -16,43 +16,43 @@ module ProtonApi
   class RetirementCalculatorExpensesRequest
     attr_accessor :retirement_savings
 
-    attr_accessor :aggregation_account_ids
-
-    attr_accessor :retirement_age
-
-    attr_accessor :retirement_income
-
     attr_accessor :current_age
 
     attr_accessor :account_ids
 
-    attr_accessor :retirement_tax
+    attr_accessor :retirement_income
 
-    attr_accessor :inflation_rate
+    attr_accessor :retirement_tax
 
     attr_accessor :death_age
 
+    attr_accessor :retirement_age
+
+    attr_accessor :percent_of_expenses_covered
+
     attr_accessor :portfolio_return
 
     attr_accessor :deposit_schedule
 
-    attr_accessor :percent_of_expenses_covered
+    attr_accessor :inflation_rate
+
+    attr_accessor :aggregation_account_ids
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'retirement_savings' => :'retirement_savings',
-        :'aggregation_account_ids' => :'aggregation_account_ids',
-        :'retirement_age' => :'retirement_age',
-        :'retirement_income' => :'retirement_income',
         :'current_age' => :'current_age',
         :'account_ids' => :'account_ids',
+        :'retirement_income' => :'retirement_income',
         :'retirement_tax' => :'retirement_tax',
-        :'inflation_rate' => :'inflation_rate',
         :'death_age' => :'death_age',
+        :'retirement_age' => :'retirement_age',
+        :'percent_of_expenses_covered' => :'percent_of_expenses_covered',
         :'portfolio_return' => :'portfolio_return',
         :'deposit_schedule' => :'deposit_schedule',
-        :'percent_of_expenses_covered' => :'percent_of_expenses_covered'
+        :'inflation_rate' => :'inflation_rate',
+        :'aggregation_account_ids' => :'aggregation_account_ids'
       }
     end
 
@@ -60,17 +60,17 @@ module ProtonApi
     def self.swagger_types
       {
         :'retirement_savings' => :'Float',
-        :'aggregation_account_ids' => :'Array<String>',
-        :'retirement_age' => :'Integer',
-        :'retirement_income' => :'Float',
         :'current_age' => :'Integer',
         :'account_ids' => :'Array<String>',
+        :'retirement_income' => :'Float',
         :'retirement_tax' => :'Float',
-        :'inflation_rate' => :'Float',
         :'death_age' => :'Integer',
+        :'retirement_age' => :'Integer',
+        :'percent_of_expenses_covered' => :'Float',
         :'portfolio_return' => :'Float',
         :'deposit_schedule' => :'CalculatorDepositSchedule1',
-        :'percent_of_expenses_covered' => :'Float'
+        :'inflation_rate' => :'Float',
+        :'aggregation_account_ids' => :'Array<String>'
       }
     end
 
@@ -88,24 +88,6 @@ module ProtonApi
         self.retirement_savings = 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
-
-      if attributes.has_key?(:'retirement_age')
-        self.retirement_age = attributes[:'retirement_age']
-      else
-        self.retirement_age = 65
-      end
-
-      if attributes.has_key?(:'retirement_income')
-        self.retirement_income = attributes[:'retirement_income']
-      else
-        self.retirement_income = 0.0
-      end
-
       if attributes.has_key?(:'current_age')
         self.current_age = attributes[:'current_age']
       end
@@ -116,20 +98,32 @@ module ProtonApi
         end
       end
 
+      if attributes.has_key?(:'retirement_income')
+        self.retirement_income = attributes[:'retirement_income']
+      else
+        self.retirement_income = 0.0
+      end
+
       if attributes.has_key?(:'retirement_tax')
         self.retirement_tax = attributes[:'retirement_tax']
       else
         self.retirement_tax = 0.0
       end
 
-      if attributes.has_key?(:'inflation_rate')
-        self.inflation_rate = attributes[:'inflation_rate']
+      if attributes.has_key?(:'death_age')
+        self.death_age = attributes[:'death_age']
+      end
+
+      if attributes.has_key?(:'retirement_age')
+        self.retirement_age = attributes[:'retirement_age']
       else
-        self.inflation_rate = 0.0
+        self.retirement_age = 65
       end
 
-      if attributes.has_key?(:'death_age')
-        self.death_age = attributes[:'death_age']
+      if attributes.has_key?(:'percent_of_expenses_covered')
+        self.percent_of_expenses_covered = attributes[:'percent_of_expenses_covered']
+      else
+        self.percent_of_expenses_covered = 1.0
       end
 
       if attributes.has_key?(:'portfolio_return')
@@ -140,10 +134,16 @@ module ProtonApi
         self.deposit_schedule = attributes[:'deposit_schedule']
       end
 
-      if attributes.has_key?(:'percent_of_expenses_covered')
-        self.percent_of_expenses_covered = attributes[:'percent_of_expenses_covered']
+      if attributes.has_key?(:'inflation_rate')
+        self.inflation_rate = attributes[:'inflation_rate']
       else
-        self.percent_of_expenses_covered = 1.0
+        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
 
@@ -155,14 +155,6 @@ module ProtonApi
         invalid_properties.push('invalid value for "retirement_savings", must be greater than or equal to 0.')
       end
 
-      if !@retirement_age.nil? && @retirement_age < 0
-        invalid_properties.push('invalid value for "retirement_age", must be greater than or equal to 0.')
-      end
-
-      if !@retirement_income.nil? && @retirement_income < 0
-        invalid_properties.push('invalid value for "retirement_income", must be greater than or equal to 0.')
-      end
-
       if @current_age.nil?
         invalid_properties.push('invalid value for "current_age", current_age cannot be nil.')
       end
@@ -171,6 +163,10 @@ module ProtonApi
         invalid_properties.push('invalid value for "current_age", must be greater than or equal to 0.')
       end
 
+      if !@retirement_income.nil? && @retirement_income < 0
+        invalid_properties.push('invalid value for "retirement_income", must be greater than or equal to 0.')
+      end
+
       if !@retirement_tax.nil? && @retirement_tax > 1
         invalid_properties.push('invalid value for "retirement_tax", must be smaller than or equal to 1.')
       end
@@ -179,10 +175,6 @@ module ProtonApi
         invalid_properties.push('invalid value for "retirement_tax", must be greater than or equal to 0.')
       end
 
-      if !@inflation_rate.nil? && @inflation_rate < -1
-        invalid_properties.push('invalid value for "inflation_rate", must be greater than or equal to -1.')
-      end
-
       if @death_age.nil?
         invalid_properties.push('invalid value for "death_age", death_age cannot be nil.')
       end
@@ -191,12 +183,8 @@ module ProtonApi
         invalid_properties.push('invalid value for "death_age", 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 @portfolio_return < -1
-        invalid_properties.push('invalid value for "portfolio_return", must be greater than or equal to -1.')
+      if !@retirement_age.nil? && @retirement_age < 0
+        invalid_properties.push('invalid value for "retirement_age", must be greater than or equal to 0.')
       end
 
       if !@percent_of_expenses_covered.nil? && @percent_of_expenses_covered > 1
@@ -207,6 +195,18 @@ module ProtonApi
         invalid_properties.push('invalid value for "percent_of_expenses_covered", 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 @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.')
+      end
+
       invalid_properties
     end
 
@@ -214,19 +214,19 @@ module ProtonApi
     # @return true if the model is valid
     def valid?
       return false if !@retirement_savings.nil? && @retirement_savings < 0
-      return false if !@retirement_age.nil? && @retirement_age < 0
-      return false if !@retirement_income.nil? && @retirement_income < 0
       return false if @current_age.nil?
       return false if @current_age < 0
+      return false if !@retirement_income.nil? && @retirement_income < 0
       return false if !@retirement_tax.nil? && @retirement_tax > 1
       return false if !@retirement_tax.nil? && @retirement_tax < 0
-      return false if !@inflation_rate.nil? && @inflation_rate < -1
       return false if @death_age.nil?
       return false if @death_age < 0
-      return false if @portfolio_return.nil?
-      return false if @portfolio_return < -1
+      return false if !@retirement_age.nil? && @retirement_age < 0
       return false if !@percent_of_expenses_covered.nil? && @percent_of_expenses_covered > 1
       return false if !@percent_of_expenses_covered.nil? && @percent_of_expenses_covered < 0
+      return false if @portfolio_return.nil?
+      return false if @portfolio_return < -1
+      return false if !@inflation_rate.nil? && @inflation_rate < -1
       true
     end
 
@@ -241,13 +241,17 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] retirement_age Value to be assigned
-    def retirement_age=(retirement_age)
-      if !retirement_age.nil? && retirement_age < 0
-        fail ArgumentError, 'invalid value for "retirement_age", must be greater than or equal to 0.'
+    # @param [Object] current_age Value to be assigned
+    def current_age=(current_age)
+      if current_age.nil?
+        fail ArgumentError, 'current_age cannot be nil'
       end
 
-      @retirement_age = retirement_age
+      if current_age < 0
+        fail ArgumentError, 'invalid value for "current_age", must be greater than or equal to 0.'
+      end
+
+      @current_age = current_age
     end
 
     # Custom attribute writer method with validation
@@ -260,20 +264,6 @@ module ProtonApi
       @retirement_income = retirement_income
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] current_age Value to be assigned
-    def current_age=(current_age)
-      if current_age.nil?
-        fail ArgumentError, 'current_age cannot be nil'
-      end
-
-      if current_age < 0
-        fail ArgumentError, 'invalid value for "current_age", must be greater than or equal to 0.'
-      end
-
-      @current_age = current_age
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] retirement_tax Value to be assigned
     def retirement_tax=(retirement_tax)
@@ -288,16 +278,6 @@ module ProtonApi
       @retirement_tax = retirement_tax
     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] death_age Value to be assigned
     def death_age=(death_age)
@@ -313,17 +293,13 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] portfolio_return Value to be assigned
-    def portfolio_return=(portfolio_return)
-      if portfolio_return.nil?
-        fail ArgumentError, 'portfolio_return cannot be nil'
-      end
-
-      if portfolio_return < -1
-        fail ArgumentError, 'invalid value for "portfolio_return", must be greater than or equal to -1.'
+    # @param [Object] retirement_age Value to be assigned
+    def retirement_age=(retirement_age)
+      if !retirement_age.nil? && retirement_age < 0
+        fail ArgumentError, 'invalid value for "retirement_age", must be greater than or equal to 0.'
       end
 
-      @portfolio_return = portfolio_return
+      @retirement_age = retirement_age
     end
 
     # Custom attribute writer method with validation
@@ -340,23 +316,47 @@ module ProtonApi
       @percent_of_expenses_covered = percent_of_expenses_covered
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] portfolio_return Value to be assigned
+    def portfolio_return=(portfolio_return)
+      if portfolio_return.nil?
+        fail ArgumentError, 'portfolio_return cannot be nil'
+      end
+
+      if portfolio_return < -1
+        fail ArgumentError, 'invalid value for "portfolio_return", must be greater than or equal to -1.'
+      end
+
+      @portfolio_return = portfolio_return
+    end
+
+    # Custom attribute writer method with validation
+    # @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 &&
           retirement_savings == o.retirement_savings &&
-          aggregation_account_ids == o.aggregation_account_ids &&
-          retirement_age == o.retirement_age &&
-          retirement_income == o.retirement_income &&
           current_age == o.current_age &&
           account_ids == o.account_ids &&
+          retirement_income == o.retirement_income &&
           retirement_tax == o.retirement_tax &&
-          inflation_rate == o.inflation_rate &&
           death_age == o.death_age &&
+          retirement_age == o.retirement_age &&
+          percent_of_expenses_covered == o.percent_of_expenses_covered &&
           portfolio_return == o.portfolio_return &&
           deposit_schedule == o.deposit_schedule &&
-          percent_of_expenses_covered == o.percent_of_expenses_covered
+          inflation_rate == o.inflation_rate &&
+          aggregation_account_ids == o.aggregation_account_ids
     end
 
     # @see the `==` method
@@ -368,7 +368,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [retirement_savings, aggregation_account_ids, retirement_age, retirement_income, current_age, account_ids, retirement_tax, inflation_rate, death_age, portfolio_return, deposit_schedule, percent_of_expenses_covered].hash
+      [retirement_savings, current_age, account_ids, retirement_income, retirement_tax, death_age, retirement_age, percent_of_expenses_covered, portfolio_return, deposit_schedule, inflation_rate, aggregation_account_ids].hash
     end
 
     # Builds the object from hash
@@ -390,17 +390,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
@@ -432,8 +431,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
@@ -456,8 +454,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/retirement_calculator_percent_covered_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
 
@@ -16,43 +16,43 @@ module ProtonApi
   class RetirementCalculatorPercentCoveredRequest
     attr_accessor :retirement_savings
 
-    attr_accessor :aggregation_account_ids
-
-    attr_accessor :retirement_age
-
-    attr_accessor :retirement_income
-
-    attr_accessor :retirement_expenses
-
     attr_accessor :current_age
 
     attr_accessor :account_ids
 
-    attr_accessor :retirement_tax
+    attr_accessor :retirement_income
 
-    attr_accessor :inflation_rate
+    attr_accessor :retirement_tax
 
     attr_accessor :death_age
 
+    attr_accessor :retirement_age
+
     attr_accessor :portfolio_return
 
+    attr_accessor :retirement_expenses
+
     attr_accessor :deposit_schedule
 
+    attr_accessor :inflation_rate
+
+    attr_accessor :aggregation_account_ids
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'retirement_savings' => :'retirement_savings',
-        :'aggregation_account_ids' => :'aggregation_account_ids',
-        :'retirement_age' => :'retirement_age',
-        :'retirement_income' => :'retirement_income',
-        :'retirement_expenses' => :'retirement_expenses',
         :'current_age' => :'current_age',
         :'account_ids' => :'account_ids',
+        :'retirement_income' => :'retirement_income',
         :'retirement_tax' => :'retirement_tax',
-        :'inflation_rate' => :'inflation_rate',
         :'death_age' => :'death_age',
+        :'retirement_age' => :'retirement_age',
         :'portfolio_return' => :'portfolio_return',
-        :'deposit_schedule' => :'deposit_schedule'
+        :'retirement_expenses' => :'retirement_expenses',
+        :'deposit_schedule' => :'deposit_schedule',
+        :'inflation_rate' => :'inflation_rate',
+        :'aggregation_account_ids' => :'aggregation_account_ids'
       }
     end
 
@@ -60,17 +60,17 @@ module ProtonApi
     def self.swagger_types
       {
         :'retirement_savings' => :'Float',
-        :'aggregation_account_ids' => :'Array<String>',
-        :'retirement_age' => :'Integer',
-        :'retirement_income' => :'Float',
-        :'retirement_expenses' => :'Float',
         :'current_age' => :'Integer',
         :'account_ids' => :'Array<String>',
+        :'retirement_income' => :'Float',
         :'retirement_tax' => :'Float',
-        :'inflation_rate' => :'Float',
         :'death_age' => :'Integer',
+        :'retirement_age' => :'Integer',
         :'portfolio_return' => :'Float',
-        :'deposit_schedule' => :'CalculatorDepositSchedule1'
+        :'retirement_expenses' => :'Float',
+        :'deposit_schedule' => :'CalculatorDepositSchedule1',
+        :'inflation_rate' => :'Float',
+        :'aggregation_account_ids' => :'Array<String>'
       }
     end
 
@@ -88,28 +88,6 @@ module ProtonApi
         self.retirement_savings = 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
-
-      if attributes.has_key?(:'retirement_age')
-        self.retirement_age = attributes[:'retirement_age']
-      else
-        self.retirement_age = 65
-      end
-
-      if attributes.has_key?(:'retirement_income')
-        self.retirement_income = attributes[:'retirement_income']
-      else
-        self.retirement_income = 0.0
-      end
-
-      if attributes.has_key?(:'retirement_expenses')
-        self.retirement_expenses = attributes[:'retirement_expenses']
-      end
-
       if attributes.has_key?(:'current_age')
         self.current_age = attributes[:'current_age']
       end
@@ -120,29 +98,51 @@ module ProtonApi
         end
       end
 
-      if attributes.has_key?(:'retirement_tax')
-        self.retirement_tax = attributes[:'retirement_tax']
+      if attributes.has_key?(:'retirement_income')
+        self.retirement_income = attributes[:'retirement_income']
       else
-        self.retirement_tax = 0.0
+        self.retirement_income = 0.0
       end
 
-      if attributes.has_key?(:'inflation_rate')
-        self.inflation_rate = attributes[:'inflation_rate']
+      if attributes.has_key?(:'retirement_tax')
+        self.retirement_tax = attributes[:'retirement_tax']
       else
-        self.inflation_rate = 0.0
+        self.retirement_tax = 0.0
       end
 
       if attributes.has_key?(:'death_age')
         self.death_age = attributes[:'death_age']
       end
 
+      if attributes.has_key?(:'retirement_age')
+        self.retirement_age = attributes[:'retirement_age']
+      else
+        self.retirement_age = 65
+      end
+
       if attributes.has_key?(:'portfolio_return')
         self.portfolio_return = attributes[:'portfolio_return']
       end
 
+      if attributes.has_key?(:'retirement_expenses')
+        self.retirement_expenses = attributes[:'retirement_expenses']
+      end
+
       if attributes.has_key?(:'deposit_schedule')
         self.deposit_schedule = attributes[:'deposit_schedule']
       end
+
+      if attributes.has_key?(:'inflation_rate')
+        self.inflation_rate = attributes[:'inflation_rate']
+      else
+        self.inflation_rate = 0.0
+      end
+
+      if attributes.has_key?(:'aggregation_account_ids')
+        if (value = attributes[:'aggregation_account_ids']).is_a?(Array)
+          self.aggregation_account_ids = value
+        end
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -153,22 +153,6 @@ module ProtonApi
         invalid_properties.push('invalid value for "retirement_savings", must be greater than or equal to 0.')
       end
 
-      if !@retirement_age.nil? && @retirement_age < 0
-        invalid_properties.push('invalid value for "retirement_age", must be greater than or equal to 0.')
-      end
-
-      if !@retirement_income.nil? && @retirement_income < 0
-        invalid_properties.push('invalid value for "retirement_income", must be greater than or equal to 0.')
-      end
-
-      if @retirement_expenses.nil?
-        invalid_properties.push('invalid value for "retirement_expenses", retirement_expenses cannot be nil.')
-      end
-
-      if @retirement_expenses < 0
-        invalid_properties.push('invalid value for "retirement_expenses", must be greater than or equal to 0.')
-      end
-
       if @current_age.nil?
         invalid_properties.push('invalid value for "current_age", current_age cannot be nil.')
       end
@@ -177,6 +161,10 @@ module ProtonApi
         invalid_properties.push('invalid value for "current_age", must be greater than or equal to 0.')
       end
 
+      if !@retirement_income.nil? && @retirement_income < 0
+        invalid_properties.push('invalid value for "retirement_income", must be greater than or equal to 0.')
+      end
+
       if !@retirement_tax.nil? && @retirement_tax > 1
         invalid_properties.push('invalid value for "retirement_tax", must be smaller than or equal to 1.')
       end
@@ -185,10 +173,6 @@ module ProtonApi
         invalid_properties.push('invalid value for "retirement_tax", must be greater than or equal to 0.')
       end
 
-      if !@inflation_rate.nil? && @inflation_rate < -1
-        invalid_properties.push('invalid value for "inflation_rate", must be greater than or equal to -1.')
-      end
-
       if @death_age.nil?
         invalid_properties.push('invalid value for "death_age", death_age cannot be nil.')
       end
@@ -197,6 +181,10 @@ module ProtonApi
         invalid_properties.push('invalid value for "death_age", must be greater than or equal to 0.')
       end
 
+      if !@retirement_age.nil? && @retirement_age < 0
+        invalid_properties.push('invalid value for "retirement_age", 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
@@ -205,6 +193,18 @@ module ProtonApi
         invalid_properties.push('invalid value for "portfolio_return", must be greater than or equal to -1.')
       end
 
+      if @retirement_expenses.nil?
+        invalid_properties.push('invalid value for "retirement_expenses", retirement_expenses cannot be nil.')
+      end
+
+      if @retirement_expenses < 0
+        invalid_properties.push('invalid value for "retirement_expenses", 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
 
@@ -212,19 +212,19 @@ module ProtonApi
     # @return true if the model is valid
     def valid?
       return false if !@retirement_savings.nil? && @retirement_savings < 0
-      return false if !@retirement_age.nil? && @retirement_age < 0
-      return false if !@retirement_income.nil? && @retirement_income < 0
-      return false if @retirement_expenses.nil?
-      return false if @retirement_expenses < 0
       return false if @current_age.nil?
       return false if @current_age < 0
+      return false if !@retirement_income.nil? && @retirement_income < 0
       return false if !@retirement_tax.nil? && @retirement_tax > 1
       return false if !@retirement_tax.nil? && @retirement_tax < 0
-      return false if !@inflation_rate.nil? && @inflation_rate < -1
       return false if @death_age.nil?
       return false if @death_age < 0
+      return false if !@retirement_age.nil? && @retirement_age < 0
       return false if @portfolio_return.nil?
       return false if @portfolio_return < -1
+      return false if @retirement_expenses.nil?
+      return false if @retirement_expenses < 0
+      return false if !@inflation_rate.nil? && @inflation_rate < -1
       true
     end
 
@@ -239,13 +239,17 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] retirement_age Value to be assigned
-    def retirement_age=(retirement_age)
-      if !retirement_age.nil? && retirement_age < 0
-        fail ArgumentError, 'invalid value for "retirement_age", must be greater than or equal to 0.'
+    # @param [Object] current_age Value to be assigned
+    def current_age=(current_age)
+      if current_age.nil?
+        fail ArgumentError, 'current_age cannot be nil'
       end
 
-      @retirement_age = retirement_age
+      if current_age < 0
+        fail ArgumentError, 'invalid value for "current_age", must be greater than or equal to 0.'
+      end
+
+      @current_age = current_age
     end
 
     # Custom attribute writer method with validation
@@ -258,34 +262,6 @@ module ProtonApi
       @retirement_income = retirement_income
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] retirement_expenses Value to be assigned
-    def retirement_expenses=(retirement_expenses)
-      if retirement_expenses.nil?
-        fail ArgumentError, 'retirement_expenses cannot be nil'
-      end
-
-      if retirement_expenses < 0
-        fail ArgumentError, 'invalid value for "retirement_expenses", must be greater than or equal to 0.'
-      end
-
-      @retirement_expenses = retirement_expenses
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] current_age Value to be assigned
-    def current_age=(current_age)
-      if current_age.nil?
-        fail ArgumentError, 'current_age cannot be nil'
-      end
-
-      if current_age < 0
-        fail ArgumentError, 'invalid value for "current_age", must be greater than or equal to 0.'
-      end
-
-      @current_age = current_age
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] retirement_tax Value to be assigned
     def retirement_tax=(retirement_tax)
@@ -300,16 +276,6 @@ module ProtonApi
       @retirement_tax = retirement_tax
     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] death_age Value to be assigned
     def death_age=(death_age)
@@ -324,6 +290,16 @@ module ProtonApi
       @death_age = death_age
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] retirement_age Value to be assigned
+    def retirement_age=(retirement_age)
+      if !retirement_age.nil? && retirement_age < 0
+        fail ArgumentError, 'invalid value for "retirement_age", must be greater than or equal to 0.'
+      end
+
+      @retirement_age = retirement_age
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] portfolio_return Value to be assigned
     def portfolio_return=(portfolio_return)
@@ -338,23 +314,47 @@ module ProtonApi
       @portfolio_return = portfolio_return
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] retirement_expenses Value to be assigned
+    def retirement_expenses=(retirement_expenses)
+      if retirement_expenses.nil?
+        fail ArgumentError, 'retirement_expenses cannot be nil'
+      end
+
+      if retirement_expenses < 0
+        fail ArgumentError, 'invalid value for "retirement_expenses", must be greater than or equal to 0.'
+      end
+
+      @retirement_expenses = retirement_expenses
+    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 &&
           retirement_savings == o.retirement_savings &&
-          aggregation_account_ids == o.aggregation_account_ids &&
-          retirement_age == o.retirement_age &&
-          retirement_income == o.retirement_income &&
-          retirement_expenses == o.retirement_expenses &&
           current_age == o.current_age &&
           account_ids == o.account_ids &&
+          retirement_income == o.retirement_income &&
           retirement_tax == o.retirement_tax &&
-          inflation_rate == o.inflation_rate &&
           death_age == o.death_age &&
+          retirement_age == o.retirement_age &&
           portfolio_return == o.portfolio_return &&
-          deposit_schedule == o.deposit_schedule
+          retirement_expenses == o.retirement_expenses &&
+          deposit_schedule == o.deposit_schedule &&
+          inflation_rate == o.inflation_rate &&
+          aggregation_account_ids == o.aggregation_account_ids
     end
 
     # @see the `==` method
@@ -366,7 +366,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [retirement_savings, aggregation_account_ids, retirement_age, retirement_income, retirement_expenses, current_age, account_ids, retirement_tax, inflation_rate, death_age, portfolio_return, deposit_schedule].hash
+      [retirement_savings, current_age, account_ids, retirement_income, retirement_tax, death_age, retirement_age, portfolio_return, retirement_expenses, deposit_schedule, inflation_rate, aggregation_account_ids].hash
     end
 
     # Builds the object from hash
@@ -388,17 +388,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
@@ -430,8 +429,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
@@ -454,8 +452,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