proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/event_study_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,27 +14,27 @@ require 'date'
 
 module ProtonApi
   class EventStudyRequest
-    attr_accessor :portfolio_tickers
+    attr_accessor :allocation_id
 
-    attr_accessor :market_data_source
+    attr_accessor :events
 
-    attr_accessor :portfolio_id
+    attr_accessor :market_data_source
 
     attr_accessor :model_id
 
-    attr_accessor :create_log
+    attr_accessor :account_id
 
-    attr_accessor :allocation_id
+    attr_accessor :use_proxy_data
 
-    attr_accessor :events
+    attr_accessor :portfolio_weights
 
-    attr_accessor :use_proxy_data
+    attr_accessor :portfolio_tickers
 
-    attr_accessor :account_id
+    attr_accessor :create_log
 
     attr_accessor :aggregation_account_id
 
-    attr_accessor :portfolio_weights
+    attr_accessor :portfolio_id
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -61,34 +61,34 @@ module ProtonApi
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'portfolio_tickers' => :'portfolio_tickers',
-        :'market_data_source' => :'market_data_source',
-        :'portfolio_id' => :'portfolio_id',
-        :'model_id' => :'model_id',
-        :'create_log' => :'create_log',
         :'allocation_id' => :'allocation_id',
         :'events' => :'events',
-        :'use_proxy_data' => :'use_proxy_data',
+        :'market_data_source' => :'market_data_source',
+        :'model_id' => :'model_id',
         :'account_id' => :'account_id',
+        :'use_proxy_data' => :'use_proxy_data',
+        :'portfolio_weights' => :'portfolio_weights',
+        :'portfolio_tickers' => :'portfolio_tickers',
+        :'create_log' => :'create_log',
         :'aggregation_account_id' => :'aggregation_account_id',
-        :'portfolio_weights' => :'portfolio_weights'
+        :'portfolio_id' => :'portfolio_id'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'portfolio_tickers' => :'Array<String>',
-        :'market_data_source' => :'String',
-        :'portfolio_id' => :'String',
-        :'model_id' => :'String',
-        :'create_log' => :'BOOLEAN',
         :'allocation_id' => :'String',
         :'events' => :'Array<String>',
-        :'use_proxy_data' => :'BOOLEAN',
+        :'market_data_source' => :'String',
+        :'model_id' => :'String',
         :'account_id' => :'String',
+        :'use_proxy_data' => :'BOOLEAN',
+        :'portfolio_weights' => :'Array<Float>',
+        :'portfolio_tickers' => :'Array<String>',
+        :'create_log' => :'BOOLEAN',
         :'aggregation_account_id' => :'String',
-        :'portfolio_weights' => :'Array<Float>'
+        :'portfolio_id' => :'String'
       }
     end
 
@@ -100,9 +100,13 @@ 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?(:'portfolio_tickers')
-        if (value = attributes[:'portfolio_tickers']).is_a?(Array)
-          self.portfolio_tickers = value
+      if attributes.has_key?(:'allocation_id')
+        self.allocation_id = attributes[:'allocation_id']
+      end
+
+      if attributes.has_key?(:'events')
+        if (value = attributes[:'events']).is_a?(Array)
+          self.events = value
         end
       end
 
@@ -112,48 +116,44 @@ module ProtonApi
         self.market_data_source = 'nucleus'
       end
 
-      if attributes.has_key?(:'portfolio_id')
-        self.portfolio_id = attributes[:'portfolio_id']
-      end
-
       if attributes.has_key?(:'model_id')
         self.model_id = attributes[:'model_id']
       end
 
-      if attributes.has_key?(:'create_log')
-        self.create_log = attributes[:'create_log']
-      else
-        self.create_log = false
+      if attributes.has_key?(:'account_id')
+        self.account_id = attributes[:'account_id']
       end
 
-      if attributes.has_key?(:'allocation_id')
-        self.allocation_id = attributes[:'allocation_id']
+      if attributes.has_key?(:'use_proxy_data')
+        self.use_proxy_data = attributes[:'use_proxy_data']
+      else
+        self.use_proxy_data = false
       end
 
-      if attributes.has_key?(:'events')
-        if (value = attributes[:'events']).is_a?(Array)
-          self.events = value
+      if attributes.has_key?(:'portfolio_weights')
+        if (value = attributes[:'portfolio_weights']).is_a?(Array)
+          self.portfolio_weights = value
         end
       end
 
-      if attributes.has_key?(:'use_proxy_data')
-        self.use_proxy_data = attributes[:'use_proxy_data']
-      else
-        self.use_proxy_data = false
+      if attributes.has_key?(:'portfolio_tickers')
+        if (value = attributes[:'portfolio_tickers']).is_a?(Array)
+          self.portfolio_tickers = value
+        end
       end
 
-      if attributes.has_key?(:'account_id')
-        self.account_id = attributes[:'account_id']
+      if attributes.has_key?(:'create_log')
+        self.create_log = attributes[:'create_log']
+      else
+        self.create_log = false
       end
 
       if attributes.has_key?(:'aggregation_account_id')
         self.aggregation_account_id = attributes[:'aggregation_account_id']
       end
 
-      if attributes.has_key?(:'portfolio_weights')
-        if (value = attributes[:'portfolio_weights']).is_a?(Array)
-          self.portfolio_weights = value
-        end
+      if attributes.has_key?(:'portfolio_id')
+        self.portfolio_id = attributes[:'portfolio_id']
       end
     end
 
@@ -187,17 +187,17 @@ module ProtonApi
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          portfolio_tickers == o.portfolio_tickers &&
-          market_data_source == o.market_data_source &&
-          portfolio_id == o.portfolio_id &&
-          model_id == o.model_id &&
-          create_log == o.create_log &&
           allocation_id == o.allocation_id &&
           events == o.events &&
-          use_proxy_data == o.use_proxy_data &&
+          market_data_source == o.market_data_source &&
+          model_id == o.model_id &&
           account_id == o.account_id &&
+          use_proxy_data == o.use_proxy_data &&
+          portfolio_weights == o.portfolio_weights &&
+          portfolio_tickers == o.portfolio_tickers &&
+          create_log == o.create_log &&
           aggregation_account_id == o.aggregation_account_id &&
-          portfolio_weights == o.portfolio_weights
+          portfolio_id == o.portfolio_id
     end
 
     # @see the `==` method
@@ -209,7 +209,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [portfolio_tickers, market_data_source, portfolio_id, model_id, create_log, allocation_id, events, use_proxy_data, account_id, aggregation_account_id, portfolio_weights].hash
+      [allocation_id, events, market_data_source, model_id, account_id, use_proxy_data, portfolio_weights, portfolio_tickers, create_log, aggregation_account_id, portfolio_id].hash
     end
 
     # Builds the object from hash
@@ -231,17 +231,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
@@ -273,8 +272,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
@@ -297,8 +295,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/fee_analysis_request.rb

@@ -3,10 +3,10 @@
 
 #Financial engineering module of Hydrogen Atom
 
-OpenAPI spec version: 1.8.0
+OpenAPI spec version: 1.9.0
 Contact: info@hydrogenplatform.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.17
+Swagger Codegen version: 2.4.19
 
 =end
 
@@ -14,39 +14,43 @@ require 'date'
 
 module ProtonApi
   class FeeAnalysisRequest
-    attr_accessor :aggregation_account_ids
-
-    attr_accessor :end_date
+    attr_accessor :currency_code
 
     attr_accessor :client_id
 
+    attr_accessor :end_date
+
     attr_accessor :currency_conversion
 
     attr_accessor :start_date
 
-    attr_accessor :currency_code
+    attr_accessor :transaction_status_scope
+
+    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',
-        :'end_date' => :'end_date',
+        :'currency_code' => :'currency_code',
         :'client_id' => :'client_id',
+        :'end_date' => :'end_date',
         :'currency_conversion' => :'currency_conversion',
         :'start_date' => :'start_date',
-        :'currency_code' => :'currency_code'
+        :'transaction_status_scope' => :'transaction_status_scope',
+        :'aggregation_account_ids' => :'aggregation_account_ids'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'aggregation_account_ids' => :'Array<String>',
-        :'end_date' => :'Date',
+        :'currency_code' => :'String',
         :'client_id' => :'String',
+        :'end_date' => :'Date',
         :'currency_conversion' => :'String',
         :'start_date' => :'Date',
-        :'currency_code' => :'String'
+        :'transaction_status_scope' => :'Array<String>',
+        :'aggregation_account_ids' => :'Array<String>'
       }
     end
 
@@ -58,20 +62,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
-      end
-
-      if attributes.has_key?(:'end_date')
-        self.end_date = attributes[:'end_date']
+      if attributes.has_key?(:'currency_code')
+        self.currency_code = attributes[:'currency_code']
       end
 
       if attributes.has_key?(:'client_id')
         self.client_id = attributes[:'client_id']
       end
 
+      if attributes.has_key?(:'end_date')
+        self.end_date = attributes[:'end_date']
+      end
+
       if attributes.has_key?(:'currency_conversion')
         self.currency_conversion = attributes[:'currency_conversion']
       end
@@ -80,8 +82,16 @@ module ProtonApi
         self.start_date = attributes[:'start_date']
       end
 
-      if attributes.has_key?(:'currency_code')
-        self.currency_code = attributes[:'currency_code']
+      if attributes.has_key?(:'transaction_status_scope')
+        if (value = attributes[:'transaction_status_scope']).is_a?(Array)
+          self.transaction_status_scope = value
+        end
+      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
 
@@ -103,12 +113,13 @@ module ProtonApi
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          aggregation_account_ids == o.aggregation_account_ids &&
-          end_date == o.end_date &&
+          currency_code == o.currency_code &&
           client_id == o.client_id &&
+          end_date == o.end_date &&
           currency_conversion == o.currency_conversion &&
           start_date == o.start_date &&
-          currency_code == o.currency_code
+          transaction_status_scope == o.transaction_status_scope &&
+          aggregation_account_ids == o.aggregation_account_ids
     end
 
     # @see the `==` method
@@ -120,7 +131,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [aggregation_account_ids, end_date, client_id, currency_conversion, start_date, currency_code].hash
+      [currency_code, client_id, end_date, currency_conversion, start_date, transaction_status_scope, aggregation_account_ids].hash
     end
 
     # Builds the object from hash
@@ -142,17 +153,16 @@ module ProtonApi
 
       self
     end
-
-    # Deserializes the data based on type
+# Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
       when :DateTime
-        DateTime.parse(value)
+        value
       when :Date
-        Date.parse(value)
+        value
       when :String
         value.to_s
       when :Integer
@@ -184,8 +194,7 @@ module ProtonApi
         temp_model.build_from_hash(value)
       end
     end
-
-    # Returns the string representation of the object
+# Returns the string representation of the object
     # @return [String] String presentation of the object
     def to_s
       to_hash.to_s
@@ -208,8 +217,7 @@ module ProtonApi
       end
       hash
     end
-
-    # Outputs non-array value in the form of hash
+# Outputs non-array value in the form of hash
     # For object, use to_hash. Otherwise, just return the value
     # @param [Object] value Any valid value
     # @return [Hash] Returns the value in the form of hash

data/lib/proton_api/models/financial_health_check_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,55 +14,55 @@ require 'date'
 
 module ProtonApi
   class FinancialHealthCheckRequest
-    attr_accessor :gross_annual_income
+    attr_accessor :client_id
+
+    attr_accessor :ratio_targets
 
     attr_accessor :liquid_assets
 
-    attr_accessor :net_monthly_income
+    attr_accessor :total_liabilities
 
-    attr_accessor :client_id
+    attr_accessor :gross_annual_income
 
     attr_accessor :short_term_liabilities
 
-    attr_accessor :monthly_expenses
-
-    attr_accessor :total_liabilities
-
     attr_accessor :lookback_periods
 
-    attr_accessor :ratio_targets
-
     attr_accessor :non_liquid_assets
 
+    attr_accessor :monthly_expenses
+
+    attr_accessor :net_monthly_income
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'gross_annual_income' => :'gross_annual_income',
-        :'liquid_assets' => :'liquid_assets',
-        :'net_monthly_income' => :'net_monthly_income',
         :'client_id' => :'client_id',
-        :'short_term_liabilities' => :'short_term_liabilities',
-        :'monthly_expenses' => :'monthly_expenses',
+        :'ratio_targets' => :'ratio_targets',
+        :'liquid_assets' => :'liquid_assets',
         :'total_liabilities' => :'total_liabilities',
+        :'gross_annual_income' => :'gross_annual_income',
+        :'short_term_liabilities' => :'short_term_liabilities',
         :'lookback_periods' => :'lookback_periods',
-        :'ratio_targets' => :'ratio_targets',
-        :'non_liquid_assets' => :'non_liquid_assets'
+        :'non_liquid_assets' => :'non_liquid_assets',
+        :'monthly_expenses' => :'monthly_expenses',
+        :'net_monthly_income' => :'net_monthly_income'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'gross_annual_income' => :'Float',
-        :'liquid_assets' => :'Float',
-        :'net_monthly_income' => :'Float',
         :'client_id' => :'String',
-        :'short_term_liabilities' => :'Float',
-        :'monthly_expenses' => :'Float',
+        :'ratio_targets' => :'RatioTargets',
+        :'liquid_assets' => :'Float',
         :'total_liabilities' => :'Float',
+        :'gross_annual_income' => :'Float',
+        :'short_term_liabilities' => :'Float',
         :'lookback_periods' => :'Integer',
-        :'ratio_targets' => :'RatioTargets',
-        :'non_liquid_assets' => :'Float'
+        :'non_liquid_assets' => :'Float',
+        :'monthly_expenses' => :'Float',
+        :'net_monthly_income' => :'Float'
       }
     end
 
@@ -74,75 +74,67 @@ 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?(:'gross_annual_income')
-        self.gross_annual_income = attributes[:'gross_annual_income']
+      if attributes.has_key?(:'client_id')
+        self.client_id = attributes[:'client_id']
+      end
+
+      if attributes.has_key?(:'ratio_targets')
+        self.ratio_targets = attributes[:'ratio_targets']
       end
 
       if attributes.has_key?(:'liquid_assets')
         self.liquid_assets = attributes[:'liquid_assets']
       end
 
-      if attributes.has_key?(:'net_monthly_income')
-        self.net_monthly_income = attributes[:'net_monthly_income']
+      if attributes.has_key?(:'total_liabilities')
+        self.total_liabilities = attributes[:'total_liabilities']
       end
 
-      if attributes.has_key?(:'client_id')
-        self.client_id = attributes[:'client_id']
+      if attributes.has_key?(:'gross_annual_income')
+        self.gross_annual_income = attributes[:'gross_annual_income']
       end
 
       if attributes.has_key?(:'short_term_liabilities')
         self.short_term_liabilities = attributes[:'short_term_liabilities']
       end
 
-      if attributes.has_key?(:'monthly_expenses')
-        self.monthly_expenses = attributes[:'monthly_expenses']
-      end
-
-      if attributes.has_key?(:'total_liabilities')
-        self.total_liabilities = attributes[:'total_liabilities']
-      end
-
       if attributes.has_key?(:'lookback_periods')
         self.lookback_periods = attributes[:'lookback_periods']
       else
         self.lookback_periods = 3
       end
 
-      if attributes.has_key?(:'ratio_targets')
-        self.ratio_targets = attributes[:'ratio_targets']
-      end
-
       if attributes.has_key?(:'non_liquid_assets')
         self.non_liquid_assets = attributes[:'non_liquid_assets']
       end
+
+      if attributes.has_key?(:'monthly_expenses')
+        self.monthly_expenses = attributes[:'monthly_expenses']
+      end
+
+      if attributes.has_key?(:'net_monthly_income')
+        self.net_monthly_income = attributes[:'net_monthly_income']
+      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 !@gross_annual_income.nil? && @gross_annual_income < 0
-        invalid_properties.push('invalid value for "gross_annual_income", must be greater than or equal to 0.')
-      end
-
       if !@liquid_assets.nil? && @liquid_assets < 0
         invalid_properties.push('invalid value for "liquid_assets", must be greater than or equal to 0.')
       end
 
-      if !@net_monthly_income.nil? && @net_monthly_income < 0
-        invalid_properties.push('invalid value for "net_monthly_income", must be greater than or equal to 0.')
-      end
-
-      if !@short_term_liabilities.nil? && @short_term_liabilities < 0
-        invalid_properties.push('invalid value for "short_term_liabilities", must be greater than or equal to 0.')
+      if !@total_liabilities.nil? && @total_liabilities < 0
+        invalid_properties.push('invalid value for "total_liabilities", must be greater than or equal to 0.')
       end
 
-      if !@monthly_expenses.nil? && @monthly_expenses < 0
-        invalid_properties.push('invalid value for "monthly_expenses", must be greater than or equal to 0.')
+      if !@gross_annual_income.nil? && @gross_annual_income < 0
+        invalid_properties.push('invalid value for "gross_annual_income", must be greater than or equal to 0.')
       end
 
-      if !@total_liabilities.nil? && @total_liabilities < 0
-        invalid_properties.push('invalid value for "total_liabilities", must be greater than or equal to 0.')
+      if !@short_term_liabilities.nil? && @short_term_liabilities < 0
+        invalid_properties.push('invalid value for "short_term_liabilities", must be greater than or equal to 0.')
       end
 
       if !@lookback_periods.nil? && @lookback_periods < 1
@@ -153,33 +145,31 @@ module ProtonApi
         invalid_properties.push('invalid value for "non_liquid_assets", must be greater than or equal to 0.')
       end
 
+      if !@monthly_expenses.nil? && @monthly_expenses < 0
+        invalid_properties.push('invalid value for "monthly_expenses", must be greater than or equal to 0.')
+      end
+
+      if !@net_monthly_income.nil? && @net_monthly_income < 0
+        invalid_properties.push('invalid value for "net_monthly_income", 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 !@gross_annual_income.nil? && @gross_annual_income < 0
       return false if !@liquid_assets.nil? && @liquid_assets < 0
-      return false if !@net_monthly_income.nil? && @net_monthly_income < 0
-      return false if !@short_term_liabilities.nil? && @short_term_liabilities < 0
-      return false if !@monthly_expenses.nil? && @monthly_expenses < 0
       return false if !@total_liabilities.nil? && @total_liabilities < 0
+      return false if !@gross_annual_income.nil? && @gross_annual_income < 0
+      return false if !@short_term_liabilities.nil? && @short_term_liabilities < 0
       return false if !@lookback_periods.nil? && @lookback_periods < 1
       return false if !@non_liquid_assets.nil? && @non_liquid_assets < 0
+      return false if !@monthly_expenses.nil? && @monthly_expenses < 0
+      return false if !@net_monthly_income.nil? && @net_monthly_income < 0
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] gross_annual_income Value to be assigned
-    def gross_annual_income=(gross_annual_income)
-      if !gross_annual_income.nil? && gross_annual_income < 0
-        fail ArgumentError, 'invalid value for "gross_annual_income", must be greater than or equal to 0.'
-      end
-
-      @gross_annual_income = gross_annual_income
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] liquid_assets Value to be assigned
     def liquid_assets=(liquid_assets)
@@ -191,43 +181,33 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] net_monthly_income Value to be assigned
-    def net_monthly_income=(net_monthly_income)
-      if !net_monthly_income.nil? && net_monthly_income < 0
-        fail ArgumentError, 'invalid value for "net_monthly_income", must be greater than or equal to 0.'
-      end
-
-      @net_monthly_income = net_monthly_income
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] short_term_liabilities Value to be assigned
-    def short_term_liabilities=(short_term_liabilities)
-      if !short_term_liabilities.nil? && short_term_liabilities < 0
-        fail ArgumentError, 'invalid value for "short_term_liabilities", must be greater than or equal to 0.'
+    # @param [Object] total_liabilities Value to be assigned
+    def total_liabilities=(total_liabilities)
+      if !total_liabilities.nil? && total_liabilities < 0
+        fail ArgumentError, 'invalid value for "total_liabilities", must be greater than or equal to 0.'
       end
 
-      @short_term_liabilities = short_term_liabilities
+      @total_liabilities = total_liabilities
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] monthly_expenses Value to be assigned
-    def monthly_expenses=(monthly_expenses)
-      if !monthly_expenses.nil? && monthly_expenses < 0
-        fail ArgumentError, 'invalid value for "monthly_expenses", must be greater than or equal to 0.'
+    # @param [Object] gross_annual_income Value to be assigned
+    def gross_annual_income=(gross_annual_income)
+      if !gross_annual_income.nil? && gross_annual_income < 0
+        fail ArgumentError, 'invalid value for "gross_annual_income", must be greater than or equal to 0.'
       end
 
-      @monthly_expenses = monthly_expenses
+      @gross_annual_income = gross_annual_income
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] total_liabilities Value to be assigned
-    def total_liabilities=(total_liabilities)
-      if !total_liabilities.nil? && total_liabilities < 0
-        fail ArgumentError, 'invalid value for "total_liabilities", must be greater than or equal to 0.'
+    # @param [Object] short_term_liabilities Value to be assigned
+    def short_term_liabilities=(short_term_liabilities)
+      if !short_term_liabilities.nil? && short_term_liabilities < 0
+        fail ArgumentError, 'invalid value for "short_term_liabilities", must be greater than or equal to 0.'
       end
 
-      @total_liabilities = total_liabilities
+      @short_term_liabilities = short_term_liabilities
     end
 
     # Custom attribute writer method with validation
@@ -250,21 +230,41 @@ module ProtonApi
       @non_liquid_assets = non_liquid_assets
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] monthly_expenses Value to be assigned
+    def monthly_expenses=(monthly_expenses)
+      if !monthly_expenses.nil? && monthly_expenses < 0
+        fail ArgumentError, 'invalid value for "monthly_expenses", must be greater than or equal to 0.'
+      end
+
+      @monthly_expenses = monthly_expenses
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] net_monthly_income Value to be assigned
+    def net_monthly_income=(net_monthly_income)
+      if !net_monthly_income.nil? && net_monthly_income < 0
+        fail ArgumentError, 'invalid value for "net_monthly_income", must be greater than or equal to 0.'
+      end
+
+      @net_monthly_income = net_monthly_income
+    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 &&
-          gross_annual_income == o.gross_annual_income &&
-          liquid_assets == o.liquid_assets &&
-          net_monthly_income == o.net_monthly_income &&
           client_id == o.client_id &&
-          short_term_liabilities == o.short_term_liabilities &&
-          monthly_expenses == o.monthly_expenses &&
+          ratio_targets == o.ratio_targets &&
+          liquid_assets == o.liquid_assets &&
           total_liabilities == o.total_liabilities &&
+          gross_annual_income == o.gross_annual_income &&
+          short_term_liabilities == o.short_term_liabilities &&
           lookback_periods == o.lookback_periods &&
-          ratio_targets == o.ratio_targets &&
-          non_liquid_assets == o.non_liquid_assets
+          non_liquid_assets == o.non_liquid_assets &&
+          monthly_expenses == o.monthly_expenses &&
+          net_monthly_income == o.net_monthly_income
     end
 
     # @see the `==` method
@@ -276,7 +276,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [gross_annual_income, liquid_assets, net_monthly_income, client_id, short_term_liabilities, monthly_expenses, total_liabilities, lookback_periods, ratio_targets, non_liquid_assets].hash
+      [client_id, ratio_targets, liquid_assets, total_liabilities, gross_annual_income, short_term_liabilities, lookback_periods, non_liquid_assets, monthly_expenses, net_monthly_income].hash
     end
 
     # Builds the object from hash
@@ -298,17 +298,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
@@ -340,8 +339,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
@@ -364,8 +362,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