proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/mvo_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 MvoRequest
-    attr_accessor :sec_types
+    attr_accessor :tickers
+
+    attr_accessor :w_config
+
+    attr_accessor :min_assets
 
     attr_accessor :end_date
 
     attr_accessor :market_data_source
 
-    attr_accessor :tgt_val
+    attr_accessor :w_asset_config
+
+    attr_accessor :start_date
 
     attr_accessor :tgt_type
 
     attr_accessor :use_proxy_data
 
-    attr_accessor :w_config
-
-    attr_accessor :start_date
-
-    attr_accessor :tickers
-
-    attr_accessor :min_assets
+    attr_accessor :tgt_val
 
-    attr_accessor :w_asset_config
+    attr_accessor :sec_types
 
     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
       {
-        :'sec_types' => :'sec_types',
+        :'tickers' => :'tickers',
+        :'w_config' => :'w_config',
+        :'min_assets' => :'min_assets',
         :'end_date' => :'end_date',
         :'market_data_source' => :'market_data_source',
-        :'tgt_val' => :'tgt_val',
+        :'w_asset_config' => :'w_asset_config',
+        :'start_date' => :'start_date',
         :'tgt_type' => :'tgt_type',
         :'use_proxy_data' => :'use_proxy_data',
-        :'w_config' => :'w_config',
-        :'start_date' => :'start_date',
-        :'tickers' => :'tickers',
-        :'min_assets' => :'min_assets',
-        :'w_asset_config' => :'w_asset_config'
+        :'tgt_val' => :'tgt_val',
+        :'sec_types' => :'sec_types'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'sec_types' => :'Array<String>',
+        :'tickers' => :'Array<String>',
+        :'w_config' => :'WConfig',
+        :'min_assets' => :'Integer',
         :'end_date' => :'Date',
         :'market_data_source' => :'String',
-        :'tgt_val' => :'Float',
+        :'w_asset_config' => :'Object',
+        :'start_date' => :'Date',
         :'tgt_type' => :'String',
         :'use_proxy_data' => :'BOOLEAN',
-        :'w_config' => :'WConfig',
-        :'start_date' => :'Date',
-        :'tickers' => :'Array<String>',
-        :'min_assets' => :'Integer',
-        :'w_asset_config' => :'Object'
+        :'tgt_val' => :'Float',
+        :'sec_types' => :'Array<String>'
       }
     end
 
@@ -100,12 +100,20 @@ 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?(:'sec_types')
-        if (value = attributes[:'sec_types']).is_a?(Array)
-          self.sec_types = value
+      if attributes.has_key?(:'tickers')
+        if (value = attributes[:'tickers']).is_a?(Array)
+          self.tickers = value
         end
       end
 
+      if attributes.has_key?(:'w_config')
+        self.w_config = attributes[:'w_config']
+      end
+
+      if attributes.has_key?(:'min_assets')
+        self.min_assets = attributes[:'min_assets']
+      end
+
       if attributes.has_key?(:'end_date')
         self.end_date = attributes[:'end_date']
       end
@@ -116,10 +124,12 @@ module ProtonApi
         self.market_data_source = 'nucleus'
       end
 
-      if attributes.has_key?(:'tgt_val')
-        self.tgt_val = attributes[:'tgt_val']
-      else
-        self.tgt_val = 0.0
+      if attributes.has_key?(:'w_asset_config')
+        self.w_asset_config = attributes[:'w_asset_config']
+      end
+
+      if attributes.has_key?(:'start_date')
+        self.start_date = attributes[:'start_date']
       end
 
       if attributes.has_key?(:'tgt_type')
@@ -132,45 +142,31 @@ module ProtonApi
         self.use_proxy_data = false
       end
 
-      if attributes.has_key?(:'w_config')
-        self.w_config = attributes[:'w_config']
-      end
-
-      if attributes.has_key?(:'start_date')
-        self.start_date = attributes[:'start_date']
+      if attributes.has_key?(:'tgt_val')
+        self.tgt_val = attributes[:'tgt_val']
+      else
+        self.tgt_val = 0.0
       end
 
-      if attributes.has_key?(:'tickers')
-        if (value = attributes[:'tickers']).is_a?(Array)
-          self.tickers = value
+      if attributes.has_key?(:'sec_types')
+        if (value = attributes[:'sec_types']).is_a?(Array)
+          self.sec_types = value
         end
       end
-
-      if attributes.has_key?(:'min_assets')
-        self.min_assets = attributes[:'min_assets']
-      end
-
-      if attributes.has_key?(:'w_asset_config')
-        self.w_asset_config = attributes[:'w_asset_config']
-      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 @sec_types.nil?
-        invalid_properties.push('invalid value for "sec_types", sec_types cannot be nil.')
+      if @tickers.nil?
+        invalid_properties.push('invalid value for "tickers", tickers cannot be nil.')
       end
 
       if @w_config.nil?
         invalid_properties.push('invalid value for "w_config", w_config cannot be nil.')
       end
 
-      if @tickers.nil?
-        invalid_properties.push('invalid value for "tickers", tickers cannot be nil.')
-      end
-
       if @min_assets.nil?
         invalid_properties.push('invalid value for "min_assets", min_assets cannot be nil.')
       end
@@ -179,24 +175,42 @@ module ProtonApi
         invalid_properties.push('invalid value for "min_assets", must be greater than or equal to 1.')
       end
 
+      if @sec_types.nil?
+        invalid_properties.push('invalid value for "sec_types", sec_types cannot be nil.')
+      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 @sec_types.nil?
+      return false if @tickers.nil?
+      return false if @w_config.nil?
+      return false if @min_assets.nil?
+      return false if @min_assets < 1
       market_data_source_validator = EnumAttributeValidator.new('String', ['nucleus', 'integration'])
       return false unless market_data_source_validator.valid?(@market_data_source)
       tgt_type_validator = EnumAttributeValidator.new('String', ['risk', 'return'])
       return false unless tgt_type_validator.valid?(@tgt_type)
-      return false if @w_config.nil?
-      return false if @tickers.nil?
-      return false if @min_assets.nil?
-      return false if @min_assets < 1
+      return false if @sec_types.nil?
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] min_assets Value to be assigned
+    def min_assets=(min_assets)
+      if min_assets.nil?
+        fail ArgumentError, 'min_assets cannot be nil'
+      end
+
+      if min_assets < 1
+        fail ArgumentError, 'invalid value for "min_assets", must be greater than or equal to 1.'
+      end
+
+      @min_assets = min_assets
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] market_data_source Object to be assigned
     def market_data_source=(market_data_source)
@@ -217,36 +231,22 @@ module ProtonApi
       @tgt_type = tgt_type
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] min_assets Value to be assigned
-    def min_assets=(min_assets)
-      if min_assets.nil?
-        fail ArgumentError, 'min_assets cannot be nil'
-      end
-
-      if min_assets < 1
-        fail ArgumentError, 'invalid value for "min_assets", must be greater than or equal to 1.'
-      end
-
-      @min_assets = min_assets
-    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 &&
-          sec_types == o.sec_types &&
+          tickers == o.tickers &&
+          w_config == o.w_config &&
+          min_assets == o.min_assets &&
           end_date == o.end_date &&
           market_data_source == o.market_data_source &&
-          tgt_val == o.tgt_val &&
+          w_asset_config == o.w_asset_config &&
+          start_date == o.start_date &&
           tgt_type == o.tgt_type &&
           use_proxy_data == o.use_proxy_data &&
-          w_config == o.w_config &&
-          start_date == o.start_date &&
-          tickers == o.tickers &&
-          min_assets == o.min_assets &&
-          w_asset_config == o.w_asset_config
+          tgt_val == o.tgt_val &&
+          sec_types == o.sec_types
     end
 
     # @see the `==` method
@@ -258,7 +258,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [sec_types, end_date, market_data_source, tgt_val, tgt_type, use_proxy_data, w_config, start_date, tickers, min_assets, w_asset_config].hash
+      [tickers, w_config, min_assets, end_date, market_data_source, w_asset_config, start_date, tgt_type, use_proxy_data, tgt_val, sec_types].hash
     end
 
     # Builds the object from hash
@@ -280,17 +280,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
@@ -322,8 +321,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
@@ -346,8 +344,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/opt_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,20 +14,20 @@ require 'date'
 
 module ProtonApi
   class OptConfig
-    attr_accessor :sec_types
-
-    attr_accessor :end_date
+    attr_accessor :tickers
 
     attr_accessor :w_config
 
-    attr_accessor :start_date
-
-    attr_accessor :tickers
-
     attr_accessor :min_assets
 
+    attr_accessor :end_date
+
     attr_accessor :w_asset_config
 
+    attr_accessor :start_date
+
+    attr_accessor :sec_types
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -53,26 +53,26 @@ module ProtonApi
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'sec_types' => :'sec_types',
-        :'end_date' => :'end_date',
-        :'w_config' => :'w_config',
-        :'start_date' => :'start_date',
         :'tickers' => :'tickers',
+        :'w_config' => :'w_config',
         :'min_assets' => :'min_assets',
-        :'w_asset_config' => :'w_asset_config'
+        :'end_date' => :'end_date',
+        :'w_asset_config' => :'w_asset_config',
+        :'start_date' => :'start_date',
+        :'sec_types' => :'sec_types'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'sec_types' => :'Array<String>',
-        :'end_date' => :'Date',
-        :'w_config' => :'WConfig',
-        :'start_date' => :'Date',
         :'tickers' => :'Array<String>',
+        :'w_config' => :'WConfig',
         :'min_assets' => :'Integer',
-        :'w_asset_config' => :'Object'
+        :'end_date' => :'Date',
+        :'w_asset_config' => :'Object',
+        :'start_date' => :'Date',
+        :'sec_types' => :'Array<String>'
       }
     end
 
@@ -84,55 +84,51 @@ 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?(:'sec_types')
-        if (value = attributes[:'sec_types']).is_a?(Array)
-          self.sec_types = value
+      if attributes.has_key?(:'tickers')
+        if (value = attributes[:'tickers']).is_a?(Array)
+          self.tickers = value
         end
       end
 
+      if attributes.has_key?(:'w_config')
+        self.w_config = attributes[:'w_config']
+      end
+
+      if attributes.has_key?(:'min_assets')
+        self.min_assets = attributes[:'min_assets']
+      end
+
       if attributes.has_key?(:'end_date')
         self.end_date = attributes[:'end_date']
       end
 
-      if attributes.has_key?(:'w_config')
-        self.w_config = attributes[:'w_config']
+      if attributes.has_key?(:'w_asset_config')
+        self.w_asset_config = attributes[:'w_asset_config']
       end
 
       if attributes.has_key?(:'start_date')
         self.start_date = attributes[:'start_date']
       end
 
-      if attributes.has_key?(:'tickers')
-        if (value = attributes[:'tickers']).is_a?(Array)
-          self.tickers = value
+      if attributes.has_key?(:'sec_types')
+        if (value = attributes[:'sec_types']).is_a?(Array)
+          self.sec_types = value
         end
       end
-
-      if attributes.has_key?(:'min_assets')
-        self.min_assets = attributes[:'min_assets']
-      end
-
-      if attributes.has_key?(:'w_asset_config')
-        self.w_asset_config = attributes[:'w_asset_config']
-      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 @sec_types.nil?
-        invalid_properties.push('invalid value for "sec_types", sec_types cannot be nil.')
+      if @tickers.nil?
+        invalid_properties.push('invalid value for "tickers", tickers cannot be nil.')
       end
 
       if @w_config.nil?
         invalid_properties.push('invalid value for "w_config", w_config cannot be nil.')
       end
 
-      if @tickers.nil?
-        invalid_properties.push('invalid value for "tickers", tickers cannot be nil.')
-      end
-
       if @min_assets.nil?
         invalid_properties.push('invalid value for "min_assets", min_assets cannot be nil.')
       end
@@ -141,17 +137,21 @@ module ProtonApi
         invalid_properties.push('invalid value for "min_assets", must be greater than or equal to 1.')
       end
 
+      if @sec_types.nil?
+        invalid_properties.push('invalid value for "sec_types", sec_types cannot be nil.')
+      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 @sec_types.nil?
-      return false if @w_config.nil?
       return false if @tickers.nil?
+      return false if @w_config.nil?
       return false if @min_assets.nil?
       return false if @min_assets < 1
+      return false if @sec_types.nil?
       true
     end
 
@@ -174,13 +174,13 @@ module ProtonApi
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          sec_types == o.sec_types &&
-          end_date == o.end_date &&
-          w_config == o.w_config &&
-          start_date == o.start_date &&
           tickers == o.tickers &&
+          w_config == o.w_config &&
           min_assets == o.min_assets &&
-          w_asset_config == o.w_asset_config
+          end_date == o.end_date &&
+          w_asset_config == o.w_asset_config &&
+          start_date == o.start_date &&
+          sec_types == o.sec_types
     end
 
     # @see the `==` method
@@ -192,7 +192,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [sec_types, end_date, w_config, start_date, tickers, min_assets, w_asset_config].hash
+      [tickers, w_config, min_assets, end_date, w_asset_config, start_date, sec_types].hash
     end
 
     # Builds the object from hash
@@ -214,17 +214,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
@@ -256,8 +255,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
@@ -280,8 +278,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