Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Added additional associations to the Store model

Damian Legawiec6cec09b1aa67
diff --git a/api/spec/requests/spree/api/v2/platform/menu_item_spec.rb b/api/spec/requests/spree/api/v2/platform/menu_item_spec.rb
index d4001b8d27..a3002efb20 100644
--- a/api/spec/requests/spree/api/v2/platform/menu_item_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/menu_item_spec.rb
@@ -4,7 +4,7 @@ describe 'Platform API v2 Menu Items spec', type: :request do
include_context 'API v2 tokens'
include_context 'Platform API v2'
- let!(:store) { create(:store, default: true) }
+ let!(:store) { Spree::Store.default }
let!(:menu) { create(:menu, store: store) }
let!(:menu_item_a) { create(:menu_item, menu: menu) }
let!(:menu_item_b) { create(:menu_item, menu: menu) }
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rb
index 963401f0e3..bf7ed51358 100644
--- a/core/app/models/spree/menu.rb
+++ b/core/app/models/spree/menu.rb
@@ -8,8 +8,8 @@ module Spree
MENU_LOCATIONS_PARAMETERIZED << parameterize_location
end
- has_many :menu_items, dependent: :destroy
- belongs_to :store, touch: true
+ has_many :menu_items, dependent: :destroy, class_name: 'Spree::MenuItem'
+ belongs_to :store, touch: true, class_name: 'Spree::Store'
before_validation :parameterize_location
after_create :set_root
@@ -46,7 +46,7 @@ module Spree
end
def set_root
- self.root ||= MenuItem.create!(menu_id: id, name: name, item_type: 'Container')
+ self.root ||= menu_items.create!(name: name, item_type: 'Container')
end
def update_root_name
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index d302edc1d7..5291ba48d8 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -4,18 +4,27 @@ module Spree
FAVICON_CONTENT_TYPES = ['image/png', 'image/x-icon', 'image/vnd.microsoft.icon'].freeze
has_many :orders, class_name: 'Spree::Order'
+ has_many :line_items, through: :orders, class_name: 'Spree::LineItem'
+ has_many :shipments, through: :orders, class_name: 'Spree::Shipment'
+ has_many :payments, through: :orders, class_name: 'Spree::Payment'
+ has_many :return_authorizations, through: :orders, class_name: 'Spree::ReturnAuthorization'
+ # has_many :reimbursements, through: :orders, class_name: 'Spree::Reimbursement' FIXME: we should fetch this via Customer Return
has_many :store_payment_methods, class_name: 'Spree::StorePaymentMethod'
has_many :payment_methods, through: :store_payment_methods, class_name: 'Spree::PaymentMethod'
- has_many :menus
+ has_many :menus, class_name: 'Spree::Menu'
+ has_many :menu_items, through: :menus, class_name: 'Spree::MenuItem'
has_many :store_products, class_name: 'Spree::StoreProduct', dependent: :destroy
has_many :products, through: :store_products, class_name: 'Spree::Product'
- has_many :variants, through: :products, foreign_key: :prodyct, class_name: 'Spree::Variant',
- source: :variants_including_master
+ has_many :product_properties, through: :products, class_name: 'Spree::ProductProperty'
+ has_many :variants, through: :products, class_name: 'Spree::Variant', source: :variants_including_master
has_many :stock_items, through: :variants, class_name: 'Spree::StockItem'
+ has_many :inventory_units, through: :variants, class_name: 'InventoryUnit'
+
has_many :store_credits, class_name: 'Spree::StoreCredit'
+ has_many :store_credit_events, through: :store_credits, class_name: 'Spree::StoreCreditEvent'
belongs_to :default_country, class_name: 'Spree::Country'
belongs_to :checkout_zone, class_name: 'Spree::Zone'
diff --git a/core/app/models/spree/store_credit.rb b/core/app/models/spree/store_credit.rb
index 3b7eaa1707..469aa4f4cd 100644
--- a/core/app/models/spree/store_credit.rb
+++ b/core/app/models/spree/store_credit.rb
@@ -17,7 +17,7 @@ module Spree
belongs_to :created_by, class_name: Spree.user_class.to_s, foreign_key: 'created_by_id'
belongs_to :credit_type, class_name: 'Spree::StoreCreditType', foreign_key: 'type_id'
belongs_to :store, class_name: 'Spree::Store'
- has_many :store_credit_events
+ has_many :store_credit_events, class_name: 'Spree::StoreCreditEvent'
validates :user, :category, :credit_type, :created_by, :currency, :store, presence: true
validates :amount, numericality: { greater_than: 0 }
diff --git a/core/spec/models/spree/store_spec.rb b/core/spec/models/spree/store_spec.rb
index 862f97ab64..5eed39c41f 100644
--- a/core/spec/models/spree/store_spec.rb
+++ b/core/spec/models/spree/store_spec.rb
@@ -1,6 +1,123 @@
require 'spec_helper'
describe Spree::Store, type: :model do
+ describe 'associations' do
+ subject { create(:store) }
+
+ describe '#products' do
+ let!(:product) { create(:product, stores: [subject]) }
+ let!(:product_2) { create(:product, stores: [create(:store)]) }
+
+ it { expect(subject.products).to eq([product]) }
+
+ describe '#product_properties' do
+ let!(:product_property) { create(:product_property, product: product) }
+ let!(:product_property_2) { create(:product_property, product: product_2) }
+
+ it { expect(subject.product_properties).to eq([product_property]) }
+ end
+
+ describe '#variants' do
+ let!(:variant) { create(:variant, product: product) }
+ let!(:variant_2) { create(:variant, product: product_2) }
+
+ it { expect(subject.variants).to eq([product.master, variant]) }
+
+ describe '#stock_items' do
+ let!(:stock_items) { product.stock_items }
+ let!(:stock_items_2) { product_2.stock_items }
+
+ it { expect(stock_items).not_to be_empty }
+ it { expect(stock_items_2).not_to be_empty }
+ it { expect(subject.stock_items).to eq(stock_items) }
+ end
+ end
+ end
+
+ describe '#payment_methods' do
+ let!(:payment_method) { create(:payment_method, stores: [subject]) }
+ let!(:payment_method_2) { create(:payment_method, stores: [create(:store)]) }
+
+ it { expect(subject.payment_methods).to eq([payment_method]) }
+ end
+
+ describe '#orders' do
+ let!(:order) { create(:order, store: subject) }
+ let!(:order_2) { create(:order, store: create(:store)) }
+
+ it { expect(subject.orders).to eq([order]) }
+
+ describe '#line_items' do
+ let!(:line_item) { create(:line_item, order: order) }
+ let!(:line_item_2) { create(:line_item, order: order_2) }
+
+ it { expect(subject.line_items).to eq([line_item]) }
+ end
+
+ describe '#payments' do
+ let!(:payment) { create(:payment, order: order) }
+ let!(:payment_2) { create(:payment, order: order_2) }
+
+ it { expect(subject.payments).to eq([payment]) }
+ end
+
+ describe '#shipments' do
+ let!(:shipment) { create(:shipment, order: order) }
+ let!(:shipment_2) { create(:shipment, order: order_2) }
+
+ it { expect(subject.shipments).to eq([shipment]) }
+ end
+
+ describe '#return_authorizations' do
+ let!(:order) { create(:shipped_order, store: subject) }
+ let!(:order_2) { create(:shipped_order, store: create(:store)) }
+ let!(:return_authorization) { create(:return_authorization, order: order) }
+ let!(:return_authorization_2) { create(:return_authorization, order: order_2) }
+
+ it { expect(subject.return_authorizations).to eq([return_authorization]) }
+ end
+
+ describe '#inventory_units' do
+ let(:product) { create(:product, stores: [subject]) }
+ let(:product_2) { create(:product, stores: [create(:store)]) }
+ let!(:inventory_unit) { create(:inventory_unit, variant: product.master, order: order) }
+ let!(:inventory_unit_2) { create(:inventory_unit, variant: product_2.master, order: order_2) }
+
+ it { expect(subject.inventory_units).to eq([inventory_unit]) }
+ end
+ end
+
+ describe '#store_credits' do
+ let!(:store_credit) { create(:store_credit, store: subject) }
+ let!(:store_credit_2) { create(:store_credit, store: create(:store)) }
+
+ it { expect(subject.store_credits).to eq([store_credit]) }
+
+ describe '#store_credit_events' do
+ let!(:store_credit_event) { store_credit.store_credit_events.first }
+ let!(:store_credit_event_2) { store_credit_2.store_credit_events.first }
+
+ it { expect(store_credit_event).not_to be_nil }
+ it { expect(store_credit_event_2).not_to be_nil }
+ it { expect(subject.store_credit_events).to eq([store_credit_event]) }
+ end
+ end
+
+ describe '#menus' do
+ let!(:menu) { create(:menu, store: subject) }
+ let!(:menu_2) { create(:menu, store: create(:store)) }
+
+ it { expect(subject.menus).to eq([menu]) }
+
+ describe '#menu_items' do
+ let!(:menu_item) { menu.menu_items.first }
+ let!(:menu_item_2) { menu_2.menu_items.first }
+
+ it { expect(subject.menu_items).to eq([menu_item]) }
+ end
+ end
+ end
+
describe 'validations' do
describe 'favicon image' do
it 'validates image properties' do