proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/education_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
 
@@ -14,59 +14,59 @@ require 'date'
 
 module ProtonApi
   class EducationCalculatorPercentCoveredRequest
-    attr_accessor :aggregation_account_ids
+    attr_accessor :education_inflation_rate
 
-    attr_accessor :total_annual_cost
+    attr_accessor :decumulation_horizon
 
-    attr_accessor :tax_rate
+    attr_accessor :accumulation_horizon
 
     attr_accessor :account_ids
 
-    attr_accessor :initial_balance
-
-    attr_accessor :decumulation_horizon
+    attr_accessor :tax_rate
 
-    attr_accessor :accumulation_horizon
+    attr_accessor :general_inflation_rate
 
-    attr_accessor :education_inflation_rate
+    attr_accessor :total_annual_cost
 
     attr_accessor :portfolio_return
 
     attr_accessor :deposit_schedule
 
-    attr_accessor :general_inflation_rate
+    attr_accessor :initial_balance
+
+    attr_accessor :aggregation_account_ids
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'aggregation_account_ids' => :'aggregation_account_ids',
-        :'total_annual_cost' => :'total_annual_cost',
-        :'tax_rate' => :'tax_rate',
-        :'account_ids' => :'account_ids',
-        :'initial_balance' => :'initial_balance',
+        :'education_inflation_rate' => :'education_inflation_rate',
         :'decumulation_horizon' => :'decumulation_horizon',
         :'accumulation_horizon' => :'accumulation_horizon',
-        :'education_inflation_rate' => :'education_inflation_rate',
+        :'account_ids' => :'account_ids',
+        :'tax_rate' => :'tax_rate',
+        :'general_inflation_rate' => :'general_inflation_rate',
+        :'total_annual_cost' => :'total_annual_cost',
         :'portfolio_return' => :'portfolio_return',
         :'deposit_schedule' => :'deposit_schedule',
-        :'general_inflation_rate' => :'general_inflation_rate'
+        :'initial_balance' => :'initial_balance',
+        :'aggregation_account_ids' => :'aggregation_account_ids'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'aggregation_account_ids' => :'Array<String>',
-        :'total_annual_cost' => :'Float',
-        :'tax_rate' => :'Float',
-        :'account_ids' => :'Array<String>',
-        :'initial_balance' => :'Float',
+        :'education_inflation_rate' => :'Float',
         :'decumulation_horizon' => :'Integer',
         :'accumulation_horizon' => :'Integer',
-        :'education_inflation_rate' => :'Float',
+        :'account_ids' => :'Array<String>',
+        :'tax_rate' => :'Float',
+        :'general_inflation_rate' => :'Float',
+        :'total_annual_cost' => :'Float',
         :'portfolio_return' => :'Float',
         :'deposit_schedule' => :'CalculatorDepositSchedule1',
-        :'general_inflation_rate' => :'Float'
+        :'initial_balance' => :'Float',
+        :'aggregation_account_ids' => :'Array<String>'
       }
     end
 
@@ -78,20 +78,18 @@ module ProtonApi
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'aggregation_account_ids')
-        if (value = attributes[:'aggregation_account_ids']).is_a?(Array)
-          self.aggregation_account_ids = value
-        end
+      if attributes.has_key?(:'education_inflation_rate')
+        self.education_inflation_rate = attributes[:'education_inflation_rate']
+      else
+        self.education_inflation_rate = 0.05
       end
 
-      if attributes.has_key?(:'total_annual_cost')
-        self.total_annual_cost = attributes[:'total_annual_cost']
+      if attributes.has_key?(:'decumulation_horizon')
+        self.decumulation_horizon = attributes[:'decumulation_horizon']
       end
 
-      if attributes.has_key?(:'tax_rate')
-        self.tax_rate = attributes[:'tax_rate']
-      else
-        self.tax_rate = 0.0
+      if attributes.has_key?(:'accumulation_horizon')
+        self.accumulation_horizon = attributes[:'accumulation_horizon']
       end
 
       if attributes.has_key?(:'account_ids')
@@ -100,24 +98,20 @@ 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
-      end
-
-      if attributes.has_key?(:'decumulation_horizon')
-        self.decumulation_horizon = attributes[:'decumulation_horizon']
+        self.tax_rate = 0.0
       end
 
-      if attributes.has_key?(:'accumulation_horizon')
-        self.accumulation_horizon = attributes[:'accumulation_horizon']
+      if attributes.has_key?(:'general_inflation_rate')
+        self.general_inflation_rate = attributes[:'general_inflation_rate']
+      else
+        self.general_inflation_rate = 0.0
       end
 
-      if attributes.has_key?(:'education_inflation_rate')
-        self.education_inflation_rate = attributes[:'education_inflation_rate']
-      else
-        self.education_inflation_rate = 0.05
+      if attributes.has_key?(:'total_annual_cost')
+        self.total_annual_cost = attributes[:'total_annual_cost']
       end
 
       if attributes.has_key?(:'portfolio_return')
@@ -128,10 +122,16 @@ module ProtonApi
         self.deposit_schedule = attributes[:'deposit_schedule']
       end
 
-      if attributes.has_key?(:'general_inflation_rate')
-        self.general_inflation_rate = attributes[:'general_inflation_rate']
+      if attributes.has_key?(:'initial_balance')
+        self.initial_balance = attributes[:'initial_balance']
       else
-        self.general_inflation_rate = 0.0
+        self.initial_balance = 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
 
@@ -139,24 +139,8 @@ module ProtonApi
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @total_annual_cost.nil?
-        invalid_properties.push('invalid value for "total_annual_cost", total_annual_cost cannot be nil.')
-      end
-
-      if @total_annual_cost < 0
-        invalid_properties.push('invalid value for "total_annual_cost", 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.')
+      if !@education_inflation_rate.nil? && @education_inflation_rate < -1
+        invalid_properties.push('invalid value for "education_inflation_rate", must be greater than or equal to -1.')
       end
 
       if @decumulation_horizon.nil?
@@ -175,8 +159,24 @@ module ProtonApi
         invalid_properties.push('invalid value for "accumulation_horizon", must be greater than or equal to 0.')
       end
 
-      if !@education_inflation_rate.nil? && @education_inflation_rate < -1
-        invalid_properties.push('invalid value for "education_inflation_rate", must be greater than or equal to -1.')
+      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 !@general_inflation_rate.nil? && @general_inflation_rate < -1
+        invalid_properties.push('invalid value for "general_inflation_rate", must be greater than or equal to -1.')
+      end
+
+      if @total_annual_cost.nil?
+        invalid_properties.push('invalid value for "total_annual_cost", total_annual_cost cannot be nil.')
+      end
+
+      if @total_annual_cost < 0
+        invalid_properties.push('invalid value for "total_annual_cost", must be greater than or equal to 0.')
       end
 
       if @portfolio_return.nil?
@@ -187,8 +187,8 @@ module ProtonApi
         invalid_properties.push('invalid value for "portfolio_return", must be greater than or equal to -1.')
       end
 
-      if !@general_inflation_rate.nil? && @general_inflation_rate < -1
-        invalid_properties.push('invalid value for "general_inflation_rate", must be greater than or equal to -1.')
+      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
@@ -197,58 +197,30 @@ module ProtonApi
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @total_annual_cost.nil?
-      return false if @total_annual_cost < 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 !@education_inflation_rate.nil? && @education_inflation_rate < -1
       return false if @decumulation_horizon.nil?
       return false if @decumulation_horizon < 0
       return false if @accumulation_horizon.nil?
       return false if @accumulation_horizon < 0
-      return false if !@education_inflation_rate.nil? && @education_inflation_rate < -1
+      return false if !@tax_rate.nil? && @tax_rate > 1
+      return false if !@tax_rate.nil? && @tax_rate < 0
+      return false if !@general_inflation_rate.nil? && @general_inflation_rate < -1
+      return false if @total_annual_cost.nil?
+      return false if @total_annual_cost < 0
       return false if @portfolio_return.nil?
       return false if @portfolio_return < -1
-      return false if !@general_inflation_rate.nil? && @general_inflation_rate < -1
+      return false if !@initial_balance.nil? && @initial_balance < 0
       true
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] total_annual_cost Value to be assigned
-    def total_annual_cost=(total_annual_cost)
-      if total_annual_cost.nil?
-        fail ArgumentError, 'total_annual_cost cannot be nil'
-      end
-
-      if total_annual_cost < 0
-        fail ArgumentError, 'invalid value for "total_annual_cost", must be greater than or equal to 0.'
-      end
-
-      @total_annual_cost = total_annual_cost
-    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.'
+    # @param [Object] education_inflation_rate Value to be assigned
+    def education_inflation_rate=(education_inflation_rate)
+      if !education_inflation_rate.nil? && education_inflation_rate < -1
+        fail ArgumentError, 'invalid value for "education_inflation_rate", must be greater than or equal to -1.'
       end
 
-      @initial_balance = initial_balance
+      @education_inflation_rate = education_inflation_rate
     end
 
     # Custom attribute writer method with validation
@@ -280,13 +252,41 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] education_inflation_rate Value to be assigned
-    def education_inflation_rate=(education_inflation_rate)
-      if !education_inflation_rate.nil? && education_inflation_rate < -1
-        fail ArgumentError, 'invalid value for "education_inflation_rate", must be greater than or equal to -1.'
+    # @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
 
-      @education_inflation_rate = education_inflation_rate
+      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] general_inflation_rate Value to be assigned
+    def general_inflation_rate=(general_inflation_rate)
+      if !general_inflation_rate.nil? && general_inflation_rate < -1
+        fail ArgumentError, 'invalid value for "general_inflation_rate", must be greater than or equal to -1.'
+      end
+
+      @general_inflation_rate = general_inflation_rate
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] total_annual_cost Value to be assigned
+    def total_annual_cost=(total_annual_cost)
+      if total_annual_cost.nil?
+        fail ArgumentError, 'total_annual_cost cannot be nil'
+      end
+
+      if total_annual_cost < 0
+        fail ArgumentError, 'invalid value for "total_annual_cost", must be greater than or equal to 0.'
+      end
+
+      @total_annual_cost = total_annual_cost
     end
 
     # Custom attribute writer method with validation
@@ -304,13 +304,13 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] general_inflation_rate Value to be assigned
-    def general_inflation_rate=(general_inflation_rate)
-      if !general_inflation_rate.nil? && general_inflation_rate < -1
-        fail ArgumentError, 'invalid value for "general_inflation_rate", must be greater than or equal to -1.'
+    # @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
 
-      @general_inflation_rate = general_inflation_rate
+      @initial_balance = initial_balance
     end
 
     # Checks equality by comparing each attribute.
@@ -318,17 +318,17 @@ module ProtonApi
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          aggregation_account_ids == o.aggregation_account_ids &&
-          total_annual_cost == o.total_annual_cost &&
-          tax_rate == o.tax_rate &&
-          account_ids == o.account_ids &&
-          initial_balance == o.initial_balance &&
+          education_inflation_rate == o.education_inflation_rate &&
           decumulation_horizon == o.decumulation_horizon &&
           accumulation_horizon == o.accumulation_horizon &&
-          education_inflation_rate == o.education_inflation_rate &&
+          account_ids == o.account_ids &&
+          tax_rate == o.tax_rate &&
+          general_inflation_rate == o.general_inflation_rate &&
+          total_annual_cost == o.total_annual_cost &&
           portfolio_return == o.portfolio_return &&
           deposit_schedule == o.deposit_schedule &&
-          general_inflation_rate == o.general_inflation_rate
+          initial_balance == o.initial_balance &&
+          aggregation_account_ids == o.aggregation_account_ids
     end
 
     # @see the `==` method
@@ -340,7 +340,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [aggregation_account_ids, total_annual_cost, tax_rate, account_ids, initial_balance, decumulation_horizon, accumulation_horizon, education_inflation_rate, portfolio_return, deposit_schedule, general_inflation_rate].hash
+      [education_inflation_rate, decumulation_horizon, accumulation_horizon, account_ids, tax_rate, general_inflation_rate, total_annual_cost, portfolio_return, deposit_schedule, initial_balance, aggregation_account_ids].hash
     end
 
     # Builds the object from hash
@@ -362,17 +362,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
@@ -404,8 +403,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
@@ -428,8 +426,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/education_config.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,27 +14,27 @@ require 'date'
 
 module ProtonApi
   class EducationConfig
-    attr_accessor :end_age
-
     attr_accessor :total_annual_cost
 
     attr_accessor :start_age
 
+    attr_accessor :end_age
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'end_age' => :'end_age',
         :'total_annual_cost' => :'total_annual_cost',
-        :'start_age' => :'start_age'
+        :'start_age' => :'start_age',
+        :'end_age' => :'end_age'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'end_age' => :'Integer',
         :'total_annual_cost' => :'Float',
-        :'start_age' => :'Integer'
+        :'start_age' => :'Integer',
+        :'end_age' => :'Integer'
       }
     end
 
@@ -46,10 +46,6 @@ 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?(:'end_age')
-        self.end_age = attributes[:'end_age']
-      end
-
       if attributes.has_key?(:'total_annual_cost')
         self.total_annual_cost = attributes[:'total_annual_cost']
       end
@@ -57,20 +53,16 @@ module ProtonApi
       if attributes.has_key?(:'start_age')
         self.start_age = attributes[:'start_age']
       end
+
+      if attributes.has_key?(:'end_age')
+        self.end_age = attributes[:'end_age']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @end_age.nil?
-        invalid_properties.push('invalid value for "end_age", end_age cannot be nil.')
-      end
-
-      if @end_age < 0
-        invalid_properties.push('invalid value for "end_age", must be greater than or equal to 0.')
-      end
-
       if @total_annual_cost.nil?
         invalid_properties.push('invalid value for "total_annual_cost", total_annual_cost cannot be nil.')
       end
@@ -87,35 +79,29 @@ module ProtonApi
         invalid_properties.push('invalid value for "start_age", must be greater than or equal to 0.')
       end
 
+      if @end_age.nil?
+        invalid_properties.push('invalid value for "end_age", end_age cannot be nil.')
+      end
+
+      if @end_age < 0
+        invalid_properties.push('invalid value for "end_age", 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 @end_age.nil?
-      return false if @end_age < 0
       return false if @total_annual_cost.nil?
       return false if @total_annual_cost < 0
       return false if @start_age.nil?
       return false if @start_age < 0
+      return false if @end_age.nil?
+      return false if @end_age < 0
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] end_age Value to be assigned
-    def end_age=(end_age)
-      if end_age.nil?
-        fail ArgumentError, 'end_age cannot be nil'
-      end
-
-      if end_age < 0
-        fail ArgumentError, 'invalid value for "end_age", must be greater than or equal to 0.'
-      end
-
-      @end_age = end_age
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] total_annual_cost Value to be assigned
     def total_annual_cost=(total_annual_cost)
@@ -144,14 +130,28 @@ module ProtonApi
       @start_age = start_age
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] end_age Value to be assigned
+    def end_age=(end_age)
+      if end_age.nil?
+        fail ArgumentError, 'end_age cannot be nil'
+      end
+
+      if end_age < 0
+        fail ArgumentError, 'invalid value for "end_age", must be greater than or equal to 0.'
+      end
+
+      @end_age = end_age
+    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 &&
-          end_age == o.end_age &&
           total_annual_cost == o.total_annual_cost &&
-          start_age == o.start_age
+          start_age == o.start_age &&
+          end_age == o.end_age
     end
 
     # @see the `==` method
@@ -163,7 +163,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [end_age, total_annual_cost, start_age].hash
+      [total_annual_cost, start_age, end_age].hash
     end
 
     # Builds the object from hash
@@ -185,17 +185,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
@@ -227,8 +226,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
@@ -251,8 +249,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