proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/savings_deposit_schedule.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,14 +14,14 @@ require 'date'
 
 module ProtonApi
   class SavingsDepositSchedule
-    attr_accessor :adjust_deposit_for_inflation
-
     attr_accessor :deposit_frequency_interval
 
     attr_accessor :deposit_amount
 
     attr_accessor :deposit_duration
 
+    attr_accessor :adjust_deposit_for_inflation
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -47,20 +47,20 @@ module ProtonApi
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'adjust_deposit_for_inflation' => :'adjust_deposit_for_inflation',
         :'deposit_frequency_interval' => :'deposit_frequency_interval',
         :'deposit_amount' => :'deposit_amount',
-        :'deposit_duration' => :'deposit_duration'
+        :'deposit_duration' => :'deposit_duration',
+        :'adjust_deposit_for_inflation' => :'adjust_deposit_for_inflation'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'adjust_deposit_for_inflation' => :'BOOLEAN',
         :'deposit_frequency_interval' => :'String',
         :'deposit_amount' => :'Float',
-        :'deposit_duration' => :'Integer'
+        :'deposit_duration' => :'Integer',
+        :'adjust_deposit_for_inflation' => :'BOOLEAN'
       }
     end
 
@@ -72,12 +72,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?(:'adjust_deposit_for_inflation')
-        self.adjust_deposit_for_inflation = attributes[:'adjust_deposit_for_inflation']
-      else
-        self.adjust_deposit_for_inflation = true
-      end
-
       if attributes.has_key?(:'deposit_frequency_interval')
         self.deposit_frequency_interval = attributes[:'deposit_frequency_interval']
       else
@@ -91,6 +85,12 @@ module ProtonApi
       if attributes.has_key?(:'deposit_duration')
         self.deposit_duration = attributes[:'deposit_duration']
       end
+
+      if attributes.has_key?(:'adjust_deposit_for_inflation')
+        self.adjust_deposit_for_inflation = attributes[:'adjust_deposit_for_inflation']
+      else
+        self.adjust_deposit_for_inflation = true
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -153,10 +153,10 @@ module ProtonApi
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          adjust_deposit_for_inflation == o.adjust_deposit_for_inflation &&
           deposit_frequency_interval == o.deposit_frequency_interval &&
           deposit_amount == o.deposit_amount &&
-          deposit_duration == o.deposit_duration
+          deposit_duration == o.deposit_duration &&
+          adjust_deposit_for_inflation == o.adjust_deposit_for_inflation
     end
 
     # @see the `==` method
@@ -168,7 +168,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [adjust_deposit_for_inflation, deposit_frequency_interval, deposit_amount, deposit_duration].hash
+      [deposit_frequency_interval, deposit_amount, deposit_duration, adjust_deposit_for_inflation].hash
     end
 
     # Builds the object from hash
@@ -190,17 +190,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
@@ -232,8 +231,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
@@ -256,8 +254,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/scenario_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,35 +14,35 @@ require 'date'
 
 module ProtonApi
   class ScenarioAnalysisRequest
-    attr_accessor :portfolio_tickers
+    attr_accessor :scenario
 
-    attr_accessor :end_date
+    attr_accessor :allocation_id
 
-    attr_accessor :portfolio_id
+    attr_accessor :end_date
 
     attr_accessor :market_data_source
 
     attr_accessor :model_id
 
-    attr_accessor :create_log
+    attr_accessor :account_id
 
-    attr_accessor :allocation_id
+    attr_accessor :start_date
 
-    attr_accessor :scenario
+    attr_accessor :frequency_interval
+
+    attr_accessor :trading_days_per_year
 
     attr_accessor :use_proxy_data
 
-    attr_accessor :start_date
+    attr_accessor :portfolio_weights
 
-    attr_accessor :account_id
+    attr_accessor :portfolio_tickers
 
-    attr_accessor :frequency_interval
+    attr_accessor :create_log
 
     attr_accessor :aggregation_account_id
 
-    attr_accessor :trading_days_per_year
-
-    attr_accessor :portfolio_weights
+    attr_accessor :portfolio_id
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -69,42 +69,42 @@ module ProtonApi
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'portfolio_tickers' => :'portfolio_tickers',
+        :'scenario' => :'scenario',
+        :'allocation_id' => :'allocation_id',
         :'end_date' => :'end_date',
-        :'portfolio_id' => :'portfolio_id',
         :'market_data_source' => :'market_data_source',
         :'model_id' => :'model_id',
-        :'create_log' => :'create_log',
-        :'allocation_id' => :'allocation_id',
-        :'scenario' => :'scenario',
-        :'use_proxy_data' => :'use_proxy_data',
-        :'start_date' => :'start_date',
         :'account_id' => :'account_id',
+        :'start_date' => :'start_date',
         :'frequency_interval' => :'frequency_interval',
-        :'aggregation_account_id' => :'aggregation_account_id',
         :'trading_days_per_year' => :'trading_days_per_year',
-        :'portfolio_weights' => :'portfolio_weights'
+        :'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_id' => :'portfolio_id'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'portfolio_tickers' => :'Array<String>',
+        :'scenario' => :'Array<SensitivityFactor>',
+        :'allocation_id' => :'String',
         :'end_date' => :'Date',
-        :'portfolio_id' => :'String',
         :'market_data_source' => :'String',
         :'model_id' => :'String',
-        :'create_log' => :'BOOLEAN',
-        :'allocation_id' => :'String',
-        :'scenario' => :'Array<SensitivityFactor>',
-        :'use_proxy_data' => :'BOOLEAN',
-        :'start_date' => :'Date',
         :'account_id' => :'String',
+        :'start_date' => :'Date',
         :'frequency_interval' => :'String',
-        :'aggregation_account_id' => :'String',
         :'trading_days_per_year' => :'Integer',
-        :'portfolio_weights' => :'Array<Float>'
+        :'use_proxy_data' => :'BOOLEAN',
+        :'portfolio_weights' => :'Array<Float>',
+        :'portfolio_tickers' => :'Array<String>',
+        :'create_log' => :'BOOLEAN',
+        :'aggregation_account_id' => :'String',
+        :'portfolio_id' => :'String'
       }
     end
 
@@ -116,18 +116,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?(:'portfolio_tickers')
-        if (value = attributes[:'portfolio_tickers']).is_a?(Array)
-          self.portfolio_tickers = value
+      if attributes.has_key?(:'scenario')
+        if (value = attributes[:'scenario']).is_a?(Array)
+          self.scenario = value
         end
       end
 
-      if attributes.has_key?(:'end_date')
-        self.end_date = attributes[:'end_date']
+      if attributes.has_key?(:'allocation_id')
+        self.allocation_id = attributes[:'allocation_id']
       end
 
-      if attributes.has_key?(:'portfolio_id')
-        self.portfolio_id = attributes[:'portfolio_id']
+      if attributes.has_key?(:'end_date')
+        self.end_date = attributes[:'end_date']
       end
 
       if attributes.has_key?(:'market_data_source')
@@ -140,20 +140,22 @@ module ProtonApi
         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?(:'start_date')
+        self.start_date = attributes[:'start_date']
       end
 
-      if attributes.has_key?(:'scenario')
-        if (value = attributes[:'scenario']).is_a?(Array)
-          self.scenario = value
-        end
+      if attributes.has_key?(:'frequency_interval')
+        self.frequency_interval = attributes[:'frequency_interval']
+      end
+
+      if attributes.has_key?(:'trading_days_per_year')
+        self.trading_days_per_year = attributes[:'trading_days_per_year']
+      else
+        self.trading_days_per_year = 252
       end
 
       if attributes.has_key?(:'use_proxy_data')
@@ -162,32 +164,30 @@ module ProtonApi
         self.use_proxy_data = false
       end
 
-      if attributes.has_key?(:'start_date')
-        self.start_date = attributes[:'start_date']
+      if attributes.has_key?(:'portfolio_weights')
+        if (value = attributes[:'portfolio_weights']).is_a?(Array)
+          self.portfolio_weights = value
+        end
       end
 
-      if attributes.has_key?(:'account_id')
-        self.account_id = attributes[:'account_id']
+      if attributes.has_key?(:'portfolio_tickers')
+        if (value = attributes[:'portfolio_tickers']).is_a?(Array)
+          self.portfolio_tickers = value
+        end
       end
 
-      if attributes.has_key?(:'frequency_interval')
-        self.frequency_interval = attributes[:'frequency_interval']
+      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?(:'trading_days_per_year')
-        self.trading_days_per_year = attributes[:'trading_days_per_year']
-      else
-        self.trading_days_per_year = 252
-      end
-
-      if attributes.has_key?(:'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
 
@@ -217,9 +217,9 @@ 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 @scenario.nil?
       market_data_source_validator = EnumAttributeValidator.new('String', ['nucleus', 'integration'])
       return false unless market_data_source_validator.valid?(@market_data_source)
-      return false if @scenario.nil?
       return false if @frequency_interval.nil?
       frequency_interval_validator = EnumAttributeValidator.new('String', ['year', 'quarter', 'month', 'week', 'day'])
       return false unless frequency_interval_validator.valid?(@frequency_interval)
@@ -267,21 +267,21 @@ module ProtonApi
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          portfolio_tickers == o.portfolio_tickers &&
+          scenario == o.scenario &&
+          allocation_id == o.allocation_id &&
           end_date == o.end_date &&
-          portfolio_id == o.portfolio_id &&
           market_data_source == o.market_data_source &&
           model_id == o.model_id &&
-          create_log == o.create_log &&
-          allocation_id == o.allocation_id &&
-          scenario == o.scenario &&
-          use_proxy_data == o.use_proxy_data &&
-          start_date == o.start_date &&
           account_id == o.account_id &&
+          start_date == o.start_date &&
           frequency_interval == o.frequency_interval &&
-          aggregation_account_id == o.aggregation_account_id &&
           trading_days_per_year == o.trading_days_per_year &&
-          portfolio_weights == o.portfolio_weights
+          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_id == o.portfolio_id
     end
 
     # @see the `==` method
@@ -293,7 +293,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [portfolio_tickers, end_date, portfolio_id, market_data_source, model_id, create_log, allocation_id, scenario, use_proxy_data, start_date, account_id, frequency_interval, aggregation_account_id, trading_days_per_year, portfolio_weights].hash
+      [scenario, allocation_id, end_date, market_data_source, model_id, account_id, start_date, frequency_interval, trading_days_per_year, use_proxy_data, portfolio_weights, portfolio_tickers, create_log, aggregation_account_id, portfolio_id].hash
     end
 
     # Builds the object from hash
@@ -315,17 +315,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
@@ -357,8 +356,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
@@ -381,8 +379,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