esi-client-bvv 1.0.1 → 1.0.2

data/lib/esi-client-bvv/models/get_characters_character_id_assets_200_ok.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.8.1
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.3.1
@@ -15,11 +15,14 @@ require 'date'
 module ESI
   # 200 ok object
   class GetCharactersCharacterIdAssets200Ok
-    # type_id integer
-    attr_accessor :type_id
+    # is_singleton boolean
+    attr_accessor :is_singleton
 
-    # quantity integer
-    attr_accessor :quantity
+    # item_id integer
+    attr_accessor :item_id
+
+    # location_flag string
+    attr_accessor :location_flag
 
     # location_id integer
     attr_accessor :location_id
@@ -27,14 +30,11 @@ module ESI
     # location_type string
     attr_accessor :location_type
 
-    # item_id integer
-    attr_accessor :item_id
-
-    # location_flag string
-    attr_accessor :location_flag
+    # quantity integer
+    attr_accessor :quantity
 
-    # is_singleton boolean
-    attr_accessor :is_singleton
+    # type_id integer
+    attr_accessor :type_id
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -61,26 +61,26 @@ module ESI
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'type_id' => :'type_id',
-        :'quantity' => :'quantity',
-        :'location_id' => :'location_id',
-        :'location_type' => :'location_type',
+        :'is_singleton' => :'is_singleton',
         :'item_id' => :'item_id',
         :'location_flag' => :'location_flag',
-        :'is_singleton' => :'is_singleton'
+        :'location_id' => :'location_id',
+        :'location_type' => :'location_type',
+        :'quantity' => :'quantity',
+        :'type_id' => :'type_id'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'type_id' => :'Integer',
-        :'quantity' => :'Integer',
-        :'location_id' => :'Integer',
-        :'location_type' => :'String',
+        :'is_singleton' => :'BOOLEAN',
         :'item_id' => :'Integer',
         :'location_flag' => :'String',
-        :'is_singleton' => :'BOOLEAN'
+        :'location_id' => :'Integer',
+        :'location_type' => :'String',
+        :'quantity' => :'Integer',
+        :'type_id' => :'Integer'
       }
     end
 
@@ -92,12 +92,16 @@ module ESI
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
 
-      if attributes.has_key?(:'type_id')
-        self.type_id = attributes[:'type_id']
+      if attributes.has_key?(:'is_singleton')
+        self.is_singleton = attributes[:'is_singleton']
       end
 
-      if attributes.has_key?(:'quantity')
-        self.quantity = attributes[:'quantity']
+      if attributes.has_key?(:'item_id')
+        self.item_id = attributes[:'item_id']
+      end
+
+      if attributes.has_key?(:'location_flag')
+        self.location_flag = attributes[:'location_flag']
       end
 
       if attributes.has_key?(:'location_id')
@@ -108,16 +112,12 @@ module ESI
         self.location_type = attributes[:'location_type']
       end
 
-      if attributes.has_key?(:'item_id')
-        self.item_id = attributes[:'item_id']
-      end
-
-      if attributes.has_key?(:'location_flag')
-        self.location_flag = attributes[:'location_flag']
+      if attributes.has_key?(:'quantity')
+        self.quantity = attributes[:'quantity']
       end
 
-      if attributes.has_key?(:'is_singleton')
-        self.is_singleton = attributes[:'is_singleton']
+      if attributes.has_key?(:'type_id')
+        self.type_id = attributes[:'type_id']
       end
 
     end
@@ -126,12 +126,16 @@ module ESI
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @type_id.nil?
-        invalid_properties.push("invalid value for 'type_id', type_id cannot be nil.")
+      if @is_singleton.nil?
+        invalid_properties.push("invalid value for 'is_singleton', is_singleton cannot be nil.")
       end
 
-      if @quantity.nil?
-        invalid_properties.push("invalid value for 'quantity', quantity cannot be nil.")
+      if @item_id.nil?
+        invalid_properties.push("invalid value for 'item_id', item_id cannot be nil.")
+      end
+
+      if @location_flag.nil?
+        invalid_properties.push("invalid value for 'location_flag', location_flag cannot be nil.")
       end
 
       if @location_id.nil?
@@ -142,16 +146,12 @@ module ESI
         invalid_properties.push("invalid value for 'location_type', location_type cannot be nil.")
       end
 
-      if @item_id.nil?
-        invalid_properties.push("invalid value for 'item_id', item_id cannot be nil.")
-      end
-
-      if @location_flag.nil?
-        invalid_properties.push("invalid value for 'location_flag', location_flag cannot be nil.")
+      if @quantity.nil?
+        invalid_properties.push("invalid value for 'quantity', quantity cannot be nil.")
       end
 
-      if @is_singleton.nil?
-        invalid_properties.push("invalid value for 'is_singleton', is_singleton cannot be nil.")
+      if @type_id.nil?
+        invalid_properties.push("invalid value for 'type_id', type_id cannot be nil.")
       end
 
       return invalid_properties
@@ -160,30 +160,20 @@ module ESI
     # 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 @type_id.nil?
-      return false if @quantity.nil?
-      return false if @location_id.nil?
-      return false if @location_type.nil?
-      location_type_validator = EnumAttributeValidator.new('String', ["station", "solar_system", "other"])
-      return false unless location_type_validator.valid?(@location_type)
+      return false if @is_singleton.nil?
       return false if @item_id.nil?
       return false if @location_flag.nil?
       location_flag_validator = EnumAttributeValidator.new('String', ["AssetSafety", "AutoFit", "Cargo", "CorpseBay", "Deliveries", "DroneBay", "FighterBay", "FighterTube0", "FighterTube1", "FighterTube2", "FighterTube3", "FighterTube4", "FleetHangar", "Hangar", "HangarAll", "HiSlot0", "HiSlot1", "HiSlot2", "HiSlot3", "HiSlot4", "HiSlot5", "HiSlot6", "HiSlot7", "HiddenModifiers", "Implant", "LoSlot0", "LoSlot1", "LoSlot2", "LoSlot3", "LoSlot4", "LoSlot5", "LoSlot6", "LoSlot7", "Locked", "MedSlot0", "MedSlot1", "MedSlot2", "MedSlot3", "MedSlot4", "MedSlot5", "MedSlot6", "MedSlot7", "QuafeBay", "RigSlot0", "RigSlot1", "RigSlot2", "RigSlot3", "RigSlot4", "RigSlot5", "RigSlot6", "RigSlot7", "ShipHangar", "Skill", "SpecializedAmmoHold", "SpecializedCommandCenterHold", "SpecializedFuelBay", "SpecializedGasHold", "SpecializedIndustrialShipHold", "SpecializedLargeShipHold", "SpecializedMaterialBay", "SpecializedMediumShipHold", "SpecializedMineralHold", "SpecializedOreHold", "SpecializedPlanetaryCommoditiesHold", "SpecializedSalvageHold", "SpecializedShipHold", "SpecializedSmallShipHold", "SubSystemBay", "SubSystemSlot0", "SubSystemSlot1", "SubSystemSlot2", "SubSystemSlot3", "SubSystemSlot4", "SubSystemSlot5", "SubSystemSlot6", "SubSystemSlot7", "Unlocked", "Wardrobe"])
       return false unless location_flag_validator.valid?(@location_flag)
-      return false if @is_singleton.nil?
+      return false if @location_id.nil?
+      return false if @location_type.nil?
+      location_type_validator = EnumAttributeValidator.new('String', ["station", "solar_system", "other"])
+      return false unless location_type_validator.valid?(@location_type)
+      return false if @quantity.nil?
+      return false if @type_id.nil?
       return true
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] location_type Object to be assigned
-    def location_type=(location_type)
-      validator = EnumAttributeValidator.new('String', ["station", "solar_system", "other"])
-      unless validator.valid?(location_type)
-        fail ArgumentError, "invalid value for 'location_type', must be one of #{validator.allowable_values}."
-      end
-      @location_type = location_type
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] location_flag Object to be assigned
     def location_flag=(location_flag)
@@ -194,18 +184,28 @@ module ESI
       @location_flag = location_flag
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] location_type Object to be assigned
+    def location_type=(location_type)
+      validator = EnumAttributeValidator.new('String', ["station", "solar_system", "other"])
+      unless validator.valid?(location_type)
+        fail ArgumentError, "invalid value for 'location_type', must be one of #{validator.allowable_values}."
+      end
+      @location_type = location_type
+    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 &&
-          type_id == o.type_id &&
-          quantity == o.quantity &&
-          location_id == o.location_id &&
-          location_type == o.location_type &&
+          is_singleton == o.is_singleton &&
           item_id == o.item_id &&
           location_flag == o.location_flag &&
-          is_singleton == o.is_singleton
+          location_id == o.location_id &&
+          location_type == o.location_type &&
+          quantity == o.quantity &&
+          type_id == o.type_id
     end
 
     # @see the `==` method
@@ -217,7 +217,7 @@ module ESI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [type_id, quantity, location_id, location_type, item_id, location_flag, is_singleton].hash
+      [is_singleton, item_id, location_flag, location_id, location_type, quantity, type_id].hash
     end
 
     # Builds the object from hash

data/lib/esi-client-bvv/models/get_characters_character_id_attributes_ok.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.8.1
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.3.1
@@ -15,12 +15,21 @@ require 'date'
 module ESI
   # 200 ok object
   class GetCharactersCharacterIdAttributesOk
+    # Neural remapping cooldown after a character uses remap accrued over time
+    attr_accessor :accrued_remap_cooldown_date
+
+    # Number of available bonus character neural remaps
+    attr_accessor :bonus_remaps
+
     # charisma integer
     attr_accessor :charisma
 
     # intelligence integer
     attr_accessor :intelligence
 
+    # Datetime of last neural remap, including usage of bonus remaps
+    attr_accessor :last_remap_date
+
     # memory integer
     attr_accessor :memory
 
@@ -30,41 +39,32 @@ module ESI
     # willpower integer
     attr_accessor :willpower
 
-    # Number of available bonus character neural remaps
-    attr_accessor :bonus_remaps
-
-    # Datetime of last neural remap, including usage of bonus remaps
-    attr_accessor :last_remap_date
-
-    # Neural remapping cooldown after a character uses remap accrued over time
-    attr_accessor :accrued_remap_cooldown_date
-
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'accrued_remap_cooldown_date' => :'accrued_remap_cooldown_date',
+        :'bonus_remaps' => :'bonus_remaps',
         :'charisma' => :'charisma',
         :'intelligence' => :'intelligence',
+        :'last_remap_date' => :'last_remap_date',
         :'memory' => :'memory',
         :'perception' => :'perception',
-        :'willpower' => :'willpower',
-        :'bonus_remaps' => :'bonus_remaps',
-        :'last_remap_date' => :'last_remap_date',
-        :'accrued_remap_cooldown_date' => :'accrued_remap_cooldown_date'
+        :'willpower' => :'willpower'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
+        :'accrued_remap_cooldown_date' => :'DateTime',
+        :'bonus_remaps' => :'Integer',
         :'charisma' => :'Integer',
         :'intelligence' => :'Integer',
+        :'last_remap_date' => :'DateTime',
         :'memory' => :'Integer',
         :'perception' => :'Integer',
-        :'willpower' => :'Integer',
-        :'bonus_remaps' => :'Integer',
-        :'last_remap_date' => :'DateTime',
-        :'accrued_remap_cooldown_date' => :'DateTime'
+        :'willpower' => :'Integer'
       }
     end
 
@@ -76,6 +76,14 @@ module ESI
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
 
+      if attributes.has_key?(:'accrued_remap_cooldown_date')
+        self.accrued_remap_cooldown_date = attributes[:'accrued_remap_cooldown_date']
+      end
+
+      if attributes.has_key?(:'bonus_remaps')
+        self.bonus_remaps = attributes[:'bonus_remaps']
+      end
+
       if attributes.has_key?(:'charisma')
         self.charisma = attributes[:'charisma']
       end
@@ -84,6 +92,10 @@ module ESI
         self.intelligence = attributes[:'intelligence']
       end
 
+      if attributes.has_key?(:'last_remap_date')
+        self.last_remap_date = attributes[:'last_remap_date']
+      end
+
       if attributes.has_key?(:'memory')
         self.memory = attributes[:'memory']
       end
@@ -96,18 +108,6 @@ module ESI
         self.willpower = attributes[:'willpower']
       end
 
-      if attributes.has_key?(:'bonus_remaps')
-        self.bonus_remaps = attributes[:'bonus_remaps']
-      end
-
-      if attributes.has_key?(:'last_remap_date')
-        self.last_remap_date = attributes[:'last_remap_date']
-      end
-
-      if attributes.has_key?(:'accrued_remap_cooldown_date')
-        self.accrued_remap_cooldown_date = attributes[:'accrued_remap_cooldown_date']
-      end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -153,14 +153,14 @@ module ESI
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          accrued_remap_cooldown_date == o.accrued_remap_cooldown_date &&
+          bonus_remaps == o.bonus_remaps &&
           charisma == o.charisma &&
           intelligence == o.intelligence &&
+          last_remap_date == o.last_remap_date &&
           memory == o.memory &&
           perception == o.perception &&
-          willpower == o.willpower &&
-          bonus_remaps == o.bonus_remaps &&
-          last_remap_date == o.last_remap_date &&
-          accrued_remap_cooldown_date == o.accrued_remap_cooldown_date
+          willpower == o.willpower
     end
 
     # @see the `==` method
@@ -172,7 +172,7 @@ module ESI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [charisma, intelligence, memory, perception, willpower, bonus_remaps, last_remap_date, accrued_remap_cooldown_date].hash
+      [accrued_remap_cooldown_date, bonus_remaps, charisma, intelligence, last_remap_date, memory, perception, willpower].hash
     end
 
     # Builds the object from hash

data/lib/esi-client-bvv/models/get_characters_character_id_blueprints_200_ok.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.8.1
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.3.1
@@ -18,26 +18,26 @@ module ESI
     # Unique ID for this item.
     attr_accessor :item_id
 
-    # type_id integer
-    attr_accessor :type_id
+    # Type of the location_id
+    attr_accessor :location_flag
 
     # References a solar system, station or item_id if this blueprint is located within a container. If the return value is an item_id, then the Character AssetList API must be queried to find the container using the given item_id to determine the correct location of the Blueprint.
     attr_accessor :location_id
 
-    # Type of the location_id
-    attr_accessor :location_flag
+    # Material Efficiency Level of the blueprint.
+    attr_accessor :material_efficiency
 
     # A range of numbers with a minimum of -2 and no maximum value where -1 is an original and -2 is a copy. It can be a positive integer if it is a stack of blueprint originals fresh from the market (e.g. no activities performed on them yet).
     attr_accessor :quantity
 
+    # Number of runs remaining if the blueprint is a copy, -1 if it is an original.
+    attr_accessor :runs
+
     # Time Efficiency Level of the blueprint.
     attr_accessor :time_efficiency
 
-    # Material Efficiency Level of the blueprint.
-    attr_accessor :material_efficiency
-
-    # Number of runs remaining if the blueprint is a copy, -1 if it is an original.
-    attr_accessor :runs
+    # type_id integer
+    attr_accessor :type_id
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -65,13 +65,13 @@ module ESI
     def self.attribute_map
       {
         :'item_id' => :'item_id',
-        :'type_id' => :'type_id',
-        :'location_id' => :'location_id',
         :'location_flag' => :'location_flag',
+        :'location_id' => :'location_id',
+        :'material_efficiency' => :'material_efficiency',
         :'quantity' => :'quantity',
+        :'runs' => :'runs',
         :'time_efficiency' => :'time_efficiency',
-        :'material_efficiency' => :'material_efficiency',
-        :'runs' => :'runs'
+        :'type_id' => :'type_id'
       }
     end
 
@@ -79,13 +79,13 @@ module ESI
     def self.swagger_types
       {
         :'item_id' => :'Integer',
-        :'type_id' => :'Integer',
-        :'location_id' => :'Integer',
         :'location_flag' => :'String',
+        :'location_id' => :'Integer',
+        :'material_efficiency' => :'Integer',
         :'quantity' => :'Integer',
+        :'runs' => :'Integer',
         :'time_efficiency' => :'Integer',
-        :'material_efficiency' => :'Integer',
-        :'runs' => :'Integer'
+        :'type_id' => :'Integer'
       }
     end
 
@@ -101,32 +101,32 @@ module ESI
         self.item_id = attributes[:'item_id']
       end
 
-      if attributes.has_key?(:'type_id')
-        self.type_id = attributes[:'type_id']
+      if attributes.has_key?(:'location_flag')
+        self.location_flag = attributes[:'location_flag']
       end
 
       if attributes.has_key?(:'location_id')
         self.location_id = attributes[:'location_id']
       end
 
-      if attributes.has_key?(:'location_flag')
-        self.location_flag = attributes[:'location_flag']
+      if attributes.has_key?(:'material_efficiency')
+        self.material_efficiency = attributes[:'material_efficiency']
       end
 
       if attributes.has_key?(:'quantity')
         self.quantity = attributes[:'quantity']
       end
 
-      if attributes.has_key?(:'time_efficiency')
-        self.time_efficiency = attributes[:'time_efficiency']
+      if attributes.has_key?(:'runs')
+        self.runs = attributes[:'runs']
       end
 
-      if attributes.has_key?(:'material_efficiency')
-        self.material_efficiency = attributes[:'material_efficiency']
+      if attributes.has_key?(:'time_efficiency')
+        self.time_efficiency = attributes[:'time_efficiency']
       end
 
-      if attributes.has_key?(:'runs')
-        self.runs = attributes[:'runs']
+      if attributes.has_key?(:'type_id')
+        self.type_id = attributes[:'type_id']
       end
 
     end
@@ -139,16 +139,24 @@ module ESI
         invalid_properties.push("invalid value for 'item_id', item_id cannot be nil.")
       end
 
-      if @type_id.nil?
-        invalid_properties.push("invalid value for 'type_id', type_id cannot be nil.")
+      if @location_flag.nil?
+        invalid_properties.push("invalid value for 'location_flag', location_flag cannot be nil.")
       end
 
       if @location_id.nil?
         invalid_properties.push("invalid value for 'location_id', location_id cannot be nil.")
       end
 
-      if @location_flag.nil?
-        invalid_properties.push("invalid value for 'location_flag', location_flag cannot be nil.")
+      if @material_efficiency.nil?
+        invalid_properties.push("invalid value for 'material_efficiency', material_efficiency cannot be nil.")
+      end
+
+      if @material_efficiency > 25
+        invalid_properties.push("invalid value for 'material_efficiency', must be smaller than or equal to 25.")
+      end
+
+      if @material_efficiency < 0
+        invalid_properties.push("invalid value for 'material_efficiency', must be greater than or equal to 0.")
       end
 
       if @quantity.nil?
@@ -159,6 +167,14 @@ module ESI
         invalid_properties.push("invalid value for 'quantity', must be greater than or equal to -2.")
       end
 
+      if @runs.nil?
+        invalid_properties.push("invalid value for 'runs', runs cannot be nil.")
+      end
+
+      if @runs < -1
+        invalid_properties.push("invalid value for 'runs', must be greater than or equal to -1.")
+      end
+
       if @time_efficiency.nil?
         invalid_properties.push("invalid value for 'time_efficiency', time_efficiency cannot be nil.")
       end
@@ -171,24 +187,8 @@ module ESI
         invalid_properties.push("invalid value for 'time_efficiency', must be greater than or equal to 0.")
       end
 
-      if @material_efficiency.nil?
-        invalid_properties.push("invalid value for 'material_efficiency', material_efficiency cannot be nil.")
-      end
-
-      if @material_efficiency > 25
-        invalid_properties.push("invalid value for 'material_efficiency', must be smaller than or equal to 25.")
-      end
-
-      if @material_efficiency < 0
-        invalid_properties.push("invalid value for 'material_efficiency', must be greater than or equal to 0.")
-      end
-
-      if @runs.nil?
-        invalid_properties.push("invalid value for 'runs', runs cannot be nil.")
-      end
-
-      if @runs < -1
-        invalid_properties.push("invalid value for 'runs', must be greater than or equal to -1.")
+      if @type_id.nil?
+        invalid_properties.push("invalid value for 'type_id', type_id cannot be nil.")
       end
 
       return invalid_properties
@@ -198,21 +198,21 @@ module ESI
     # @return true if the model is valid
     def valid?
       return false if @item_id.nil?
-      return false if @type_id.nil?
-      return false if @location_id.nil?
       return false if @location_flag.nil?
       location_flag_validator = EnumAttributeValidator.new('String', ["AutoFit", "Cargo", "CorpseBay", "DroneBay", "FleetHangar", "Deliveries", "HiddenModifiers", "Hangar", "HangarAll", "LoSlot0", "LoSlot1", "LoSlot2", "LoSlot3", "LoSlot4", "LoSlot5", "LoSlot6", "LoSlot7", "MedSlot0", "MedSlot1", "MedSlot2", "MedSlot3", "MedSlot4", "MedSlot5", "MedSlot6", "MedSlot7", "HiSlot0", "HiSlot1", "HiSlot2", "HiSlot3", "HiSlot4", "HiSlot5", "HiSlot6", "HiSlot7", "AssetSafety", "Locked", "Unlocked", "Implant", "QuafeBay", "RigSlot0", "RigSlot1", "RigSlot2", "RigSlot3", "RigSlot4", "RigSlot5", "RigSlot6", "RigSlot7", "ShipHangar", "SpecializedFuelBay", "SpecializedOreHold", "SpecializedGasHold", "SpecializedMineralHold", "SpecializedSalvageHold", "SpecializedShipHold", "SpecializedSmallShipHold", "SpecializedMediumShipHold", "SpecializedLargeShipHold", "SpecializedIndustrialShipHold", "SpecializedAmmoHold", "SpecializedCommandCenterHold", "SpecializedPlanetaryCommoditiesHold", "SpecializedMaterialBay", "SubSystemSlot0", "SubSystemSlot1", "SubSystemSlot2", "SubSystemSlot3", "SubSystemSlot4", "SubSystemSlot5", "SubSystemSlot6", "SubSystemSlot7", "FighterBay", "FighterTube0", "FighterTube1", "FighterTube2", "FighterTube3", "FighterTube4", "Module"])
       return false unless location_flag_validator.valid?(@location_flag)
-      return false if @quantity.nil?
-      return false if @quantity < -2
-      return false if @time_efficiency.nil?
-      return false if @time_efficiency > 20
-      return false if @time_efficiency < 0
+      return false if @location_id.nil?
       return false if @material_efficiency.nil?
       return false if @material_efficiency > 25
       return false if @material_efficiency < 0
+      return false if @quantity.nil?
+      return false if @quantity < -2
       return false if @runs.nil?
       return false if @runs < -1
+      return false if @time_efficiency.nil?
+      return false if @time_efficiency > 20
+      return false if @time_efficiency < 0
+      return false if @type_id.nil?
       return true
     end
 
@@ -226,38 +226,6 @@ module ESI
       @location_flag = location_flag
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] quantity Value to be assigned
-    def quantity=(quantity)
-      if quantity.nil?
-        fail ArgumentError, "quantity cannot be nil"
-      end
-
-      if quantity < -2
-        fail ArgumentError, "invalid value for 'quantity', must be greater than or equal to -2."
-      end
-
-      @quantity = quantity
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] time_efficiency Value to be assigned
-    def time_efficiency=(time_efficiency)
-      if time_efficiency.nil?
-        fail ArgumentError, "time_efficiency cannot be nil"
-      end
-
-      if time_efficiency > 20
-        fail ArgumentError, "invalid value for 'time_efficiency', must be smaller than or equal to 20."
-      end
-
-      if time_efficiency < 0
-        fail ArgumentError, "invalid value for 'time_efficiency', must be greater than or equal to 0."
-      end
-
-      @time_efficiency = time_efficiency
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] material_efficiency Value to be assigned
     def material_efficiency=(material_efficiency)
@@ -276,6 +244,20 @@ module ESI
       @material_efficiency = material_efficiency
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] quantity Value to be assigned
+    def quantity=(quantity)
+      if quantity.nil?
+        fail ArgumentError, "quantity cannot be nil"
+      end
+
+      if quantity < -2
+        fail ArgumentError, "invalid value for 'quantity', must be greater than or equal to -2."
+      end
+
+      @quantity = quantity
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] runs Value to be assigned
     def runs=(runs)
@@ -290,19 +272,37 @@ module ESI
       @runs = runs
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] time_efficiency Value to be assigned
+    def time_efficiency=(time_efficiency)
+      if time_efficiency.nil?
+        fail ArgumentError, "time_efficiency cannot be nil"
+      end
+
+      if time_efficiency > 20
+        fail ArgumentError, "invalid value for 'time_efficiency', must be smaller than or equal to 20."
+      end
+
+      if time_efficiency < 0
+        fail ArgumentError, "invalid value for 'time_efficiency', must be greater than or equal to 0."
+      end
+
+      @time_efficiency = time_efficiency
+    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 &&
           item_id == o.item_id &&
-          type_id == o.type_id &&
-          location_id == o.location_id &&
           location_flag == o.location_flag &&
+          location_id == o.location_id &&
+          material_efficiency == o.material_efficiency &&
           quantity == o.quantity &&
+          runs == o.runs &&
           time_efficiency == o.time_efficiency &&
-          material_efficiency == o.material_efficiency &&
-          runs == o.runs
+          type_id == o.type_id
     end
 
     # @see the `==` method
@@ -314,7 +314,7 @@ module ESI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [item_id, type_id, location_id, location_flag, quantity, time_efficiency, material_efficiency, runs].hash
+      [item_id, location_flag, location_id, material_efficiency, quantity, runs, time_efficiency, type_id].hash
     end
 
     # Builds the object from hash