esi_client 1.3.0 → 1.4.0

data/lib/esi_client/models/get_corporations_corporation_id_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,92 +15,80 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetCorporationsCorporationIdOk
-    # id of alliance that corporation is a member of, if any
-    attr_accessor :alliance_id
-
-    # ceo_id integer
-    attr_accessor :ceo_id
-
-    # corporation_description string
-    attr_accessor :corporation_description
-
     # the full name of the corporation
-    attr_accessor :corporation_name
-
-    # creation_date string
-    attr_accessor :creation_date
+    attr_accessor :name
 
-    # creator_id integer
-    attr_accessor :creator_id
-
-    # faction string
-    attr_accessor :faction
+    # the short name of the corporation
+    attr_accessor :ticker
 
     # member_count integer
     attr_accessor :member_count
 
+    # ceo_id integer
+    attr_accessor :ceo_id
+
+    # ID of the alliance that corporation is a member of, if any
+    attr_accessor :alliance_id
+
+    # description string
+    attr_accessor :description
+
     # tax_rate number
     attr_accessor :tax_rate
 
-    # the short name of the corporation
-    attr_accessor :ticker
+    # date_founded string
+    attr_accessor :date_founded
+
+    # creator_id integer
+    attr_accessor :creator_id
 
     # url string
     attr_accessor :url
 
-    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
+    # faction_id integer
+    attr_accessor :faction_id
 
-      def valid?(value)
-        !value || allowable_values.include?(value)
-      end
-    end
+    # home_station_id integer
+    attr_accessor :home_station_id
+
+    # shares integer
+    attr_accessor :shares
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'alliance_id' => :'alliance_id',
-        :'ceo_id' => :'ceo_id',
-        :'corporation_description' => :'corporation_description',
-        :'corporation_name' => :'corporation_name',
-        :'creation_date' => :'creation_date',
-        :'creator_id' => :'creator_id',
-        :'faction' => :'faction',
+        :'name' => :'name',
+        :'ticker' => :'ticker',
         :'member_count' => :'member_count',
+        :'ceo_id' => :'ceo_id',
+        :'alliance_id' => :'alliance_id',
+        :'description' => :'description',
         :'tax_rate' => :'tax_rate',
-        :'ticker' => :'ticker',
-        :'url' => :'url'
+        :'date_founded' => :'date_founded',
+        :'creator_id' => :'creator_id',
+        :'url' => :'url',
+        :'faction_id' => :'faction_id',
+        :'home_station_id' => :'home_station_id',
+        :'shares' => :'shares'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'alliance_id' => :'Integer',
-        :'ceo_id' => :'Integer',
-        :'corporation_description' => :'String',
-        :'corporation_name' => :'String',
-        :'creation_date' => :'DateTime',
-        :'creator_id' => :'Integer',
-        :'faction' => :'String',
+        :'name' => :'String',
+        :'ticker' => :'String',
         :'member_count' => :'Integer',
+        :'ceo_id' => :'Integer',
+        :'alliance_id' => :'Integer',
+        :'description' => :'String',
         :'tax_rate' => :'Float',
-        :'ticker' => :'String',
-        :'url' => :'String'
+        :'date_founded' => :'DateTime',
+        :'creator_id' => :'Integer',
+        :'url' => :'String',
+        :'faction_id' => :'Integer',
+        :'home_station_id' => :'Integer',
+        :'shares' => :'Integer'
       }
     end
 
@@ -110,142 +98,127 @@ 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?(:'alliance_id')
-        self.alliance_id = attributes[:'alliance_id']
+      if attributes.has_key?(:'name')
+        self.name = attributes[:'name']
+      end
+
+      if attributes.has_key?(:'ticker')
+        self.ticker = attributes[:'ticker']
+      end
+
+      if attributes.has_key?(:'member_count')
+        self.member_count = attributes[:'member_count']
       end
 
       if attributes.has_key?(:'ceo_id')
         self.ceo_id = attributes[:'ceo_id']
       end
 
-      if attributes.has_key?(:'corporation_description')
-        self.corporation_description = attributes[:'corporation_description']
+      if attributes.has_key?(:'alliance_id')
+        self.alliance_id = attributes[:'alliance_id']
       end
 
-      if attributes.has_key?(:'corporation_name')
-        self.corporation_name = attributes[:'corporation_name']
+      if attributes.has_key?(:'description')
+        self.description = attributes[:'description']
       end
 
-      if attributes.has_key?(:'creation_date')
-        self.creation_date = attributes[:'creation_date']
+      if attributes.has_key?(:'tax_rate')
+        self.tax_rate = attributes[:'tax_rate']
       end
 
-      if attributes.has_key?(:'creator_id')
-        self.creator_id = attributes[:'creator_id']
+      if attributes.has_key?(:'date_founded')
+        self.date_founded = attributes[:'date_founded']
       end
 
-      if attributes.has_key?(:'faction')
-        self.faction = attributes[:'faction']
+      if attributes.has_key?(:'creator_id')
+        self.creator_id = attributes[:'creator_id']
       end
 
-      if attributes.has_key?(:'member_count')
-        self.member_count = attributes[:'member_count']
+      if attributes.has_key?(:'url')
+        self.url = attributes[:'url']
       end
 
-      if attributes.has_key?(:'tax_rate')
-        self.tax_rate = attributes[:'tax_rate']
+      if attributes.has_key?(:'faction_id')
+        self.faction_id = attributes[:'faction_id']
       end
 
-      if attributes.has_key?(:'ticker')
-        self.ticker = attributes[:'ticker']
+      if attributes.has_key?(:'home_station_id')
+        self.home_station_id = attributes[:'home_station_id']
       end
 
-      if attributes.has_key?(:'url')
-        self.url = attributes[:'url']
+      if attributes.has_key?(:'shares')
+        self.shares = attributes[:'shares']
       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 @ceo_id.nil?
-        invalid_properties.push("invalid value for 'ceo_id', ceo_id cannot be nil.")
-      end
-
-      if @corporation_description.nil?
-        invalid_properties.push("invalid value for 'corporation_description', corporation_description cannot be nil.")
+      if @name.nil?
+        invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
 
-      if @corporation_name.nil?
-        invalid_properties.push("invalid value for 'corporation_name', corporation_name cannot be nil.")
+      if @ticker.nil?
+        invalid_properties.push('invalid value for "ticker", ticker cannot be nil.')
       end
 
-      if @creator_id.nil?
-        invalid_properties.push("invalid value for 'creator_id', creator_id cannot be nil.")
+      if @member_count.nil?
+        invalid_properties.push('invalid value for "member_count", member_count cannot be nil.')
       end
 
-      if @member_count.nil?
-        invalid_properties.push("invalid value for 'member_count', member_count cannot be nil.")
+      if @ceo_id.nil?
+        invalid_properties.push('invalid value for "ceo_id", ceo_id cannot be nil.')
       end
 
       if @tax_rate.nil?
-        invalid_properties.push("invalid value for 'tax_rate', tax_rate cannot be nil.")
+        invalid_properties.push('invalid value for "tax_rate", tax_rate cannot be nil.')
       end
 
       if @tax_rate > 1
-        invalid_properties.push("invalid value for 'tax_rate', must be smaller than or equal to 1.")
+        invalid_properties.push('invalid value for "tax_rate", must be smaller than or equal to 1.')
       end
 
       if @tax_rate < 0
-        invalid_properties.push("invalid value for 'tax_rate', must be greater than or equal to 0.")
+        invalid_properties.push('invalid value for "tax_rate", must be greater than or equal to 0.')
       end
 
-      if @ticker.nil?
-        invalid_properties.push("invalid value for 'ticker', ticker cannot be nil.")
-      end
-
-      if @url.nil?
-        invalid_properties.push("invalid value for 'url', url cannot be nil.")
+      if @creator_id.nil?
+        invalid_properties.push('invalid value for "creator_id", creator_id 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 @ceo_id.nil?
-      return false if @corporation_description.nil?
-      return false if @corporation_name.nil?
-      return false if @creator_id.nil?
-      faction_validator = EnumAttributeValidator.new('String', ["Minmatar", "Gallente", "Caldari", "Amarr"])
-      return false unless faction_validator.valid?(@faction)
+      return false if @name.nil?
+      return false if @ticker.nil?
       return false if @member_count.nil?
+      return false if @ceo_id.nil?
       return false if @tax_rate.nil?
       return false if @tax_rate > 1
       return false if @tax_rate < 0
-      return false if @ticker.nil?
-      return false if @url.nil?
-      return true
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] faction Object to be assigned
-    def faction=(faction)
-      validator = EnumAttributeValidator.new('String', ["Minmatar", "Gallente", "Caldari", "Amarr"])
-      unless validator.valid?(faction)
-        fail ArgumentError, "invalid value for 'faction', must be one of #{validator.allowable_values}."
-      end
-      @faction = faction
+      return false if @creator_id.nil?
+      true
     end
 
     # Custom attribute writer method with validation
     # @param [Object] tax_rate Value to be assigned
     def tax_rate=(tax_rate)
       if tax_rate.nil?
-        fail ArgumentError, "tax_rate cannot be nil"
+        fail ArgumentError, 'tax_rate cannot be nil'
       end
 
       if tax_rate > 1
-        fail ArgumentError, "invalid value for 'tax_rate', must be smaller than or equal to 1."
+        fail ArgumentError, 'invalid value for "tax_rate", must be smaller than or equal to 1.'
       end
 
       if tax_rate < 0
-        fail ArgumentError, "invalid value for 'tax_rate', must be greater than or equal to 0."
+        fail ArgumentError, 'invalid value for "tax_rate", must be greater than or equal to 0.'
       end
 
       @tax_rate = tax_rate
@@ -256,17 +229,19 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          alliance_id == o.alliance_id &&
-          ceo_id == o.ceo_id &&
-          corporation_description == o.corporation_description &&
-          corporation_name == o.corporation_name &&
-          creation_date == o.creation_date &&
-          creator_id == o.creator_id &&
-          faction == o.faction &&
+          name == o.name &&
+          ticker == o.ticker &&
           member_count == o.member_count &&
+          ceo_id == o.ceo_id &&
+          alliance_id == o.alliance_id &&
+          description == o.description &&
           tax_rate == o.tax_rate &&
-          ticker == o.ticker &&
-          url == o.url
+          date_founded == o.date_founded &&
+          creator_id == o.creator_id &&
+          url == o.url &&
+          faction_id == o.faction_id &&
+          home_station_id == o.home_station_id &&
+          shares == o.shares
     end
 
     # @see the `==` method
@@ -278,7 +253,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [alliance_id, ceo_id, corporation_description, corporation_name, creation_date, creator_id, faction, member_count, tax_rate, ticker, url].hash
+      [name, ticker, member_count, ceo_id, alliance_id, description, tax_rate, date_founded, creator_id, url, faction_id, home_station_id, shares].hash
     end
 
     # Builds the object from hash
@@ -291,7 +266,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]]))
@@ -373,7 +348,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) }
@@ -384,7 +359,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_corporations_corporation_id_orders_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,50 +15,50 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetCorporationsCorporationIdOrders200Ok
-    # Numer of days for which order is valid (starting from the issued date). An order expires at time issued + duration
-    attr_accessor :duration
-
-    # For buy orders, the amount of ISK in escrow
-    attr_accessor :escrow
+    # Unique order ID
+    attr_accessor :order_id
 
-    # True for a bid (buy) order. False for an offer (sell) order
-    attr_accessor :is_buy_order
+    # The type ID of the item transacted in this order
+    attr_accessor :type_id
 
-    # Date and time when this order was issued
-    attr_accessor :issued
+    # ID of the region where order was placed
+    attr_accessor :region_id
 
     # ID of the location where order was placed
     attr_accessor :location_id
 
-    # For bids (buy orders), the minimum quantity that will be accepted in a matching offer (sell order)
-    attr_accessor :min_volume
+    # Valid order range, numbers are ranges in jumps
+    attr_accessor :range
 
-    # Unique order ID
-    attr_accessor :order_id
+    # True for a bid (buy) order. False for an offer (sell) order
+    attr_accessor :is_buy_order
 
     # Cost per unit for this order
     attr_accessor :price
 
-    # Valid order range, numbers are ranges in jumps
-    attr_accessor :range
+    # Quantity of items required or offered at time order was placed
+    attr_accessor :volume_total
 
-    # ID of the region where order was placed
-    attr_accessor :region_id
+    # Quantity of items still required or offered
+    attr_accessor :volume_remain
+
+    # Date and time when this order was issued
+    attr_accessor :issued
 
     # Current order state
     attr_accessor :state
 
-    # The type ID of the item transacted in this order
-    attr_accessor :type_id
+    # For bids (buy orders), the minimum quantity that will be accepted in a matching offer (sell order)
+    attr_accessor :min_volume
 
-    # Quantity of items still required or offered
-    attr_accessor :volume_remain
+    # The corporation wallet division used for this order.
+    attr_accessor :wallet_division
 
-    # Quantity of items required or offered at time order was placed
-    attr_accessor :volume_total
+    # Number of days the order is valid for (starting from the issued date). An order expires at time issued + duration
+    attr_accessor :duration
 
-    # Wallet division of which this order used
-    attr_accessor :wallet_division
+    # For buy orders, the amount of ISK in escrow
+    attr_accessor :escrow
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -85,42 +85,42 @@ module ESIClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'duration' => :'duration',
-        :'escrow' => :'escrow',
-        :'is_buy_order' => :'is_buy_order',
-        :'issued' => :'issued',
-        :'location_id' => :'location_id',
-        :'min_volume' => :'min_volume',
         :'order_id' => :'order_id',
-        :'price' => :'price',
-        :'range' => :'range',
-        :'region_id' => :'region_id',
-        :'state' => :'state',
         :'type_id' => :'type_id',
-        :'volume_remain' => :'volume_remain',
+        :'region_id' => :'region_id',
+        :'location_id' => :'location_id',
+        :'range' => :'range',
+        :'is_buy_order' => :'is_buy_order',
+        :'price' => :'price',
         :'volume_total' => :'volume_total',
-        :'wallet_division' => :'wallet_division'
+        :'volume_remain' => :'volume_remain',
+        :'issued' => :'issued',
+        :'state' => :'state',
+        :'min_volume' => :'min_volume',
+        :'wallet_division' => :'wallet_division',
+        :'duration' => :'duration',
+        :'escrow' => :'escrow'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'duration' => :'Integer',
-        :'escrow' => :'Float',
-        :'is_buy_order' => :'BOOLEAN',
-        :'issued' => :'DateTime',
-        :'location_id' => :'Integer',
-        :'min_volume' => :'Integer',
         :'order_id' => :'Integer',
-        :'price' => :'Float',
-        :'range' => :'String',
-        :'region_id' => :'Integer',
-        :'state' => :'String',
         :'type_id' => :'Integer',
-        :'volume_remain' => :'Integer',
+        :'region_id' => :'Integer',
+        :'location_id' => :'Integer',
+        :'range' => :'String',
+        :'is_buy_order' => :'BOOLEAN',
+        :'price' => :'Float',
         :'volume_total' => :'Integer',
-        :'wallet_division' => :'Integer'
+        :'volume_remain' => :'Integer',
+        :'issued' => :'DateTime',
+        :'state' => :'String',
+        :'min_volume' => :'Integer',
+        :'wallet_division' => :'Integer',
+        :'duration' => :'Integer',
+        :'escrow' => :'Float'
       }
     end
 
@@ -130,178 +130,177 @@ 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}
-
-      if attributes.has_key?(:'duration')
-        self.duration = attributes[:'duration']
-      end
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'escrow')
-        self.escrow = attributes[:'escrow']
+      if attributes.has_key?(:'order_id')
+        self.order_id = attributes[:'order_id']
       end
 
-      if attributes.has_key?(:'is_buy_order')
-        self.is_buy_order = attributes[:'is_buy_order']
+      if attributes.has_key?(:'type_id')
+        self.type_id = attributes[:'type_id']
       end
 
-      if attributes.has_key?(:'issued')
-        self.issued = attributes[:'issued']
+      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?(:'min_volume')
-        self.min_volume = attributes[:'min_volume']
+      if attributes.has_key?(:'range')
+        self.range = attributes[:'range']
       end
 
-      if attributes.has_key?(:'order_id')
-        self.order_id = attributes[:'order_id']
+      if attributes.has_key?(:'is_buy_order')
+        self.is_buy_order = attributes[:'is_buy_order']
       end
 
       if attributes.has_key?(:'price')
         self.price = attributes[:'price']
       end
 
-      if attributes.has_key?(:'range')
-        self.range = attributes[:'range']
+      if attributes.has_key?(:'volume_total')
+        self.volume_total = attributes[:'volume_total']
       end
 
-      if attributes.has_key?(:'region_id')
-        self.region_id = attributes[:'region_id']
+      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?(:'state')
         self.state = attributes[:'state']
       end
 
-      if attributes.has_key?(:'type_id')
-        self.type_id = attributes[:'type_id']
+      if attributes.has_key?(:'min_volume')
+        self.min_volume = attributes[:'min_volume']
       end
 
-      if attributes.has_key?(:'volume_remain')
-        self.volume_remain = attributes[:'volume_remain']
+      if attributes.has_key?(:'wallet_division')
+        self.wallet_division = attributes[:'wallet_division']
       end
 
-      if attributes.has_key?(:'volume_total')
-        self.volume_total = attributes[:'volume_total']
+      if attributes.has_key?(:'duration')
+        self.duration = attributes[:'duration']
       end
 
-      if attributes.has_key?(:'wallet_division')
-        self.wallet_division = attributes[:'wallet_division']
+      if attributes.has_key?(:'escrow')
+        self.escrow = attributes[:'escrow']
       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 @duration.nil?
-        invalid_properties.push("invalid value for 'duration', duration cannot be nil.")
-      end
-
-      if @escrow.nil?
-        invalid_properties.push("invalid value for 'escrow', escrow cannot be nil.")
+      if @order_id.nil?
+        invalid_properties.push('invalid value for "order_id", order_id cannot be nil.')
       end
 
-      if @is_buy_order.nil?
-        invalid_properties.push("invalid value for 'is_buy_order', is_buy_order cannot be nil.")
+      if @type_id.nil?
+        invalid_properties.push('invalid value for "type_id", type_id cannot be nil.')
       end
 
-      if @issued.nil?
-        invalid_properties.push("invalid value for 'issued', issued cannot be nil.")
+      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.")
+        invalid_properties.push('invalid value for "location_id", location_id cannot be nil.')
       end
 
-      if @min_volume.nil?
-        invalid_properties.push("invalid value for 'min_volume', min_volume cannot be nil.")
+      if @range.nil?
+        invalid_properties.push('invalid value for "range", range cannot be nil.')
       end
 
-      if @order_id.nil?
-        invalid_properties.push("invalid value for 'order_id', order_id cannot be nil.")
+      if @is_buy_order.nil?
+        invalid_properties.push('invalid value for "is_buy_order", is_buy_order cannot be nil.')
       end
 
       if @price.nil?
-        invalid_properties.push("invalid value for 'price', price cannot be nil.")
+        invalid_properties.push('invalid value for "price", price cannot be nil.')
       end
 
-      if @range.nil?
-        invalid_properties.push("invalid value for 'range', range cannot be nil.")
-      end
-
-      if @region_id.nil?
-        invalid_properties.push("invalid value for 'region_id', region_id cannot be nil.")
+      if @volume_total.nil?
+        invalid_properties.push('invalid value for "volume_total", volume_total cannot be nil.')
       end
 
-      if @state.nil?
-        invalid_properties.push("invalid value for 'state', state cannot be nil.")
+      if @volume_remain.nil?
+        invalid_properties.push('invalid value for "volume_remain", volume_remain cannot be nil.')
       end
 
-      if @type_id.nil?
-        invalid_properties.push("invalid value for 'type_id', type_id cannot be nil.")
+      if @issued.nil?
+        invalid_properties.push('invalid value for "issued", issued cannot be nil.')
       end
 
-      if @volume_remain.nil?
-        invalid_properties.push("invalid value for 'volume_remain', volume_remain cannot be nil.")
+      if @state.nil?
+        invalid_properties.push('invalid value for "state", state cannot be nil.')
       end
 
-      if @volume_total.nil?
-        invalid_properties.push("invalid value for 'volume_total', volume_total cannot be nil.")
+      if @min_volume.nil?
+        invalid_properties.push('invalid value for "min_volume", min_volume cannot be nil.')
       end
 
       if @wallet_division.nil?
-        invalid_properties.push("invalid value for 'wallet_division', wallet_division cannot be nil.")
+        invalid_properties.push('invalid value for "wallet_division", wallet_division cannot be nil.')
       end
 
       if @wallet_division > 7
-        invalid_properties.push("invalid value for 'wallet_division', must be smaller than or equal to 7.")
+        invalid_properties.push('invalid value for "wallet_division", must be smaller than or equal to 7.')
       end
 
       if @wallet_division < 1
-        invalid_properties.push("invalid value for 'wallet_division', must be greater than or equal to 1.")
+        invalid_properties.push('invalid value for "wallet_division", must be greater than or equal to 1.')
+      end
+
+      if @duration.nil?
+        invalid_properties.push('invalid value for "duration", duration cannot be nil.')
+      end
+
+      if @escrow.nil?
+        invalid_properties.push('invalid value for "escrow", escrow 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 @duration.nil?
-      return false if @escrow.nil?
-      return false if @is_buy_order.nil?
-      return false if @issued.nil?
-      return false if @location_id.nil?
-      return false if @min_volume.nil?
       return false if @order_id.nil?
-      return false if @price.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"])
+      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 @region_id.nil?
+      return false if @is_buy_order.nil?
+      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 @state.nil?
-      state_validator = EnumAttributeValidator.new('String', ["cancelled", "character_deleted", "closed", "expired", "open", "pending"])
+      state_validator = EnumAttributeValidator.new('String', ['cancelled', 'character_deleted', 'closed', 'expired', 'open', 'pending'])
       return false unless state_validator.valid?(@state)
-      return false if @type_id.nil?
-      return false if @volume_remain.nil?
-      return false if @volume_total.nil?
+      return false if @min_volume.nil?
       return false if @wallet_division.nil?
       return false if @wallet_division > 7
       return false if @wallet_division < 1
-      return true
+      return false if @duration.nil?
+      return false if @escrow.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"])
+      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}."
+        fail ArgumentError, 'invalid value for "range", must be one of #{validator.allowable_values}.'
       end
       @range = range
     end
@@ -309,9 +308,9 @@ module ESIClient
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] state Object to be assigned
     def state=(state)
-      validator = EnumAttributeValidator.new('String', ["cancelled", "character_deleted", "closed", "expired", "open", "pending"])
+      validator = EnumAttributeValidator.new('String', ['cancelled', 'character_deleted', 'closed', 'expired', 'open', 'pending'])
       unless validator.valid?(state)
-        fail ArgumentError, "invalid value for 'state', must be one of #{validator.allowable_values}."
+        fail ArgumentError, 'invalid value for "state", must be one of #{validator.allowable_values}.'
       end
       @state = state
     end
@@ -320,15 +319,15 @@ module ESIClient
     # @param [Object] wallet_division Value to be assigned
     def wallet_division=(wallet_division)
       if wallet_division.nil?
-        fail ArgumentError, "wallet_division cannot be nil"
+        fail ArgumentError, 'wallet_division cannot be nil'
       end
 
       if wallet_division > 7
-        fail ArgumentError, "invalid value for 'wallet_division', must be smaller than or equal to 7."
+        fail ArgumentError, 'invalid value for "wallet_division", must be smaller than or equal to 7.'
       end
 
       if wallet_division < 1
-        fail ArgumentError, "invalid value for 'wallet_division', must be greater than or equal to 1."
+        fail ArgumentError, 'invalid value for "wallet_division", must be greater than or equal to 1.'
       end
 
       @wallet_division = wallet_division
@@ -339,21 +338,21 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          duration == o.duration &&
-          escrow == o.escrow &&
-          is_buy_order == o.is_buy_order &&
-          issued == o.issued &&
-          location_id == o.location_id &&
-          min_volume == o.min_volume &&
           order_id == o.order_id &&
-          price == o.price &&
-          range == o.range &&
-          region_id == o.region_id &&
-          state == o.state &&
           type_id == o.type_id &&
-          volume_remain == o.volume_remain &&
+          region_id == o.region_id &&
+          location_id == o.location_id &&
+          range == o.range &&
+          is_buy_order == o.is_buy_order &&
+          price == o.price &&
           volume_total == o.volume_total &&
-          wallet_division == o.wallet_division
+          volume_remain == o.volume_remain &&
+          issued == o.issued &&
+          state == o.state &&
+          min_volume == o.min_volume &&
+          wallet_division == o.wallet_division &&
+          duration == o.duration &&
+          escrow == o.escrow
     end
 
     # @see the `==` method
@@ -365,7 +364,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [duration, escrow, is_buy_order, issued, location_id, min_volume, order_id, price, range, region_id, state, type_id, volume_remain, volume_total, wallet_division].hash
+      [order_id, type_id, region_id, location_id, range, is_buy_order, price, volume_total, volume_remain, issued, state, min_volume, wallet_division, duration, escrow].hash
     end
 
     # Builds the object from hash
@@ -378,7 +377,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]]))
@@ -460,7 +459,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) }
@@ -471,7 +470,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end