release 202006-1 | Merge pull request #52 from gomicorp/develop

* 기능: Brand 와 OrderInfo 가 너무 멀어서 매개테이블 추가
* 기능: Brand 와 ProductOption 이 너무 멀어서 매개테이블 추가

app/models/brand.rb

@@ -10,6 +10,14 @@ class Brand < NationRecord
   has_many :items, through: :product_item_groups, class_name: :ProductItem
   has_many :managers, through: :company
 
+  # ===============================================
+  has_many :product_option_brands, class_name: 'ProductOptionBrand', dependent: :delete_all
+  has_many :product_options, through: :product_option_brands
+  # ===============================================
+  has_many :order_info_brands, class_name: 'OrderInfoBrand', dependent: :delete_all
+  has_many :order_infos, through: :order_info_brands
+  # ===============================================
+
   def official_site_url
     '#'
   end

app/models/country.rb

@@ -6,8 +6,9 @@ class Country < ApplicationRecord
   validates_presence_of :name, :name_ko, :locale, :short_name
   alias_attribute :code, :short_name
 
-  TH = find_or_create_by(name: 'thailand', name_ko: '태국', locale: 'th', short_name: :th)
-  VN = find_or_create_by(name: 'vietnam', name_ko: '베트남', locale: 'vi', short_name: :vn)
+  TH = find_or_create_by(name: 'thailand', name_ko: '태국', locale: 'th', short_name: 'th', iso_code: 'THB')
+  VN = find_or_create_by(name: 'vietnam', name_ko: '베트남', locale: 'vi', short_name: 'vn', iso_code: 'VND')
+  KO = find_or_create_by(name: 'korea', name_ko: '한국', locale: 'ko', short_name: 'ko', iso_code: 'KRW')
 
   def self.th
     TH
@@ -17,6 +18,10 @@ def self.vn
     VN
   end
 
+  def self.ko
+    KO
+  end
+
   def self.undef
     where(short_name: nil)
   end
@@ -42,7 +47,8 @@ def self.migrate_input_seed_data
   def self.seed_data
     [
       { name: 'vietnam', name_ko: '베트남', locale: 'vi', short_name: 'vn' },
-      { name: 'thailand', name_ko: '태국', locale: 'th', short_name: 'th' }
+      { name: 'thailand', name_ko: '태국', locale: 'th', short_name: 'th' },
+      { name: 'korea', name_ko: '한국', locale: 'ko', short_name: 'ko' }
     ]
   end
 end

app/models/order_info.rb

@@ -5,9 +5,15 @@ class OrderInfo < NationRecord
   has_one :ship_info, dependent: :destroy
   has_one :payment, dependent: :destroy
   has_one :user, through: :cart
-  has_many :cart_items, through: :cart
+  has_many :items, through: :cart
+  has_many :product_options, through: :items, source: :product_option
   has_many :adjustments, class_name: 'Adjustment'
 
+  # ===============================================
+  has_many :order_info_brands, class_name: 'OrderInfoBrand', dependent: :delete_all
+  has_many :brands, through: :order_info_brands
+  # ===============================================
+
   validates_presence_of :cart_id, :enc_id
   validates_uniqueness_of :cart_id, :enc_id
 

app/models/order_info_brand.rb

@@ -0,0 +1,6 @@
+class OrderInfoBrand < ApplicationRecord
+  belongs_to :order_info, class_name: 'OrderInfo'
+  belongs_to :brand, class_name: 'Brand'
+
+  validates_uniqueness_of :order_info_id, scope: :brand_id
+end

app/models/product_option.rb

@@ -22,6 +22,11 @@ class ProductOption < ApplicationRecord
   has_one :product, foreign_key: :default_option_id, dependent: :nullify
   has_one :product_page, class_name: 'Product', through: :option_group, source: :product
 
+  # ===============================================
+  has_many :product_option_brands, class_name: 'ProductOptionBrand', dependent: :delete_all
+  has_many :brands, through: :product_option_brands
+  # ===============================================
+
   enum discount_type: %i[no const ratio]
 
   scope :active, -> { where(is_active: true) }

app/models/product_option_brand.rb

@@ -0,0 +1,6 @@
+class ProductOptionBrand < ApplicationRecord
+  belongs_to :product_option, class_name: 'ProductOption'
+  belongs_to :brand, class_name: 'Brand'
+
+  validates_uniqueness_of :product_option_id, scope: :brand_id
+end

app/models/product_option_bridge.rb

@@ -51,6 +51,14 @@ def items
     end
   end
 
+  def brands
+    case connectable_type
+    when 'ProductItem'
+      [] << connectable.brand
+    when 'ProductCollection'
+      connectable.brands.uniq
+    end
+  end
 
   ## ===== before calculator =====
 

db/data/20200519052212_set_countries_data_to_cart.rb

@@ -2,14 +2,11 @@ class SetCountriesDataToCart < ActiveRecord::Migration[6.0]
   def up
     ApplicationRecord.country_context_with 'global' do
       default_country = Country.th
-
       Cart.unscoped.all.each do |cart|
         country_source = cart.order_info
         cart_item = cart.items.first
-
         country_source ||= cart_item&.product_option&.channel
         country_source ||= cart_item&.product_item_barcodes&.first&.product_item
-
         if country_source
           cart.update!(country: country_source.country)
         else

db/data/20200604021223_set_product_option_brands.rb

@@ -0,0 +1,17 @@
+class SetProductOptionBrands < ActiveRecord::Migration[6.0]
+  def up
+    ApplicationRecord.country_context_with 'global' do
+      ProductOption.all.each do |option|
+        option.bridges.each do |bridge|
+          bridge.brands.each do |brand|
+            ProductOptionBrand.create(product_option: option, brand: brand)
+          end
+        end
+      end
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration if Rails.production?
+  end
+end

db/data/20200605013634_set_order_info_brands.rb

@@ -0,0 +1,26 @@
+class SetOrderInfoBrands < ActiveRecord::Migration[6.0]
+  def up
+    ApplicationRecord.country_context_with 'global' do
+      OrderInfo.all.each do |order_info|
+        order_info.product_options.each do |option|
+          option.bridges.each do |bridge|
+            bridge.brands.each do |brand|
+              OrderInfoBrand.create(order_info: order_info, brand: brand)
+            end
+          end
+        end
+
+        # 정상적인 로직으로 데이터를 채워줄 수 없는 레거시 데이터에 대한 대응
+        order_info.items.each do |item|
+          item.barcodes.each do |barcode|
+            OrderInfoBrand.create(order_info: order_info, brand: barcode.product.brand)
+          end
+        end
+      end
+    end
+  end
+
+  def down
+    # raise ActiveRecord::IrreversibleMigration if Rails.production?
+  end
+end

db/migrate/order_info/20200610022109_add_unique_to_cart_id_for_order_info.rb

@@ -0,0 +1,5 @@
+class AddUniqueToCartIdForOrderInfo < ActiveRecord::Migration[6.0]
+  def change
+    add_index :order_infos, :cart_id, unique: true
+  end
+end

db/migrate/order_info_brand/20200604095218_create_order_info_brands.rb

@@ -0,0 +1,10 @@
+class CreateOrderInfoBrands < ActiveRecord::Migration[6.0]
+  def change
+    create_table :order_info_brands do |t|
+      t.references :order_info, null: false, foreign_key: true
+      t.references :brand, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end

db/migrate/product_option_brand/20200603031809_create_product_option_brands.rb

@@ -0,0 +1,10 @@
+class CreateProductOptionBrands < ActiveRecord::Migration[6.0]
+  def change
+    create_table :product_option_brands do |t|
+      t.references :product_option, null: false, foreign_key: true
+      t.references :brand, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end

test/fixtures/order_info_brands.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value

test/fixtures/product_option_brands.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value

test/models/order_info_brand_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class OrderInfoBrandTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/models/product_option_brand_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ProductOptionBrandTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end