esi_client 1.3.0 → 1.4.0

data/lib/esi_client/models/get_characters_character_id_orders_history_200_ok.rb

@@ -0,0 +1,431 @@
+=begin
+#EVE Swagger Interface
+
+#An OpenAPI for EVE Online
+
+OpenAPI spec version: 0.7.5
+
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.4.0-SNAPSHOT
+
+=end
+
+require 'date'
+
+module ESIClient
+  # 200 ok object
+  class GetCharactersCharacterIdOrdersHistory200Ok
+    # Unique order ID
+    attr_accessor :order_id
+
+    # The type ID of the item transacted in this order
+    attr_accessor :type_id
+
+    # ID of the region where order was placed
+    attr_accessor :region_id
+
+    # ID of the location where order was placed
+    attr_accessor :location_id
+
+    # Valid order range, numbers are ranges in jumps
+    attr_accessor :range
+
+    # Cost per unit for this order
+    attr_accessor :price
+
+    # Quantity of items required or offered at time order was placed
+    attr_accessor :volume_total
+
+    # Quantity of items still required or offered
+    attr_accessor :volume_remain
+
+    # Date and time when this order was issued
+    attr_accessor :issued
+
+    # True if the order is a bid (buy) order
+    attr_accessor :is_buy_order
+
+    # For buy orders, the minimum quantity that will be accepted in a matching sell order
+    attr_accessor :min_volume
+
+    # For buy orders, the amount of ISK in escrow
+    attr_accessor :escrow
+
+    # Number of days the order was valid for (starting from the issued date). An order expires at time issued + duration
+    attr_accessor :duration
+
+    # Current order state
+    attr_accessor :state
+
+    # Signifies whether the buy/sell order was placed on behalf of a corporation.
+    attr_accessor :is_corporation
+
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'order_id' => :'order_id',
+        :'type_id' => :'type_id',
+        :'region_id' => :'region_id',
+        :'location_id' => :'location_id',
+        :'range' => :'range',
+        :'price' => :'price',
+        :'volume_total' => :'volume_total',
+        :'volume_remain' => :'volume_remain',
+        :'issued' => :'issued',
+        :'is_buy_order' => :'is_buy_order',
+        :'min_volume' => :'min_volume',
+        :'escrow' => :'escrow',
+        :'duration' => :'duration',
+        :'state' => :'state',
+        :'is_corporation' => :'is_corporation'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'order_id' => :'Integer',
+        :'type_id' => :'Integer',
+        :'region_id' => :'Integer',
+        :'location_id' => :'Integer',
+        :'range' => :'String',
+        :'price' => :'Float',
+        :'volume_total' => :'Integer',
+        :'volume_remain' => :'Integer',
+        :'issued' => :'DateTime',
+        :'is_buy_order' => :'BOOLEAN',
+        :'min_volume' => :'Integer',
+        :'escrow' => :'Float',
+        :'duration' => :'Integer',
+        :'state' => :'String',
+        :'is_corporation' => :'BOOLEAN'
+      }
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+
+      if attributes.has_key?(:'order_id')
+        self.order_id = attributes[:'order_id']
+      end
+
+      if attributes.has_key?(:'type_id')
+        self.type_id = attributes[:'type_id']
+      end
+
+      if attributes.has_key?(:'region_id')
+        self.region_id = attributes[:'region_id']
+      end
+
+      if attributes.has_key?(:'location_id')
+        self.location_id = attributes[:'location_id']
+      end
+
+      if attributes.has_key?(:'range')
+        self.range = attributes[:'range']
+      end
+
+      if attributes.has_key?(:'price')
+        self.price = attributes[:'price']
+      end
+
+      if attributes.has_key?(:'volume_total')
+        self.volume_total = attributes[:'volume_total']
+      end
+
+      if attributes.has_key?(:'volume_remain')
+        self.volume_remain = attributes[:'volume_remain']
+      end
+
+      if attributes.has_key?(:'issued')
+        self.issued = attributes[:'issued']
+      end
+
+      if attributes.has_key?(:'is_buy_order')
+        self.is_buy_order = attributes[:'is_buy_order']
+      end
+
+      if attributes.has_key?(:'min_volume')
+        self.min_volume = attributes[:'min_volume']
+      end
+
+      if attributes.has_key?(:'escrow')
+        self.escrow = attributes[:'escrow']
+      end
+
+      if attributes.has_key?(:'duration')
+        self.duration = attributes[:'duration']
+      end
+
+      if attributes.has_key?(:'state')
+        self.state = attributes[:'state']
+      end
+
+      if attributes.has_key?(:'is_corporation')
+        self.is_corporation = attributes[:'is_corporation']
+      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 @order_id.nil?
+        invalid_properties.push('invalid value for "order_id", order_id cannot be nil.')
+      end
+
+      if @type_id.nil?
+        invalid_properties.push('invalid value for "type_id", type_id cannot be nil.')
+      end
+
+      if @region_id.nil?
+        invalid_properties.push('invalid value for "region_id", region_id cannot be nil.')
+      end
+
+      if @location_id.nil?
+        invalid_properties.push('invalid value for "location_id", location_id cannot be nil.')
+      end
+
+      if @range.nil?
+        invalid_properties.push('invalid value for "range", range cannot be nil.')
+      end
+
+      if @price.nil?
+        invalid_properties.push('invalid value for "price", price cannot be nil.')
+      end
+
+      if @volume_total.nil?
+        invalid_properties.push('invalid value for "volume_total", volume_total cannot be nil.')
+      end
+
+      if @volume_remain.nil?
+        invalid_properties.push('invalid value for "volume_remain", volume_remain cannot be nil.')
+      end
+
+      if @issued.nil?
+        invalid_properties.push('invalid value for "issued", issued cannot be nil.')
+      end
+
+      if @duration.nil?
+        invalid_properties.push('invalid value for "duration", duration cannot be nil.')
+      end
+
+      if @state.nil?
+        invalid_properties.push('invalid value for "state", state cannot be nil.')
+      end
+
+      if @is_corporation.nil?
+        invalid_properties.push('invalid value for "is_corporation", is_corporation 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 @order_id.nil?
+      return false if @type_id.nil?
+      return false if @region_id.nil?
+      return false if @location_id.nil?
+      return false if @range.nil?
+      range_validator = EnumAttributeValidator.new('String', ['1', '10', '2', '20', '3', '30', '4', '40', '5', 'region', 'solarsystem', 'station'])
+      return false unless range_validator.valid?(@range)
+      return false if @price.nil?
+      return false if @volume_total.nil?
+      return false if @volume_remain.nil?
+      return false if @issued.nil?
+      return false if @duration.nil?
+      return false if @state.nil?
+      state_validator = EnumAttributeValidator.new('String', ['cancelled', 'expired'])
+      return false unless state_validator.valid?(@state)
+      return false if @is_corporation.nil?
+      true
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] range Object to be assigned
+    def range=(range)
+      validator = EnumAttributeValidator.new('String', ['1', '10', '2', '20', '3', '30', '4', '40', '5', 'region', 'solarsystem', 'station'])
+      unless validator.valid?(range)
+        fail ArgumentError, 'invalid value for "range", must be one of #{validator.allowable_values}.'
+      end
+      @range = range
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] state Object to be assigned
+    def state=(state)
+      validator = EnumAttributeValidator.new('String', ['cancelled', 'expired'])
+      unless validator.valid?(state)
+        fail ArgumentError, 'invalid value for "state", must be one of #{validator.allowable_values}.'
+      end
+      @state = state
+    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 &&
+          order_id == o.order_id &&
+          type_id == o.type_id &&
+          region_id == o.region_id &&
+          location_id == o.location_id &&
+          range == o.range &&
+          price == o.price &&
+          volume_total == o.volume_total &&
+          volume_remain == o.volume_remain &&
+          issued == o.issued &&
+          is_buy_order == o.is_buy_order &&
+          min_volume == o.min_volume &&
+          escrow == o.escrow &&
+          duration == o.duration &&
+          state == o.state &&
+          is_corporation == o.is_corporation
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [order_id, type_id, region_id, location_id, range, price, volume_total, volume_remain, issued, is_buy_order, min_volume, escrow, duration, state, is_corporation].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+
+    # 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)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        temp_model = ESIClient.const_get(type).new
+        temp_model.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # 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
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end

data/lib/esi_client/models/get_characters_character_id_planets_200_ok.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.7.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -15,26 +15,26 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetCharactersCharacterIdPlanets200Ok
-    # last_update string
-    attr_accessor :last_update
+    # solar_system_id integer
+    attr_accessor :solar_system_id
 
-    # num_pins integer
-    attr_accessor :num_pins
+    # planet_id integer
+    attr_accessor :planet_id
 
     # owner_id integer
     attr_accessor :owner_id
 
-    # planet_id integer
-    attr_accessor :planet_id
+    # upgrade_level integer
+    attr_accessor :upgrade_level
 
-    # planet_type string
-    attr_accessor :planet_type
+    # num_pins integer
+    attr_accessor :num_pins
 
-    # solar_system_id integer
-    attr_accessor :solar_system_id
+    # last_update string
+    attr_accessor :last_update
 
-    # upgrade_level integer
-    attr_accessor :upgrade_level
+    # planet_type string
+    attr_accessor :planet_type
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -61,26 +61,26 @@ module ESIClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'last_update' => :'last_update',
-        :'num_pins' => :'num_pins',
-        :'owner_id' => :'owner_id',
-        :'planet_id' => :'planet_id',
-        :'planet_type' => :'planet_type',
         :'solar_system_id' => :'solar_system_id',
-        :'upgrade_level' => :'upgrade_level'
+        :'planet_id' => :'planet_id',
+        :'owner_id' => :'owner_id',
+        :'upgrade_level' => :'upgrade_level',
+        :'num_pins' => :'num_pins',
+        :'last_update' => :'last_update',
+        :'planet_type' => :'planet_type'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'last_update' => :'DateTime',
-        :'num_pins' => :'Integer',
-        :'owner_id' => :'Integer',
-        :'planet_id' => :'Integer',
-        :'planet_type' => :'String',
         :'solar_system_id' => :'Integer',
-        :'upgrade_level' => :'Integer'
+        :'planet_id' => :'Integer',
+        :'owner_id' => :'Integer',
+        :'upgrade_level' => :'Integer',
+        :'num_pins' => :'Integer',
+        :'last_update' => :'DateTime',
+        :'planet_type' => :'String'
       }
     end
 
@@ -90,112 +90,129 @@ module ESIClient
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'last_update')
-        self.last_update = attributes[:'last_update']
+      if attributes.has_key?(:'solar_system_id')
+        self.solar_system_id = attributes[:'solar_system_id']
       end
 
-      if attributes.has_key?(:'num_pins')
-        self.num_pins = attributes[:'num_pins']
+      if attributes.has_key?(:'planet_id')
+        self.planet_id = attributes[:'planet_id']
       end
 
       if attributes.has_key?(:'owner_id')
         self.owner_id = attributes[:'owner_id']
       end
 
-      if attributes.has_key?(:'planet_id')
-        self.planet_id = attributes[:'planet_id']
+      if attributes.has_key?(:'upgrade_level')
+        self.upgrade_level = attributes[:'upgrade_level']
       end
 
-      if attributes.has_key?(:'planet_type')
-        self.planet_type = attributes[:'planet_type']
+      if attributes.has_key?(:'num_pins')
+        self.num_pins = attributes[:'num_pins']
       end
 
-      if attributes.has_key?(:'solar_system_id')
-        self.solar_system_id = attributes[:'solar_system_id']
+      if attributes.has_key?(:'last_update')
+        self.last_update = attributes[:'last_update']
       end
 
-      if attributes.has_key?(:'upgrade_level')
-        self.upgrade_level = attributes[:'upgrade_level']
+      if attributes.has_key?(:'planet_type')
+        self.planet_type = attributes[:'planet_type']
       end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @last_update.nil?
-        invalid_properties.push("invalid value for 'last_update', last_update cannot be nil.")
+      if @solar_system_id.nil?
+        invalid_properties.push('invalid value for "solar_system_id", solar_system_id cannot be nil.')
       end
 
-      if @num_pins.nil?
-        invalid_properties.push("invalid value for 'num_pins', num_pins cannot be nil.")
+      if @planet_id.nil?
+        invalid_properties.push('invalid value for "planet_id", planet_id cannot be nil.')
       end
 
-      if @num_pins < 1
-        invalid_properties.push("invalid value for 'num_pins', must be greater than or equal to 1.")
+      if @owner_id.nil?
+        invalid_properties.push('invalid value for "owner_id", owner_id cannot be nil.')
       end
 
-      if @owner_id.nil?
-        invalid_properties.push("invalid value for 'owner_id', owner_id cannot be nil.")
+      if @upgrade_level.nil?
+        invalid_properties.push('invalid value for "upgrade_level", upgrade_level cannot be nil.')
       end
 
-      if @planet_id.nil?
-        invalid_properties.push("invalid value for 'planet_id', planet_id cannot be nil.")
+      if @upgrade_level > 5
+        invalid_properties.push('invalid value for "upgrade_level", must be smaller than or equal to 5.')
       end
 
-      if @planet_type.nil?
-        invalid_properties.push("invalid value for 'planet_type', planet_type cannot be nil.")
+      if @upgrade_level < 0
+        invalid_properties.push('invalid value for "upgrade_level", must be greater than or equal to 0.')
       end
 
-      if @solar_system_id.nil?
-        invalid_properties.push("invalid value for 'solar_system_id', solar_system_id cannot be nil.")
+      if @num_pins.nil?
+        invalid_properties.push('invalid value for "num_pins", num_pins cannot be nil.')
       end
 
-      if @upgrade_level.nil?
-        invalid_properties.push("invalid value for 'upgrade_level', upgrade_level cannot be nil.")
+      if @num_pins < 1
+        invalid_properties.push('invalid value for "num_pins", must be greater than or equal to 1.')
       end
 
-      if @upgrade_level > 5
-        invalid_properties.push("invalid value for 'upgrade_level', must be smaller than or equal to 5.")
+      if @last_update.nil?
+        invalid_properties.push('invalid value for "last_update", last_update cannot be nil.')
       end
 
-      if @upgrade_level < 0
-        invalid_properties.push("invalid value for 'upgrade_level', must be greater than or equal to 0.")
+      if @planet_type.nil?
+        invalid_properties.push('invalid value for "planet_type", planet_type cannot be nil.')
       end
 
-      return invalid_properties
+      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 @last_update.nil?
-      return false if @num_pins.nil?
-      return false if @num_pins < 1
-      return false if @owner_id.nil?
-      return false if @planet_id.nil?
-      return false if @planet_type.nil?
-      planet_type_validator = EnumAttributeValidator.new('String', ["temperate", "barren", "oceanic", "ice", "gas", "lava", "storm", "plasma"])
-      return false unless planet_type_validator.valid?(@planet_type)
       return false if @solar_system_id.nil?
+      return false if @planet_id.nil?
+      return false if @owner_id.nil?
       return false if @upgrade_level.nil?
       return false if @upgrade_level > 5
       return false if @upgrade_level < 0
-      return true
+      return false if @num_pins.nil?
+      return false if @num_pins < 1
+      return false if @last_update.nil?
+      return false if @planet_type.nil?
+      planet_type_validator = EnumAttributeValidator.new('String', ['temperate', 'barren', 'oceanic', 'ice', 'gas', 'lava', 'storm', 'plasma'])
+      return false unless planet_type_validator.valid?(@planet_type)
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] upgrade_level Value to be assigned
+    def upgrade_level=(upgrade_level)
+      if upgrade_level.nil?
+        fail ArgumentError, 'upgrade_level cannot be nil'
+      end
+
+      if upgrade_level > 5
+        fail ArgumentError, 'invalid value for "upgrade_level", must be smaller than or equal to 5.'
+      end
+
+      if upgrade_level < 0
+        fail ArgumentError, 'invalid value for "upgrade_level", must be greater than or equal to 0.'
+      end
+
+      @upgrade_level = upgrade_level
     end
 
     # Custom attribute writer method with validation
     # @param [Object] num_pins Value to be assigned
     def num_pins=(num_pins)
       if num_pins.nil?
-        fail ArgumentError, "num_pins cannot be nil"
+        fail ArgumentError, 'num_pins cannot be nil'
       end
 
       if num_pins < 1
-        fail ArgumentError, "invalid value for 'num_pins', must be greater than or equal to 1."
+        fail ArgumentError, 'invalid value for "num_pins", must be greater than or equal to 1.'
       end
 
       @num_pins = num_pins
@@ -204,43 +221,25 @@ module ESIClient
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] planet_type Object to be assigned
     def planet_type=(planet_type)
-      validator = EnumAttributeValidator.new('String', ["temperate", "barren", "oceanic", "ice", "gas", "lava", "storm", "plasma"])
+      validator = EnumAttributeValidator.new('String', ['temperate', 'barren', 'oceanic', 'ice', 'gas', 'lava', 'storm', 'plasma'])
       unless validator.valid?(planet_type)
-        fail ArgumentError, "invalid value for 'planet_type', must be one of #{validator.allowable_values}."
+        fail ArgumentError, 'invalid value for "planet_type", must be one of #{validator.allowable_values}.'
       end
       @planet_type = planet_type
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] upgrade_level Value to be assigned
-    def upgrade_level=(upgrade_level)
-      if upgrade_level.nil?
-        fail ArgumentError, "upgrade_level cannot be nil"
-      end
-
-      if upgrade_level > 5
-        fail ArgumentError, "invalid value for 'upgrade_level', must be smaller than or equal to 5."
-      end
-
-      if upgrade_level < 0
-        fail ArgumentError, "invalid value for 'upgrade_level', must be greater than or equal to 0."
-      end
-
-      @upgrade_level = upgrade_level
-    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 &&
-          last_update == o.last_update &&
-          num_pins == o.num_pins &&
-          owner_id == o.owner_id &&
-          planet_id == o.planet_id &&
-          planet_type == o.planet_type &&
           solar_system_id == o.solar_system_id &&
-          upgrade_level == o.upgrade_level
+          planet_id == o.planet_id &&
+          owner_id == o.owner_id &&
+          upgrade_level == o.upgrade_level &&
+          num_pins == o.num_pins &&
+          last_update == o.last_update &&
+          planet_type == o.planet_type
     end
 
     # @see the `==` method
@@ -252,7 +251,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [last_update, num_pins, owner_id, planet_id, planet_type, solar_system_id, upgrade_level].hash
+      [solar_system_id, planet_id, owner_id, upgrade_level, num_pins, last_update, planet_type].hash
     end
 
     # Builds the object from hash
@@ -265,7 +264,7 @@ module ESIClient
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
@@ -347,7 +346,7 @@ module ESIClient
     # @return [Hash] Returns the value in the form of hash
     def _to_hash(value)
       if value.is_a?(Array)
-        value.compact.map{ |v| _to_hash(v) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -358,7 +357,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end