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.

Associate Variants and Stock Items with Store via Products

Damian Legawiec2f51695ddc05
diff --git a/api/app/controllers/spree/api/v2/storefront/cart_controller.rb b/api/app/controllers/spree/api/v2/storefront/cart_controller.rb
index 8c2a83c2bc..7440191bd1 100644
--- a/api/app/controllers/spree/api/v2/storefront/cart_controller.rb
+++ b/api/app/controllers/spree/api/v2/storefront/cart_controller.rb
@@ -149,7 +149,7 @@ module Spree
end
def load_variant
- @variant = Spree::Variant.find(params[:variant_id])
+ @variant = current_store.variants.find(params[:variant_id])
end
def render_error_item_quantity
diff --git a/api/spec/requests/spree/api/v2/storefront/cart_spec.rb b/api/spec/requests/spree/api/v2/storefront/cart_spec.rb
index 20e6f34b34..8ed7a8495b 100644
--- a/api/spec/requests/spree/api/v2/storefront/cart_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/cart_spec.rb
@@ -5,7 +5,8 @@ describe 'API V2 Storefront Cart Spec', type: :request do
let(:currency) { store.default_currency }
let(:user) { create(:user) }
let(:order) { create(:order, user: user, store: store, currency: currency) }
- let(:variant) { create(:variant) }
+ let(:product) { create(:product, stores: [store]) }
+ let(:variant) { create(:variant, product: product) }
include_context 'API v2 tokens'
@@ -188,12 +189,40 @@ describe 'API V2 Storefront Cart Spec', type: :request do
end
end
+ shared_examples 'doesnt add item from different store' do
+ before do
+ variant.product.stores = [create(:store)]
+ execute
+ end
+
+ it_behaves_like 'returns 404 HTTP status'
+
+ it 'returns an error' do
+ expect(json_response[:error]).to eq('The resource you were looking for could not be found.')
+ end
+ end
+
+ shared_examples 'doesnt add non-existing item' do
+ before do
+ variant.destroy
+ execute
+ end
+
+ it_behaves_like 'returns 404 HTTP status'
+
+ it 'returns an error' do
+ expect(json_response[:error]).to eq('The resource you were looking for could not be found.')
+ end
+ end
+
context 'as a signed in user' do
include_context 'creates order with line item'
context 'with existing order' do
it_behaves_like 'adds item'
it_behaves_like 'doesnt add item with quantity unnavailble'
+ it_behaves_like 'doesnt add item from different store'
+ it_behaves_like 'doesnt add non-existing item'
end
it_behaves_like 'no current order'
@@ -205,6 +234,8 @@ describe 'API V2 Storefront Cart Spec', type: :request do
context 'with existing order' do
it_behaves_like 'adds item'
it_behaves_like 'doesnt add item with quantity unnavailble'
+ it_behaves_like 'doesnt add item from different store'
+ it_behaves_like 'doesnt add non-existing item'
end
it_behaves_like 'no current order'
diff --git a/backend/app/controllers/spree/admin/stock_items_controller.rb b/backend/app/controllers/spree/admin/stock_items_controller.rb
index 1f127b6703..fa37b0242b 100644
--- a/backend/app/controllers/spree/admin/stock_items_controller.rb
+++ b/backend/app/controllers/spree/admin/stock_items_controller.rb
@@ -11,7 +11,7 @@ module Spree
end
def create
- variant = Variant.find(params[:variant_id])
+ variant = current_store.variants.find(params[:variant_id])
stock_location = StockLocation.find(params[:stock_location_id])
stock_movement = stock_location.stock_movements.build(stock_movement_params)
stock_movement.stock_item = stock_location.set_up_stock_item(variant)
@@ -41,7 +41,7 @@ module Spree
end
def stock_item
- @stock_item ||= StockItem.find(params[:id])
+ @stock_item ||= current_store.stock_items.find(params[:id])
end
def determine_backorderable
diff --git a/backend/spec/controllers/spree/admin/stock_items_controller_spec.rb b/backend/spec/controllers/spree/admin/stock_items_controller_spec.rb
index 2fb87d2c5c..3289888d9b 100644
--- a/backend/spec/controllers/spree/admin/stock_items_controller_spec.rb
+++ b/backend/spec/controllers/spree/admin/stock_items_controller_spec.rb
@@ -5,14 +5,27 @@ module Spree
describe StockItemsController, type: :controller do
stub_authorization!
+ let(:store) { Spree::Store.default }
+ let(:store_2) { create(:store) }
+
context 'formats' do
- let!(:stock_item) { create(:variant).stock_items.first }
+ let(:product) { create(:product, stores: [store]) }
+ let(:product_2) { create(:product, stores: [store_2]) }
+
+ let!(:stock_item) { create(:variant, product: product).stock_items.first }
+ let!(:stock_item_2) { create(:variant, product: product_2).stock_items.first }
it 'destroy stock item via js' do
expect do
delete :destroy, params: { format: :js, id: stock_item }
end.to change(StockItem, :count).by(-1)
end
+
+ it 'cannot destroy stock from other store' do
+ expect do
+ delete :destroy, params: { format: :js, id: stock_item_2 }
+ end.to raise_error(ActiveRecord::RecordNotFound)
+ end
end
end
end
diff --git a/backend/spec/controllers/spree/admin/variants_controller_spec.rb b/backend/spec/controllers/spree/admin/variants_controller_spec.rb
index 5ec7249218..a76cd98b6e 100644
--- a/backend/spec/controllers/spree/admin/variants_controller_spec.rb
+++ b/backend/spec/controllers/spree/admin/variants_controller_spec.rb
@@ -5,8 +5,10 @@ module Spree
describe VariantsController, type: :controller do
stub_authorization!
+ let(:store) { Spree::Store.default }
+ let(:product) { create(:product, stores: [store]) }
+
describe '#index' do
- let(:product) { create(:product, stores: Spree::Store.all) }
let!(:variant_1) { create(:variant, product: product) }
let!(:variant_2) { create(:variant, product: product) }
@@ -34,42 +36,16 @@ module Spree
delete :destroy, params: { product_id: product, id: variant, format: :js }
end
- let(:variant) { mock_model(Spree::Variant) }
+ let(:variant) { create(:variant, product: product) }
let(:variants) { double(ActiveRecord::Relation) }
- let(:product) { mock_model(Spree::Product) }
let(:products) { double(ActiveRecord::Relation) }
- before do
- allow(Spree::Product).to receive(:friendly).and_return(products)
- allow(products).to receive(:find).with(product.id.to_s).and_return(product)
- allow(product).to receive_message_chain(:variants, :find).with(variant.id.to_s).and_return(variants)
-
- allow(Spree::Variant).to receive(:find).with(variant.id.to_s).and_return(variant)
- end
-
- describe 'expects to receive' do
- after { send_request }
-
- it { expect(Spree::Product).to receive(:friendly).and_return(products) }
- it { expect(products).to receive(:find).with(product.id.to_s).and_return(product) }
- it { expect(product).to receive_message_chain(:variants, :find).with(variant.id.to_s).and_return(variants) }
- it { expect(Spree::Variant).to receive(:find).with(variant.id.to_s).and_return(variant) }
- end
-
shared_examples 'correct response' do
it { expect(assigns(:variant)).to eq(variant) }
it { expect(response).to have_http_status(:ok) }
end
context 'will successfully destroy variant' do
- before { allow(variant).to receive(:destroy).and_return(true) }
-
- describe 'expects to receive' do
- after { send_request }
-
- it { expect(variant).to receive(:destroy).and_return(true) }
- end
-
describe 'returns response' do
before { send_request }
@@ -77,30 +53,6 @@ module Spree
it { expect(flash[:success]).to eq(Spree.t('notice_messages.variant_deleted')) }
end
end
-
- context 'will not successfully destroy product' do
- let(:error_msg) { 'Failed to delete' }
-
- before do
- allow(variant).to receive_message_chain(:errors, :full_messages).and_return([error_msg])
- allow(variant).to receive(:destroy).and_return(false)
- end
-
- describe 'expects to receive' do
- after { send_request }
-
- it { expect(variant).to receive_message_chain(:errors, :full_messages).and_return([error_msg]) }
- it { expect(variant).to receive(:destroy).and_return(false) }
- end
-
- describe 'returns response' do
- before { send_request }
-
- it_behaves_like 'correct response'
-
- it { expect(flash[:error]).to eq(Spree.t('notice_messages.variant_not_deleted', error: error_msg)) }
- end
- end
end
end
end
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index e60077dc67..93e9c9d0a0 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -12,6 +12,9 @@ module Spree
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 :stock_items, through: :variants, class_name: 'Spree::StockItem'
belongs_to :default_country, class_name: 'Spree::Country'
belongs_to :checkout_zone, class_name: 'Spree::Zone'
diff --git a/frontend/app/controllers/spree/orders_controller.rb b/frontend/app/controllers/spree/orders_controller.rb
index 8cefe71877..c8617334ae 100644
--- a/frontend/app/controllers/spree/orders_controller.rb
+++ b/frontend/app/controllers/spree/orders_controller.rb
@@ -14,7 +14,7 @@ module Spree
end
def update
- @variant = Spree::Variant.find(params[:variant_id]) if params[:variant_id]
+ @variant = curret_store.variants.find(params[:variant_id]) if params[:variant_id]
if Cart::Update.call(order: @order, params: order_params).success?
respond_with(@order) do |format|
format.html do
diff --git a/frontend/spec/controllers/spree/orders_controller_spec.rb b/frontend/spec/controllers/spree/orders_controller_spec.rb
index ebcb68b901..9503ea1633 100644
--- a/frontend/spec/controllers/spree/orders_controller_spec.rb
+++ b/frontend/spec/controllers/spree/orders_controller_spec.rb
@@ -1,13 +1,13 @@
require 'spec_helper'
describe Spree::OrdersController, type: :controller do
+ let(:store) { Spree::Store.default }
let(:user) { create(:user) }
+ let(:product) { create(:product, stores: [store]) }
+ let(:variant) { create(:variant, product: product) }
context 'Order model mock' do
- let(:order) do
- Spree::Order.create!
- end
- let(:variant) { create(:variant) }
+ let(:order) { create(:order, store: store) }
before do
allow(controller).to receive_messages(try_spree_current_user: user)
@@ -64,8 +64,7 @@ describe Spree::OrdersController, type: :controller do
end
context 'line items quantity is 0' do
- let(:order) { Spree::Order.create }
- let(:variant) { create(:variant) }
+ let(:order) { create(:order, store: store) }
let!(:line_item) { Spree::Cart::AddItem.call(order: order, variant: variant).value }
before do
@@ -79,4 +78,24 @@ describe Spree::OrdersController, type: :controller do
expect(order.reload.line_items.count).to eq 0
end
end
+
+ describe '#show' do
+ before do
+ allow(controller).to receive(:check_authorization)
+ end
+
+ context 'order from current store' do
+ let(:order) { create(:order, store: store) }
+
+ let(:response) { get :show, params: { id: order.number } }
+
+ it { expect(response).to render_template(:show) }
+ end
+
+ context 'order from different store' do
+ let(:order) { create(:order, store: create(:store)) }
+
+ it { expect { get :show, params: { id: order.number } }.to raise_error(ActiveRecord::RecordNotFound) }
+ end
+ end
end