eve_app 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d05354a6b51bf892ac1f934455446366b5c7083
-  data.tar.gz: 1f472b9deedc54d2f84fc30c069f59d64e2415c5
+  metadata.gz: bb760ef4fecf0ffb483d49c1615320b78dce3cb0
+  data.tar.gz: 72a2ab7abd782b83878bdf929fd2d1e52601db0d
 SHA512:
-  metadata.gz: 33448204b634a96ae2c566e07b38e03b2c14113d85b315953f8ca6d45c5cc59c4bd3a098162760290d58b23ce33a80a30c9bc573a527e0faa6550f41933777c6
-  data.tar.gz: 54eeaf33cc346fde27b376aa4f3e5d4bbad1a59bc249b0a5f18711104885695241d58238f22e7b40cc7303ccb41422bf15a292afa0d6fb563b7b4fec77e581e6
+  metadata.gz: 1ed8aef9695d7a58e8a2738dc842b0be74249d7250f2a71b93749cce2ee98ca355de54d79971dc5809e7cc3713d83675f5e579489e233cbb203b90294d46b739
+  data.tar.gz: a4e3bdb9756829f3e80772e277c7a41f5947863d38a7944a537994916eebf77f893cebc9fc981a3a79f2fa7ad916baa1ae23cf18738d7e10eca1e7222fcebd8a

data/app/models/concerns/eve_app/activity_relation.rb

@@ -5,22 +5,24 @@ module EveApp::ActivityRelation
     belongs_to :type
     belongs_to :activity
 
-    # scope :invention, -> { where(activity_id: EveApp::Activity::INVENTION) }
-    scope :for, -> (tid, aid) { where(type_id: tid, activity_id: aid) }
-    scope :order_by_name, -> {
-      includes(type_name).order('types.name')
-    }
+    EveApp::Activity::TYPE_MAP.each do |id, type|
+      scope type, -> { where(activity_id: id) }
+    end
+  end
 
+  # included do
+    # scope :invention, -> { where(activity_id: EveApp::Activity::INVENTION) }
+    # scope :for, -> (tid, aid) { where(type_id: tid, activity_id: aid) }
     # ????
     # def activity_activity
     #   EveApp::Activity.where(type_id: type_id, activity_id: activity_id)
     # end
-  end
+  # end
 
-  class_methods do
-    def type_name
-      reflections = self.reflect_on_all_associations(:belongs_to)
-      reflections.select { |r| r.options[:class_name] == 'Type' && r.name != :type }.first.name
-    end
-  end
+  # class_methods do
+  #   def type_name
+  #     reflections = self.reflect_on_all_associations(:belongs_to)
+  #     reflections.select { |r| r.options[:class_name] == 'Type' && r.name != :type }.first.name
+  #   end
+  # end
 end

data/app/models/eve_app/activity_material.rb

@@ -1,7 +1,7 @@
 class EveApp::ActivityMaterial < EveApp::ApplicationRecord
   include EveApp::ActivityRelation
 
-  belongs_to :material, class_name: 'EveApp::Type', foreign_key: :material_type_id
+  belongs_to :material_type, class_name: 'EveApp::Type', foreign_key: :material_type_id
 
   scope :order_by_quantity, -> { order(quantity: :desc) }
 

data/app/models/eve_app/activity_product.rb

@@ -1,8 +1,8 @@
 class EveApp::ActivityProduct < EveApp::ApplicationRecord
-  include EveApp::ActivityRelation
+  belongs_to :type
+  belongs_to :product_type, class_name: 'EveApp::Type', foreign_key: :product_type_id
 
-  belongs_to :activity_product, class_name: 'EveApp::Type', foreign_key: :product_type_id
-
-  scope :invention, -> { where(activity_id: EveApp::Activity::INVENTION) }
-  scope :manufacture, -> { where(activity_id: EveApp::Activity::MANUFACTURE) }
+  EveApp::Activity::TYPE_MAP.each do |id, type|
+    scope type, -> { where(activity_id: id) }
+  end
 end

data/app/models/eve_app/type.rb

@@ -3,8 +3,12 @@ class EveApp::Type < EveApp::ApplicationRecord
   belongs_to :group
   belongs_to :market_group
   belongs_to :market_group_root, class_name: 'EveApp::MarketGroup'
+  belongs_to :blueprint_type, class_name: 'EveApp::Type', optional: true
 
-  has_many :activity_products
+  has_one :manufacture_product, -> { manufacture }, class_name: 'EveApp::ActivityProduct'
+  has_one :manufacture_product_type, through: :manufacture_product, source: :product_type
+
+  has_many :activity_materials
 
   scope :published, -> { where(published: true) }
 

data/lib/eve_app/sde/normalizer.rb

@@ -52,10 +52,12 @@ module EveApp
         sql %Q(ALTER TABLE #{table_list['invTypes']} ADD IF NOT EXISTS market_group_name character varying)
         sql %Q(ALTER TABLE #{table_list['invMarketGroups']} ADD root_group_id INTEGER DEFAULT NULL)
         sql %Q(ALTER TABLE #{table_list['invTypes']} ADD market_group_root_id integer)
+        sql %Q(ALTER TABLE #{table_list['invTypes']} ADD blueprint_type_id integer)
         sql %Q(UPDATE #{table_list['invTypes']} SET group_name = (SELECT name FROM #{table_list['invGroups']} WHERE id = #{table_list['invTypes']}.group_id))
         sql %Q(UPDATE #{table_list['invTypes']} SET category_id = (SELECT category_id FROM #{table_list['invGroups']} WHERE id = #{table_list['invTypes']}.group_id))
         sql %Q(UPDATE #{table_list['invTypes']} SET category_name = (SELECT name FROM #{table_list['invCategories']} WHERE id = #{table_list['invTypes']}.category_id))
         sql %Q(UPDATE #{table_list['invTypes']} SET market_group_name = (SELECT name FROM #{table_list['invMarketGroups']} WHERE id = #{table_list['invTypes']}.market_group_id))
+        sql %Q(UPDATE #{table_list['invTypes']} SET blueprint_type_id = (SELECT type_id FROM #{table_list['industryActivityProducts']} WHERE activity_id = 1 AND product_type_id = #{table_list['invTypes']}.id LIMIT 1))
 
         sql %Q(
           WITH RECURSIVE mg_roots(id, root_id) AS (

data/lib/eve_app/version.rb

@@ -1,3 +1,3 @@
 module EveApp
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eve_app
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Danny Hiemstra