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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Revert "Only return eligible variants (#11534)" (#11542)
Damian Legawieceeb266f0f7e0
diff --git a/api/app/controllers/spree/api/v2/platform/variants_controller.rb b/api/app/controllers/spree/api/v2/platform/variants_controller.rbindex c5170065a4..d3ca47e8d0 100644--- a/api/app/controllers/spree/api/v2/platform/variants_controller.rb+++ b/api/app/controllers/spree/api/v2/platform/variants_controller.rb@@ -12,10 +12,6 @@ module Spreedef spree_permitted_attributessuper + [:option_value_ids, :price, :currency]end-- def scope- super.eligible- endendendenddiff --git a/api/spec/requests/spree/api/v2/platform/variants_spec.rb b/api/spec/requests/spree/api/v2/platform/variants_spec.rbindex e82bd25b94..1043c3e677 100644--- a/api/spec/requests/spree/api/v2/platform/variants_spec.rb+++ b/api/spec/requests/spree/api/v2/platform/variants_spec.rb@@ -7,7 +7,7 @@ describe 'API V2 Platform Variants Spec' dolet(:product) { create(:product, stores: [store]) }let!(:variants) { create_list(:variant, 5, product: product) }-+describe 'variants#index' docontext 'with no params' dobefore { get '/api/v2/platform/variants', headers: bearer_token }@@ -15,7 +15,7 @@ describe 'API V2 Platform Variants Spec' doit_behaves_like 'returns 200 HTTP status'it 'returns all variants' do- expect(json_response['data'].count).to eq 5+ expect(json_response['data'].count).to eq store.variants.countexpect(json_response['data'].first).to have_type('variant')endend@@ -28,28 +28,11 @@ describe 'API V2 Platform Variants Spec' dobefore { get '/api/v2/platform/variants', headers: bearer_token }it 'returns variants from this store only' do- expect(json_response['data'].count).to eq 5+ expect(json_response['data'].count).to eq store.variants.countvariant_ids = json_response['data'].pluck(:id)- expect(variant_ids).not_to include(variant_from_another_store.id.to_s)- expect(variant_ids).to match_array(store.variants.eligible.map(&:id).map(&:to_s))expect(variant_ids).not_to include(variant_from_another_store.id)- expect(variant_ids).not_to include(product.master_id.to_s)- end- end-- context 'product with no options' do- let!(:product_with_no_options) { create(:product, stores: [store]) }-- before { get '/api/v2/platform/variants', headers: bearer_token }-- it 'returns all variants and the master variant' do- expect(json_response['data'].count).to eq 6- variant_ids = json_response['data'].pluck(:id)-- expect(variant_ids).to include(product_with_no_options.master_id.to_s)- expect(variant_ids).to match_array(store.variants.eligible.map(&:id).map(&:to_s))- expect(variant_ids).not_to include(product.master_id.to_s)+ expect(variant_ids).to match_array(store.variants.ids.map(&:to_s))endend@@ -58,7 +41,7 @@ describe 'API V2 Platform Variants Spec' dolet(:product_2) { create(:product, stores: [store], name: 'Vendo T-shirt') }let!(:variant) { create(:variant, product: product_2) }- before { get '/api/v2/platform/variants?filter[product_name_cont]=vendo&filter[is_master_eq]=false', headers: bearer_token }+ before { get "/api/v2/platform/variants?filter[product_name_cont]=vendo&filter[is_master_eq]=false", headers: bearer_token }it 'returns variant with a specified name' doexpect(json_response['data'].count).to eq 1@@ -69,7 +52,7 @@ describe 'API V2 Platform Variants Spec' doxcontext 'by price' dolet!(:variant) { create(:variant, price: 100) }- before { get '/api/v2/platform/variants?filter[product_price_between]=100,200', headers: bearer_token }+ before { get "/api/v2/platform/variants?filter[product_price_between]=100,200", headers: bearer_token }it 'returns variants with price greater than or equal to the given price' doexpect(json_response['data'].count).to eq 1@@ -86,8 +69,8 @@ describe 'API V2 Platform Variants Spec' doit_behaves_like 'returns 200 HTTP status'it 'returns variants sorted by updated_at' do- expect(json_response['data'].count).to eq 5- expect(json_response['data'].pluck(:id)).to match_array(store.variants.eligible.map(&:id).map(&:to_s))+ expect(json_response['data'].count).to eq store.variants.count+ expect(json_response['data'].pluck(:id)).to eq store.variants.order(:updated_at).map(&:id).map(&:to_s)endend@@ -97,8 +80,8 @@ describe 'API V2 Platform Variants Spec' doit_behaves_like 'returns 200 HTTP status'it 'returns variants sorted by updated_at with descending order' do- expect(json_response['data'].count).to eq 5- expect(json_response['data'].pluck(:id)).to match_array(store.variants.eligible.map(&:id).map(&:to_s))+ expect(json_response['data'].count).to eq store.variants.count+ expect(json_response['data'].pluck(:id)).to eq store.variants.order(updated_at: :desc).map(&:id).map(&:to_s)endendend@@ -110,8 +93,8 @@ describe 'API V2 Platform Variants Spec' doit_behaves_like 'returns 200 HTTP status'it 'returns variants sorted by created_at' do- expect(json_response['data'].count).to eq 5- expect(json_response['data'].pluck(:id)).to match_array(store.variants.eligible.map(&:id).map(&:to_s))+ expect(json_response['data'].count).to eq store.variants.count+ expect(json_response['data'].pluck(:id)).to eq store.variants.order(:created_at).map(&:id).map(&:to_s)endend@@ -121,8 +104,8 @@ describe 'API V2 Platform Variants Spec' doit_behaves_like 'returns 200 HTTP status'it 'returns variants sorted by created_at with descending order' do- expect(json_response['data'].count).to eq 5- expect(json_response['data'].pluck(:id)).to match_array(store.variants.eligible.map(&:id).map(&:to_s))+ expect(json_response['data'].count).to eq store.variants.count+ expect(json_response['data'].pluck(:id)).to eq store.variants.order(created_at: :desc).map(&:id).map(&:to_s)endendend@@ -141,7 +124,7 @@ describe 'API V2 Platform Variants Spec' doit 'returns proper meta data' doexpect(json_response['meta']['count']).to eq 2- expect(json_response['meta']['total_count']).to eq 5+ expect(json_response['meta']['total_count']).to eq store.variants.countendit 'returns proper links data' do@@ -158,12 +141,12 @@ describe 'API V2 Platform Variants Spec' doit_behaves_like 'returns 200 HTTP status'it 'returns specified amount variants' do- expect(json_response['data'].count).to eq 5+ expect(json_response['data'].count).to eq store.variants.countendit 'returns proper meta data' doexpect(json_response['meta']['count']).to eq json_response['data'].count- expect(json_response['meta']['total_count']).to eq 5+ expect(json_response['meta']['total_count']).to eq store.variants.countendit 'returns proper links data' do