esi_client 0.7.6.2 → 0.8.5.0

data/lib/esi_client/models/get_corporations_corporation_id_containers_logs_200_ok.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.8.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.0-SNAPSHOT
@@ -15,8 +15,11 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetCorporationsCorporationIdContainersLogs200Ok
-    # Timestamp when this log was created
-    attr_accessor :logged_at
+    # action string
+    attr_accessor :action
+
+    # ID of the character who performed the action.
+    attr_accessor :character_id
 
     # ID of the container
     attr_accessor :container_id
@@ -24,32 +27,29 @@ module ESIClient
     # Type ID of the container
     attr_accessor :container_type_id
 
-    # ID of the character who performed the action.
-    attr_accessor :character_id
+    # location_flag string
+    attr_accessor :location_flag
 
     # location_id integer
     attr_accessor :location_id
 
-    # action string
-    attr_accessor :action
+    # Timestamp when this log was created
+    attr_accessor :logged_at
+
+    # new_config_bitmask integer
+    attr_accessor :new_config_bitmask
+
+    # old_config_bitmask integer
+    attr_accessor :old_config_bitmask
 
     # Type of password set if action is of type SetPassword or EnterPassword
     attr_accessor :password_type
 
-    # Type ID of the item being acted upon
-    attr_accessor :type_id
-
     # Quantity of the item being acted upon
     attr_accessor :quantity
 
-    # old_config_bitmask integer
-    attr_accessor :old_config_bitmask
-
-    # new_config_bitmask integer
-    attr_accessor :new_config_bitmask
-
-    # location_flag string
-    attr_accessor :location_flag
+    # Type ID of the item being acted upon
+    attr_accessor :type_id
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -76,36 +76,36 @@ module ESIClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'logged_at' => :'logged_at',
+        :'action' => :'action',
+        :'character_id' => :'character_id',
         :'container_id' => :'container_id',
         :'container_type_id' => :'container_type_id',
-        :'character_id' => :'character_id',
+        :'location_flag' => :'location_flag',
         :'location_id' => :'location_id',
-        :'action' => :'action',
+        :'logged_at' => :'logged_at',
+        :'new_config_bitmask' => :'new_config_bitmask',
+        :'old_config_bitmask' => :'old_config_bitmask',
         :'password_type' => :'password_type',
-        :'type_id' => :'type_id',
         :'quantity' => :'quantity',
-        :'old_config_bitmask' => :'old_config_bitmask',
-        :'new_config_bitmask' => :'new_config_bitmask',
-        :'location_flag' => :'location_flag'
+        :'type_id' => :'type_id'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'logged_at' => :'DateTime',
+        :'action' => :'String',
+        :'character_id' => :'Integer',
         :'container_id' => :'Integer',
         :'container_type_id' => :'Integer',
-        :'character_id' => :'Integer',
+        :'location_flag' => :'String',
         :'location_id' => :'Integer',
-        :'action' => :'String',
+        :'logged_at' => :'DateTime',
+        :'new_config_bitmask' => :'Integer',
+        :'old_config_bitmask' => :'Integer',
         :'password_type' => :'String',
-        :'type_id' => :'Integer',
         :'quantity' => :'Integer',
-        :'old_config_bitmask' => :'Integer',
-        :'new_config_bitmask' => :'Integer',
-        :'location_flag' => :'String'
+        :'type_id' => :'Integer'
       }
     end
 
@@ -117,8 +117,12 @@ module ESIClient
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'logged_at')
-        self.logged_at = attributes[:'logged_at']
+      if attributes.has_key?(:'action')
+        self.action = attributes[:'action']
+      end
+
+      if attributes.has_key?(:'character_id')
+        self.character_id = attributes[:'character_id']
       end
 
       if attributes.has_key?(:'container_id')
@@ -129,40 +133,36 @@ module ESIClient
         self.container_type_id = attributes[:'container_type_id']
       end
 
-      if attributes.has_key?(:'character_id')
-        self.character_id = attributes[:'character_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?(:'action')
-        self.action = attributes[:'action']
-      end
-
-      if attributes.has_key?(:'password_type')
-        self.password_type = attributes[:'password_type']
-      end
-
-      if attributes.has_key?(:'type_id')
-        self.type_id = attributes[:'type_id']
+      if attributes.has_key?(:'logged_at')
+        self.logged_at = attributes[:'logged_at']
       end
 
-      if attributes.has_key?(:'quantity')
-        self.quantity = attributes[:'quantity']
+      if attributes.has_key?(:'new_config_bitmask')
+        self.new_config_bitmask = attributes[:'new_config_bitmask']
       end
 
       if attributes.has_key?(:'old_config_bitmask')
         self.old_config_bitmask = attributes[:'old_config_bitmask']
       end
 
-      if attributes.has_key?(:'new_config_bitmask')
-        self.new_config_bitmask = attributes[:'new_config_bitmask']
+      if attributes.has_key?(:'password_type')
+        self.password_type = attributes[:'password_type']
       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?(:'type_id')
+        self.type_id = attributes[:'type_id']
       end
     end
 
@@ -170,8 +170,12 @@ module ESIClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @logged_at.nil?
-        invalid_properties.push('invalid value for "logged_at", logged_at cannot be nil.')
+      if @action.nil?
+        invalid_properties.push('invalid value for "action", action cannot be nil.')
+      end
+
+      if @character_id.nil?
+        invalid_properties.push('invalid value for "character_id", character_id cannot be nil.')
       end
 
       if @container_id.nil?
@@ -182,20 +186,16 @@ module ESIClient
         invalid_properties.push('invalid value for "container_type_id", container_type_id cannot be nil.')
       end
 
-      if @character_id.nil?
-        invalid_properties.push('invalid value for "character_id", character_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 @action.nil?
-        invalid_properties.push('invalid value for "action", action cannot be nil.')
-      end
-
-      if @location_flag.nil?
-        invalid_properties.push('invalid value for "location_flag", location_flag cannot be nil.')
+      if @logged_at.nil?
+        invalid_properties.push('invalid value for "logged_at", logged_at cannot be nil.')
       end
 
       invalid_properties
@@ -204,19 +204,19 @@ module ESIClient
     # 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 @logged_at.nil?
-      return false if @container_id.nil?
-      return false if @container_type_id.nil?
-      return false if @character_id.nil?
-      return false if @location_id.nil?
       return false if @action.nil?
       action_validator = EnumAttributeValidator.new('String', ['add', 'assemble', 'configure', 'enter_password', 'lock', 'move', 'repackage', 'set_name', 'set_password', 'unlock'])
       return false unless action_validator.valid?(@action)
-      password_type_validator = EnumAttributeValidator.new('String', ['config', 'general'])
-      return false unless password_type_validator.valid?(@password_type)
+      return false if @character_id.nil?
+      return false if @container_id.nil?
+      return false if @container_type_id.nil?
       return false if @location_flag.nil?
-      location_flag_validator = EnumAttributeValidator.new('String', ['AssetSafety', 'AutoFit', 'Bonus', 'Booster', 'BoosterBay', 'Capsule', 'Cargo', 'CorpDeliveries', 'CorpSAG1', 'CorpSAG2', 'CorpSAG3', 'CorpSAG4', 'CorpSAG5', 'CorpSAG6', 'CorpSAG7', 'CrateLoot', 'Deliveries', 'DroneBay', 'DustBattle', 'DustDatabank', 'FighterBay', 'FighterTube0', 'FighterTube1', 'FighterTube2', 'FighterTube3', 'FighterTube4', 'FleetHangar', 'Hangar', 'HangarAll', 'HiSlot0', 'HiSlot1', 'HiSlot2', 'HiSlot3', 'HiSlot4', 'HiSlot5', 'HiSlot6', 'HiSlot7', 'HiddenModifers', 'Implant', 'Impounded', 'JunkyardReprocessed', 'JunkyardTrashed', 'LoSlot0', 'LoSlot1', 'LoSlot2', 'LoSlot3', 'LoSlot4', 'LoSlot5', 'LoSlot6', 'LoSlot7', 'Locked', 'MedSlot0', 'MedSlot1', 'MedSlot2', 'MedSlot3', 'MedSlot4', 'MedSlot5', 'MedSlot6', 'MedSlot7', 'OfficeFolder', 'Pilot', 'PlanetSurface', 'QuafeBay', 'Reward', 'RigSlot0', 'RigSlot1', 'RigSlot2', 'RigSlot3', 'RigSlot4', 'RigSlot5', 'RigSlot6', 'RigSlot7', 'SecondaryStorage', 'ServiceSlot0', 'ServiceSlot1', 'ServiceSlot2', 'ServiceSlot3', 'ServiceSlot4', 'ServiceSlot5', 'ServiceSlot6', 'ServiceSlot7', 'ShipHangar', 'ShipOffline', 'Skill', 'SkillInTraining', 'SpecializedAmmoHold', 'SpecializedCommandCenterHold', 'SpecializedFuelBay', 'SpecializedGasHold', 'SpecializedIndustrialShipHold', 'SpecializedLargeShipHold', 'SpecializedMaterialBay', 'SpecializedMediumShipHold', 'SpecializedMineralHold', 'SpecializedOreHold', 'SpecializedPlanetaryCommoditiesHold', 'SpecializedSalvageHold', 'SpecializedShipHold', 'SpecializedSmallShipHold', 'StructureActive', 'StructureFuel', 'StructureInactive', 'StructureOffline', 'SubSystemSlot0', 'SubSystemSlot1', 'SubSystemSlot2', 'SubSystemSlot3', 'SubSystemSlot4', 'SubSystemSlot5', 'SubSystemSlot6', 'SubSystemSlot7', 'SubsystemBay', 'Unlocked', 'Wallet', 'Wardrobe'])
+      location_flag_validator = EnumAttributeValidator.new('String', ['AssetSafety', 'AutoFit', 'Bonus', 'Booster', 'BoosterBay', 'Capsule', 'Cargo', 'CorpDeliveries', 'CorpSAG1', 'CorpSAG2', 'CorpSAG3', 'CorpSAG4', 'CorpSAG5', 'CorpSAG6', 'CorpSAG7', 'CrateLoot', 'Deliveries', 'DroneBay', 'DustBattle', 'DustDatabank', 'FighterBay', 'FighterTube0', 'FighterTube1', 'FighterTube2', 'FighterTube3', 'FighterTube4', 'FleetHangar', 'Hangar', 'HangarAll', 'HiSlot0', 'HiSlot1', 'HiSlot2', 'HiSlot3', 'HiSlot4', 'HiSlot5', 'HiSlot6', 'HiSlot7', 'HiddenModifiers', 'Implant', 'Impounded', 'JunkyardReprocessed', 'JunkyardTrashed', 'LoSlot0', 'LoSlot1', 'LoSlot2', 'LoSlot3', 'LoSlot4', 'LoSlot5', 'LoSlot6', 'LoSlot7', 'Locked', 'MedSlot0', 'MedSlot1', 'MedSlot2', 'MedSlot3', 'MedSlot4', 'MedSlot5', 'MedSlot6', 'MedSlot7', 'OfficeFolder', 'Pilot', 'PlanetSurface', 'QuafeBay', 'Reward', 'RigSlot0', 'RigSlot1', 'RigSlot2', 'RigSlot3', 'RigSlot4', 'RigSlot5', 'RigSlot6', 'RigSlot7', 'SecondaryStorage', 'ServiceSlot0', 'ServiceSlot1', 'ServiceSlot2', 'ServiceSlot3', 'ServiceSlot4', 'ServiceSlot5', 'ServiceSlot6', 'ServiceSlot7', 'ShipHangar', 'ShipOffline', 'Skill', 'SkillInTraining', 'SpecializedAmmoHold', 'SpecializedCommandCenterHold', 'SpecializedFuelBay', 'SpecializedGasHold', 'SpecializedIndustrialShipHold', 'SpecializedLargeShipHold', 'SpecializedMaterialBay', 'SpecializedMediumShipHold', 'SpecializedMineralHold', 'SpecializedOreHold', 'SpecializedPlanetaryCommoditiesHold', 'SpecializedSalvageHold', 'SpecializedShipHold', 'SpecializedSmallShipHold', 'StructureActive', 'StructureFuel', 'StructureInactive', 'StructureOffline', 'SubSystemBay', 'SubSystemSlot0', 'SubSystemSlot1', 'SubSystemSlot2', 'SubSystemSlot3', 'SubSystemSlot4', 'SubSystemSlot5', 'SubSystemSlot6', 'SubSystemSlot7', 'Unlocked', 'Wallet', 'Wardrobe'])
       return false unless location_flag_validator.valid?(@location_flag)
+      return false if @location_id.nil?
+      return false if @logged_at.nil?
+      password_type_validator = EnumAttributeValidator.new('String', ['config', 'general'])
+      return false unless password_type_validator.valid?(@password_type)
       true
     end
 
@@ -230,6 +230,16 @@ module ESIClient
       @action = action
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] location_flag Object to be assigned
+    def location_flag=(location_flag)
+      validator = EnumAttributeValidator.new('String', ['AssetSafety', 'AutoFit', 'Bonus', 'Booster', 'BoosterBay', 'Capsule', 'Cargo', 'CorpDeliveries', 'CorpSAG1', 'CorpSAG2', 'CorpSAG3', 'CorpSAG4', 'CorpSAG5', 'CorpSAG6', 'CorpSAG7', 'CrateLoot', 'Deliveries', 'DroneBay', 'DustBattle', 'DustDatabank', 'FighterBay', 'FighterTube0', 'FighterTube1', 'FighterTube2', 'FighterTube3', 'FighterTube4', 'FleetHangar', 'Hangar', 'HangarAll', 'HiSlot0', 'HiSlot1', 'HiSlot2', 'HiSlot3', 'HiSlot4', 'HiSlot5', 'HiSlot6', 'HiSlot7', 'HiddenModifiers', 'Implant', 'Impounded', 'JunkyardReprocessed', 'JunkyardTrashed', 'LoSlot0', 'LoSlot1', 'LoSlot2', 'LoSlot3', 'LoSlot4', 'LoSlot5', 'LoSlot6', 'LoSlot7', 'Locked', 'MedSlot0', 'MedSlot1', 'MedSlot2', 'MedSlot3', 'MedSlot4', 'MedSlot5', 'MedSlot6', 'MedSlot7', 'OfficeFolder', 'Pilot', 'PlanetSurface', 'QuafeBay', 'Reward', 'RigSlot0', 'RigSlot1', 'RigSlot2', 'RigSlot3', 'RigSlot4', 'RigSlot5', 'RigSlot6', 'RigSlot7', 'SecondaryStorage', 'ServiceSlot0', 'ServiceSlot1', 'ServiceSlot2', 'ServiceSlot3', 'ServiceSlot4', 'ServiceSlot5', 'ServiceSlot6', 'ServiceSlot7', 'ShipHangar', 'ShipOffline', 'Skill', 'SkillInTraining', 'SpecializedAmmoHold', 'SpecializedCommandCenterHold', 'SpecializedFuelBay', 'SpecializedGasHold', 'SpecializedIndustrialShipHold', 'SpecializedLargeShipHold', 'SpecializedMaterialBay', 'SpecializedMediumShipHold', 'SpecializedMineralHold', 'SpecializedOreHold', 'SpecializedPlanetaryCommoditiesHold', 'SpecializedSalvageHold', 'SpecializedShipHold', 'SpecializedSmallShipHold', 'StructureActive', 'StructureFuel', 'StructureInactive', 'StructureOffline', 'SubSystemBay', 'SubSystemSlot0', 'SubSystemSlot1', 'SubSystemSlot2', 'SubSystemSlot3', 'SubSystemSlot4', 'SubSystemSlot5', 'SubSystemSlot6', 'SubSystemSlot7', 'Unlocked', 'Wallet', 'Wardrobe'])
+      unless validator.valid?(location_flag)
+        fail ArgumentError, 'invalid value for "location_flag", must be one of #{validator.allowable_values}.'
+      end
+      @location_flag = location_flag
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] password_type Object to be assigned
     def password_type=(password_type)
@@ -240,33 +250,23 @@ module ESIClient
       @password_type = password_type
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] location_flag Object to be assigned
-    def location_flag=(location_flag)
-      validator = EnumAttributeValidator.new('String', ['AssetSafety', 'AutoFit', 'Bonus', 'Booster', 'BoosterBay', 'Capsule', 'Cargo', 'CorpDeliveries', 'CorpSAG1', 'CorpSAG2', 'CorpSAG3', 'CorpSAG4', 'CorpSAG5', 'CorpSAG6', 'CorpSAG7', 'CrateLoot', 'Deliveries', 'DroneBay', 'DustBattle', 'DustDatabank', 'FighterBay', 'FighterTube0', 'FighterTube1', 'FighterTube2', 'FighterTube3', 'FighterTube4', 'FleetHangar', 'Hangar', 'HangarAll', 'HiSlot0', 'HiSlot1', 'HiSlot2', 'HiSlot3', 'HiSlot4', 'HiSlot5', 'HiSlot6', 'HiSlot7', 'HiddenModifers', 'Implant', 'Impounded', 'JunkyardReprocessed', 'JunkyardTrashed', 'LoSlot0', 'LoSlot1', 'LoSlot2', 'LoSlot3', 'LoSlot4', 'LoSlot5', 'LoSlot6', 'LoSlot7', 'Locked', 'MedSlot0', 'MedSlot1', 'MedSlot2', 'MedSlot3', 'MedSlot4', 'MedSlot5', 'MedSlot6', 'MedSlot7', 'OfficeFolder', 'Pilot', 'PlanetSurface', 'QuafeBay', 'Reward', 'RigSlot0', 'RigSlot1', 'RigSlot2', 'RigSlot3', 'RigSlot4', 'RigSlot5', 'RigSlot6', 'RigSlot7', 'SecondaryStorage', 'ServiceSlot0', 'ServiceSlot1', 'ServiceSlot2', 'ServiceSlot3', 'ServiceSlot4', 'ServiceSlot5', 'ServiceSlot6', 'ServiceSlot7', 'ShipHangar', 'ShipOffline', 'Skill', 'SkillInTraining', 'SpecializedAmmoHold', 'SpecializedCommandCenterHold', 'SpecializedFuelBay', 'SpecializedGasHold', 'SpecializedIndustrialShipHold', 'SpecializedLargeShipHold', 'SpecializedMaterialBay', 'SpecializedMediumShipHold', 'SpecializedMineralHold', 'SpecializedOreHold', 'SpecializedPlanetaryCommoditiesHold', 'SpecializedSalvageHold', 'SpecializedShipHold', 'SpecializedSmallShipHold', 'StructureActive', 'StructureFuel', 'StructureInactive', 'StructureOffline', 'SubSystemSlot0', 'SubSystemSlot1', 'SubSystemSlot2', 'SubSystemSlot3', 'SubSystemSlot4', 'SubSystemSlot5', 'SubSystemSlot6', 'SubSystemSlot7', 'SubsystemBay', 'Unlocked', 'Wallet', 'Wardrobe'])
-      unless validator.valid?(location_flag)
-        fail ArgumentError, 'invalid value for "location_flag", must be one of #{validator.allowable_values}.'
-      end
-      @location_flag = location_flag
-    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 &&
-          logged_at == o.logged_at &&
+          action == o.action &&
+          character_id == o.character_id &&
           container_id == o.container_id &&
           container_type_id == o.container_type_id &&
-          character_id == o.character_id &&
+          location_flag == o.location_flag &&
           location_id == o.location_id &&
-          action == o.action &&
+          logged_at == o.logged_at &&
+          new_config_bitmask == o.new_config_bitmask &&
+          old_config_bitmask == o.old_config_bitmask &&
           password_type == o.password_type &&
-          type_id == o.type_id &&
           quantity == o.quantity &&
-          old_config_bitmask == o.old_config_bitmask &&
-          new_config_bitmask == o.new_config_bitmask &&
-          location_flag == o.location_flag
+          type_id == o.type_id
     end
 
     # @see the `==` method
@@ -278,7 +278,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [logged_at, container_id, container_type_id, character_id, location_id, action, password_type, type_id, quantity, old_config_bitmask, new_config_bitmask, location_flag].hash
+      [action, character_id, container_id, container_type_id, location_flag, location_id, logged_at, new_config_bitmask, old_config_bitmask, password_type, quantity, type_id].hash
     end
 
     # Builds the object from hash

data/lib/esi_client/models/get_corporations_corporation_id_contracts_200_ok.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.8.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.0-SNAPSHOT
@@ -15,56 +15,50 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetCorporationsCorporationIdContracts200Ok
-    # contract_id integer
-    attr_accessor :contract_id
-
-    # Character ID for the issuer
-    attr_accessor :issuer_id
-
-    # Character's corporation ID for the issuer
-    attr_accessor :issuer_corporation_id
-
-    # ID to whom the contract is assigned, can be corporation or character ID
-    attr_accessor :assignee_id
-
     # Who will accept the contract
     attr_accessor :acceptor_id
 
-    # Start location ID (for Couriers contract)
-    attr_accessor :start_location_id
-
-    # End location ID (for Couriers contract)
-    attr_accessor :end_location_id
+    # ID to whom the contract is assigned, can be corporation or character ID
+    attr_accessor :assignee_id
 
-    # Type of the contract
-    attr_accessor :type
+    # To whom the contract is available
+    attr_accessor :availability
 
-    # Status of the the contract
-    attr_accessor :status
+    # Buyout price (for Auctions only)
+    attr_accessor :buyout
 
-    # Title of the contract
-    attr_accessor :title
+    # Collateral price (for Couriers only)
+    attr_accessor :collateral
 
-    # true if the contract was issued on behalf of the issuer's corporation
-    attr_accessor :for_corporation
+    # contract_id integer
+    attr_accessor :contract_id
 
-    # To whom the contract is available
-    attr_accessor :availability
+    # Date of confirmation of contract
+    attr_accessor :date_accepted
 
-    # Сreation date of the contract
-    attr_accessor :date_issued
+    # Date of completed of contract
+    attr_accessor :date_completed
 
     # Expiration date of the contract
     attr_accessor :date_expired
 
-    # Date of confirmation of contract
-    attr_accessor :date_accepted
+    # Сreation date of the contract
+    attr_accessor :date_issued
 
     # Number of days to perform the contract
     attr_accessor :days_to_complete
 
-    # Date of completed of contract
-    attr_accessor :date_completed
+    # End location ID (for Couriers contract)
+    attr_accessor :end_location_id
+
+    # true if the contract was issued on behalf of the issuer's corporation
+    attr_accessor :for_corporation
+
+    # Character's corporation ID for the issuer
+    attr_accessor :issuer_corporation_id
+
+    # Character ID for the issuer
+    attr_accessor :issuer_id
 
     # Price of contract (for ItemsExchange and Auctions)
     attr_accessor :price
@@ -72,11 +66,17 @@ module ESIClient
     # Remuneration for contract (for Couriers only)
     attr_accessor :reward
 
-    # Collateral price (for Couriers only)
-    attr_accessor :collateral
+    # Start location ID (for Couriers contract)
+    attr_accessor :start_location_id
 
-    # Buyout price (for Auctions only)
-    attr_accessor :buyout
+    # Status of the the contract
+    attr_accessor :status
+
+    # Title of the contract
+    attr_accessor :title
+
+    # Type of the contract
+    attr_accessor :type
 
     # Volume of items in the contract
     attr_accessor :volume
@@ -106,27 +106,27 @@ module ESIClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'contract_id' => :'contract_id',
-        :'issuer_id' => :'issuer_id',
-        :'issuer_corporation_id' => :'issuer_corporation_id',
-        :'assignee_id' => :'assignee_id',
         :'acceptor_id' => :'acceptor_id',
-        :'start_location_id' => :'start_location_id',
-        :'end_location_id' => :'end_location_id',
-        :'type' => :'type',
-        :'status' => :'status',
-        :'title' => :'title',
-        :'for_corporation' => :'for_corporation',
+        :'assignee_id' => :'assignee_id',
         :'availability' => :'availability',
-        :'date_issued' => :'date_issued',
-        :'date_expired' => :'date_expired',
+        :'buyout' => :'buyout',
+        :'collateral' => :'collateral',
+        :'contract_id' => :'contract_id',
         :'date_accepted' => :'date_accepted',
-        :'days_to_complete' => :'days_to_complete',
         :'date_completed' => :'date_completed',
+        :'date_expired' => :'date_expired',
+        :'date_issued' => :'date_issued',
+        :'days_to_complete' => :'days_to_complete',
+        :'end_location_id' => :'end_location_id',
+        :'for_corporation' => :'for_corporation',
+        :'issuer_corporation_id' => :'issuer_corporation_id',
+        :'issuer_id' => :'issuer_id',
         :'price' => :'price',
         :'reward' => :'reward',
-        :'collateral' => :'collateral',
-        :'buyout' => :'buyout',
+        :'start_location_id' => :'start_location_id',
+        :'status' => :'status',
+        :'title' => :'title',
+        :'type' => :'type',
         :'volume' => :'volume'
       }
     end
@@ -134,27 +134,27 @@ module ESIClient
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'contract_id' => :'Integer',
-        :'issuer_id' => :'Integer',
-        :'issuer_corporation_id' => :'Integer',
-        :'assignee_id' => :'Integer',
         :'acceptor_id' => :'Integer',
-        :'start_location_id' => :'Integer',
-        :'end_location_id' => :'Integer',
-        :'type' => :'String',
-        :'status' => :'String',
-        :'title' => :'String',
-        :'for_corporation' => :'BOOLEAN',
+        :'assignee_id' => :'Integer',
         :'availability' => :'String',
-        :'date_issued' => :'DateTime',
-        :'date_expired' => :'DateTime',
+        :'buyout' => :'Float',
+        :'collateral' => :'Float',
+        :'contract_id' => :'Integer',
         :'date_accepted' => :'DateTime',
-        :'days_to_complete' => :'Integer',
         :'date_completed' => :'DateTime',
+        :'date_expired' => :'DateTime',
+        :'date_issued' => :'DateTime',
+        :'days_to_complete' => :'Integer',
+        :'end_location_id' => :'Integer',
+        :'for_corporation' => :'BOOLEAN',
+        :'issuer_corporation_id' => :'Integer',
+        :'issuer_id' => :'Integer',
         :'price' => :'Float',
         :'reward' => :'Float',
-        :'collateral' => :'Float',
-        :'buyout' => :'Float',
+        :'start_location_id' => :'Integer',
+        :'status' => :'String',
+        :'title' => :'String',
+        :'type' => :'String',
         :'volume' => :'Float'
       }
     end
@@ -167,72 +167,64 @@ module ESIClient
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'contract_id')
-        self.contract_id = attributes[:'contract_id']
-      end
-
-      if attributes.has_key?(:'issuer_id')
-        self.issuer_id = attributes[:'issuer_id']
-      end
-
-      if attributes.has_key?(:'issuer_corporation_id')
-        self.issuer_corporation_id = attributes[:'issuer_corporation_id']
+      if attributes.has_key?(:'acceptor_id')
+        self.acceptor_id = attributes[:'acceptor_id']
       end
 
       if attributes.has_key?(:'assignee_id')
         self.assignee_id = attributes[:'assignee_id']
       end
 
-      if attributes.has_key?(:'acceptor_id')
-        self.acceptor_id = attributes[:'acceptor_id']
-      end
-
-      if attributes.has_key?(:'start_location_id')
-        self.start_location_id = attributes[:'start_location_id']
+      if attributes.has_key?(:'availability')
+        self.availability = attributes[:'availability']
       end
 
-      if attributes.has_key?(:'end_location_id')
-        self.end_location_id = attributes[:'end_location_id']
+      if attributes.has_key?(:'buyout')
+        self.buyout = attributes[:'buyout']
       end
 
-      if attributes.has_key?(:'type')
-        self.type = attributes[:'type']
+      if attributes.has_key?(:'collateral')
+        self.collateral = attributes[:'collateral']
       end
 
-      if attributes.has_key?(:'status')
-        self.status = attributes[:'status']
+      if attributes.has_key?(:'contract_id')
+        self.contract_id = attributes[:'contract_id']
       end
 
-      if attributes.has_key?(:'title')
-        self.title = attributes[:'title']
+      if attributes.has_key?(:'date_accepted')
+        self.date_accepted = attributes[:'date_accepted']
       end
 
-      if attributes.has_key?(:'for_corporation')
-        self.for_corporation = attributes[:'for_corporation']
+      if attributes.has_key?(:'date_completed')
+        self.date_completed = attributes[:'date_completed']
       end
 
-      if attributes.has_key?(:'availability')
-        self.availability = attributes[:'availability']
+      if attributes.has_key?(:'date_expired')
+        self.date_expired = attributes[:'date_expired']
       end
 
       if attributes.has_key?(:'date_issued')
         self.date_issued = attributes[:'date_issued']
       end
 
-      if attributes.has_key?(:'date_expired')
-        self.date_expired = attributes[:'date_expired']
+      if attributes.has_key?(:'days_to_complete')
+        self.days_to_complete = attributes[:'days_to_complete']
       end
 
-      if attributes.has_key?(:'date_accepted')
-        self.date_accepted = attributes[:'date_accepted']
+      if attributes.has_key?(:'end_location_id')
+        self.end_location_id = attributes[:'end_location_id']
       end
 
-      if attributes.has_key?(:'days_to_complete')
-        self.days_to_complete = attributes[:'days_to_complete']
+      if attributes.has_key?(:'for_corporation')
+        self.for_corporation = attributes[:'for_corporation']
       end
 
-      if attributes.has_key?(:'date_completed')
-        self.date_completed = attributes[:'date_completed']
+      if attributes.has_key?(:'issuer_corporation_id')
+        self.issuer_corporation_id = attributes[:'issuer_corporation_id']
+      end
+
+      if attributes.has_key?(:'issuer_id')
+        self.issuer_id = attributes[:'issuer_id']
       end
 
       if attributes.has_key?(:'price')
@@ -243,12 +235,20 @@ module ESIClient
         self.reward = attributes[:'reward']
       end
 
-      if attributes.has_key?(:'collateral')
-        self.collateral = attributes[:'collateral']
+      if attributes.has_key?(:'start_location_id')
+        self.start_location_id = attributes[:'start_location_id']
       end
 
-      if attributes.has_key?(:'buyout')
-        self.buyout = attributes[:'buyout']
+      if attributes.has_key?(:'status')
+        self.status = attributes[:'status']
+      end
+
+      if attributes.has_key?(:'title')
+        self.title = attributes[:'title']
+      end
+
+      if attributes.has_key?(:'type')
+        self.type = attributes[:'type']
       end
 
       if attributes.has_key?(:'volume')
@@ -260,48 +260,48 @@ module ESIClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @contract_id.nil?
-        invalid_properties.push('invalid value for "contract_id", contract_id cannot be nil.')
-      end
-
-      if @issuer_id.nil?
-        invalid_properties.push('invalid value for "issuer_id", issuer_id cannot be nil.')
-      end
-
-      if @issuer_corporation_id.nil?
-        invalid_properties.push('invalid value for "issuer_corporation_id", issuer_corporation_id cannot be nil.')
+      if @acceptor_id.nil?
+        invalid_properties.push('invalid value for "acceptor_id", acceptor_id cannot be nil.')
       end
 
       if @assignee_id.nil?
         invalid_properties.push('invalid value for "assignee_id", assignee_id cannot be nil.')
       end
 
-      if @acceptor_id.nil?
-        invalid_properties.push('invalid value for "acceptor_id", acceptor_id cannot be nil.')
+      if @availability.nil?
+        invalid_properties.push('invalid value for "availability", availability cannot be nil.')
       end
 
-      if @type.nil?
-        invalid_properties.push('invalid value for "type", type cannot be nil.')
+      if @contract_id.nil?
+        invalid_properties.push('invalid value for "contract_id", contract_id cannot be nil.')
       end
 
-      if @status.nil?
-        invalid_properties.push('invalid value for "status", status cannot be nil.')
+      if @date_expired.nil?
+        invalid_properties.push('invalid value for "date_expired", date_expired cannot be nil.')
+      end
+
+      if @date_issued.nil?
+        invalid_properties.push('invalid value for "date_issued", date_issued cannot be nil.')
       end
 
       if @for_corporation.nil?
         invalid_properties.push('invalid value for "for_corporation", for_corporation cannot be nil.')
       end
 
-      if @availability.nil?
-        invalid_properties.push('invalid value for "availability", availability cannot be nil.')
+      if @issuer_corporation_id.nil?
+        invalid_properties.push('invalid value for "issuer_corporation_id", issuer_corporation_id cannot be nil.')
       end
 
-      if @date_issued.nil?
-        invalid_properties.push('invalid value for "date_issued", date_issued cannot be nil.')
+      if @issuer_id.nil?
+        invalid_properties.push('invalid value for "issuer_id", issuer_id cannot be nil.')
       end
 
-      if @date_expired.nil?
-        invalid_properties.push('invalid value for "date_expired", date_expired cannot be nil.')
+      if @status.nil?
+        invalid_properties.push('invalid value for "status", status cannot be nil.')
+      end
+
+      if @type.nil?
+        invalid_properties.push('invalid value for "type", type cannot be nil.')
       end
 
       invalid_properties
@@ -310,34 +310,34 @@ module ESIClient
     # 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 @contract_id.nil?
-      return false if @issuer_id.nil?
-      return false if @issuer_corporation_id.nil?
-      return false if @assignee_id.nil?
       return false if @acceptor_id.nil?
-      return false if @type.nil?
-      type_validator = EnumAttributeValidator.new('String', ['unknown', 'item_exchange', 'auction', 'courier', 'loan'])
-      return false unless type_validator.valid?(@type)
-      return false if @status.nil?
-      status_validator = EnumAttributeValidator.new('String', ['outstanding', 'in_progress', 'finished_issuer', 'finished_contractor', 'finished', 'cancelled', 'rejected', 'failed', 'deleted', 'reversed'])
-      return false unless status_validator.valid?(@status)
-      return false if @for_corporation.nil?
+      return false if @assignee_id.nil?
       return false if @availability.nil?
       availability_validator = EnumAttributeValidator.new('String', ['public', 'personal', 'corporation', 'alliance'])
       return false unless availability_validator.valid?(@availability)
-      return false if @date_issued.nil?
+      return false if @contract_id.nil?
       return false if @date_expired.nil?
+      return false if @date_issued.nil?
+      return false if @for_corporation.nil?
+      return false if @issuer_corporation_id.nil?
+      return false if @issuer_id.nil?
+      return false if @status.nil?
+      status_validator = EnumAttributeValidator.new('String', ['outstanding', 'in_progress', 'finished_issuer', 'finished_contractor', 'finished', 'cancelled', 'rejected', 'failed', 'deleted', 'reversed'])
+      return false unless status_validator.valid?(@status)
+      return false if @type.nil?
+      type_validator = EnumAttributeValidator.new('String', ['unknown', 'item_exchange', 'auction', 'courier', 'loan'])
+      return false unless type_validator.valid?(@type)
       true
     end
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] type Object to be assigned
-    def type=(type)
-      validator = EnumAttributeValidator.new('String', ['unknown', 'item_exchange', 'auction', 'courier', 'loan'])
-      unless validator.valid?(type)
-        fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
+    # @param [Object] availability Object to be assigned
+    def availability=(availability)
+      validator = EnumAttributeValidator.new('String', ['public', 'personal', 'corporation', 'alliance'])
+      unless validator.valid?(availability)
+        fail ArgumentError, 'invalid value for "availability", must be one of #{validator.allowable_values}.'
       end
-      @type = type
+      @availability = availability
     end
 
     # Custom attribute writer method checking allowed values (enum).
@@ -351,13 +351,13 @@ module ESIClient
     end
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] availability Object to be assigned
-    def availability=(availability)
-      validator = EnumAttributeValidator.new('String', ['public', 'personal', 'corporation', 'alliance'])
-      unless validator.valid?(availability)
-        fail ArgumentError, 'invalid value for "availability", must be one of #{validator.allowable_values}.'
+    # @param [Object] type Object to be assigned
+    def type=(type)
+      validator = EnumAttributeValidator.new('String', ['unknown', 'item_exchange', 'auction', 'courier', 'loan'])
+      unless validator.valid?(type)
+        fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
       end
-      @availability = availability
+      @type = type
     end
 
     # Checks equality by comparing each attribute.
@@ -365,27 +365,27 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          contract_id == o.contract_id &&
-          issuer_id == o.issuer_id &&
-          issuer_corporation_id == o.issuer_corporation_id &&
-          assignee_id == o.assignee_id &&
           acceptor_id == o.acceptor_id &&
-          start_location_id == o.start_location_id &&
-          end_location_id == o.end_location_id &&
-          type == o.type &&
-          status == o.status &&
-          title == o.title &&
-          for_corporation == o.for_corporation &&
+          assignee_id == o.assignee_id &&
           availability == o.availability &&
-          date_issued == o.date_issued &&
-          date_expired == o.date_expired &&
+          buyout == o.buyout &&
+          collateral == o.collateral &&
+          contract_id == o.contract_id &&
           date_accepted == o.date_accepted &&
-          days_to_complete == o.days_to_complete &&
           date_completed == o.date_completed &&
+          date_expired == o.date_expired &&
+          date_issued == o.date_issued &&
+          days_to_complete == o.days_to_complete &&
+          end_location_id == o.end_location_id &&
+          for_corporation == o.for_corporation &&
+          issuer_corporation_id == o.issuer_corporation_id &&
+          issuer_id == o.issuer_id &&
           price == o.price &&
           reward == o.reward &&
-          collateral == o.collateral &&
-          buyout == o.buyout &&
+          start_location_id == o.start_location_id &&
+          status == o.status &&
+          title == o.title &&
+          type == o.type &&
           volume == o.volume
     end
 
@@ -398,7 +398,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [contract_id, issuer_id, issuer_corporation_id, assignee_id, acceptor_id, start_location_id, end_location_id, type, status, title, for_corporation, availability, date_issued, date_expired, date_accepted, days_to_complete, date_completed, price, reward, collateral, buyout, volume].hash
+      [acceptor_id, assignee_id, availability, buyout, collateral, contract_id, date_accepted, date_completed, date_expired, date_issued, days_to_complete, end_location_id, for_corporation, issuer_corporation_id, issuer_id, price, reward, start_location_id, status, title, type, volume].hash
     end
 
     # Builds the object from hash