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
Fix code reviews, Fix tests.
Matthew Kennedy8f175a8e30d0
diff --git a/api/app/serializers/spree/api/v2/platform/menu_item_serializer.rb b/api/app/serializers/spree/api/v2/platform/menu_item_serializer.rbindex d2a820d479..bb18f7836b 100644--- a/api/app/serializers/spree/api/v2/platform/menu_item_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/menu_item_serializer.rb@@ -5,20 +5,6 @@ module Spreeclass MenuItemSerializer < BaseSerializerinclude ::Spree::Api::V2::ResourceSerializerConcern- attributes :item_type, :code, :name, :subtitle, :destination, :new_window, :lft, :rgt, :depth-- attribute :is_root do |menu_item|- menu_item.root?- end-- attribute :is_child do |menu_item|- menu_item.child?- end-- attribute :is_leaf do |menu_item|- menu_item.leaf?- end-has_one :image,object_method_name: :menu_item_image,id_method_name: :menu_item_image_id,diff --git a/api/app/serializers/spree/api/v2/platform/menu_serializer.rb b/api/app/serializers/spree/api/v2/platform/menu_serializer.rbindex cfe3a87031..4536c048f3 100644--- a/api/app/serializers/spree/api/v2/platform/menu_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/menu_serializer.rb@@ -5,8 +5,6 @@ module Spreeclass MenuSerializer < BaseSerializerinclude ::Spree::Api::V2::ResourceSerializerConcern- attributes :name, :unique_code-belongs_to :storehas_many :menu_itemsenddiff --git a/api/app/serializers/spree/api/v2/platform/store_serializer.rb b/api/app/serializers/spree/api/v2/platform/store_serializer.rbindex 204a9c6e5d..de6b7338fa 100644--- a/api/app/serializers/spree/api/v2/platform/store_serializer.rb+++ b/api/app/serializers/spree/api/v2/platform/store_serializer.rb@@ -5,10 +5,6 @@ module Spreeclass StoreSerializer < BaseSerializerinclude ::Spree::Api::V2::ResourceSerializerConcern- attributes :name, :url, :meta_description, :meta_keywords, :seo_title, :default_currency, :default, :supported_currencies, :facebook,- :twitter, :instagram, :default_locale, :customer_support_email, :default_country_id, :description,- :address, :contact_phone, :supported_locales-has_many :menushas_one :default_country, serializer: :country, record_type: :country, id_method_name: :default_country_idenddiff --git a/backend/app/views/spree/admin/menus/_form.html.erb b/backend/app/views/spree/admin/menus/_form.html.erbindex 0130184277..bc5fc07ed8 100644--- a/backend/app/views/spree/admin/menus/_form.html.erb+++ b/backend/app/views/spree/admin/menus/_form.html.erb@@ -16,7 +16,7 @@<div class="col-12 col-md-6"><div class="form-group"><%= label_tag :menu_stores, Spree.t(:stores) %>- <%= collection_select(:menu, :store_id, @stores, :id, :unique_name, { include_blank: true }, { class: 'select2-clear' }) %>+ <%= collection_select(:menu, :store_id, @stores, :id, :unique_name, {}, { class: 'select2' }) %><%= f.error_message_on :menu_stores %></div></div>diff --git a/backend/app/views/spree/admin/menus/index.html.erb b/backend/app/views/spree/admin/menus/index.html.erbindex e51b4a4d27..ab1f5159fc 100644--- a/backend/app/views/spree/admin/menus/index.html.erb+++ b/backend/app/views/spree/admin/menus/index.html.erb@@ -24,9 +24,7 @@</small></td><td>- <% if menu.store_id %>- <span class="badge badge-secondary"><%= @stores.find(menu.store_id).unique_name %></span>- <% end %>+ <span class="badge badge-secondary"><%= menu.store.unique_name %></span></td><td class="actions" data-hook="admin_menus_index_row_actions"><span class="d-flex justify-content-end">diff --git a/backend/spec/features/admin/menus/edit_menu_spec.rb b/backend/spec/features/admin/menus/edit_menu_spec.rbindex 27925b08b2..f59195a8e4 100644--- a/backend/spec/features/admin/menus/edit_menu_spec.rb+++ b/backend/spec/features/admin/menus/edit_menu_spec.rb@@ -3,7 +3,8 @@ require 'spec_helper'describe 'Menu Edit', type: :feature dostub_authorization!- let!(:main_menu) { create(:menu, name: 'Main Menu', unique_code: 'spree-main') }+ let!(:store_1) { create(:store) }+ let!(:main_menu) { create(:menu, name: 'Main Menu', unique_code: 'spree-main', store_id: store_1.id) }let!(:menu_item) { create(:menu_item, menu_id: main_menu.id, parent_id: main_menu.root.id) }context 'when link to URL the user can' dodiff --git a/backend/spec/features/admin/menus/index_menu_spec.rb b/backend/spec/features/admin/menus/index_menu_spec.rbindex 04ea29821f..3f7179aff2 100644--- a/backend/spec/features/admin/menus/index_menu_spec.rb+++ b/backend/spec/features/admin/menus/index_menu_spec.rb@@ -18,8 +18,8 @@ describe 'Menus Index', type: :feature dolet!(:store_2) { create(:store) }let!(:store_3) { create(:store) }- let!(:main_menu) { create(:menu, name: 'Main Menu', store_ids: [store_1.id, store_3.id]) }- let!(:footer_menu) { create(:menu, name: 'Footer Menu') }+ let!(:main_menu) { create(:menu, name: 'Main Menu', store_id: store_1.id) }+ let!(:footer_menu) { create(:menu, name: 'Footer Menu', store_id: store_3.id) }before dovisit spree.admin_menus_path@@ -37,7 +37,6 @@ describe 'Menus Index', type: :feature doexpect(page).to have_text 'Main Menu'expect(page).to have_text 'Footer Menu'expect(page).to have_text store_1.unique_name- expect(page).to have_text store_3.unique_nameexpect(page).not_to have_text store_2.unique_nameendenddiff --git a/backend/spec/features/admin/menus/new_menu_spec.rb b/backend/spec/features/admin/menus/new_menu_spec.rbindex 06d5425d6d..382497470b 100644--- a/backend/spec/features/admin/menus/new_menu_spec.rb+++ b/backend/spec/features/admin/menus/new_menu_spec.rb@@ -36,7 +36,7 @@ describe 'New Menu', type: :feature docontext 'when a user tries to create a menu with a duplicate code withn scope of stores', js: true dolet!(:store_1) { create(:store) }- let!(:main_menu) { create(:menu, name: 'Main Menu', store_ids: [store_1.id]) }+ let!(:main_menu) { create(:menu, name: 'Main Menu', store_id: store_1.id) }before dovisit spree.new_admin_menu_path@@ -48,16 +48,13 @@ describe 'New Menu', type: :feature doselect2 store_1.unique_name, from: 'Stores'click_on 'Create'- expect(page).to have_text (Spree.t('admin.navigation.unique_code_store_error',- code: main_menu.unique_code,- menus: main_menu.name))+ expect(page).to have_text ('Unique code has already been taken')endendcontext 'user can create a new menu', js: true dolet!(:store_1) { create(:store) }let!(:store_2) { create(:store) }- let!(:store_3) { create(:store) }before dovisit spree.new_admin_menu_path@@ -67,8 +64,7 @@ describe 'New Menu', type: :feature dofill_in 'Name', with: 'Main Menu'fill_in 'Unique Code', with: 'unip-s-s-s'- select2 store_1.unique_name, from: 'Stores'- select2 store_3.unique_name, from: 'Stores'+ select2 store_2.unique_name, from: 'Stores'click_on 'Create'assert_admin_flash_alert_success('Menu "Main Menu" has been successfully created!')diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rbindex 043db881c9..0e78bf00fd 100644--- a/core/app/models/spree/menu.rb+++ b/core/app/models/spree/menu.rb@@ -6,8 +6,8 @@ module Spreebefore_validation :paremeterize_unique_codeafter_create :set_root- validates :name, presence: true- validates :unique_code, uniqueness: { scope: :store_id }+ validates :name, :store, presence: true+ validates :unique_code, uniqueness: { scope: :store }scope :by_unique_code, ->(menu_code) { where unique_code: menu_code }scope :by_store, ->(store) { where store_id: store }diff --git a/core/spec/models/spree/menu_spec.rb b/core/spec/models/spree/menu_spec.rbindex b3c288cc06..6e1ff7503d 100644--- a/core/spec/models/spree/menu_spec.rb+++ b/core/spec/models/spree/menu_spec.rb@@ -13,10 +13,12 @@ describe Spree::Menu, type: :model doenddescribe '.by_unique_code' do- let!(:menu_1) { create(:menu) }- let!(:menu_2) { create(:menu) }+ let!(:store_1) { create(:store) }+ let!(:store_2) { create(:store) }+ let!(:menu_1) { create(:menu, store_id: store_1.id) }+ let!(:menu_2) { create(:menu, store_id: store_2.id) }- it 'returns a menu when searched for by name' do+ it 'returns a menu when searched for by unique_code' doexpect(described_class.by_unique_code(menu_1.unique_code)).to include(menu_1)expect(described_class.by_unique_code(menu_1.unique_code)).not_to include(menu_2)end@@ -25,11 +27,12 @@ describe Spree::Menu, type: :model dodescribe 'creating new menu' dolet!(:store_1) { create(:store) }let!(:store_2) { create(:store) }+ let!(:store_3) { create(:store) }let!(:menu_a) { create(:menu, name: 'Footer', unique_code: 'ABC123', store_id: store_1.id) }- let!(:menu_param) { create(:menu, name: 'Footer', unique_code: 'ABC 123 XyZ') }+ let!(:menu_param) { create(:menu, name: 'Footer', unique_code: 'ABC 123 XyZ', store_id: store_2.id) }- it 'validates uniqueness of unique_code to be valid if not associated with a store with the same code' do+ it 'validates uniqueness of unique_code to be valid in scope of store' doexpect(described_class.new(name: 'Footer', unique_code: 'ABC123', store_id: store_2.id)).to be_validend@@ -38,7 +41,11 @@ describe Spree::Menu, type: :model doendit 'validates presence of name' do- expect(described_class.new(name: '', unique_code: 'ABC123')).not_to be_valid+ expect(described_class.new(name: '', unique_code: 'ABC123', store_id: store_3.id)).not_to be_valid+ end++ it 'validates presence of store' do+ expect(described_class.new(name: 'Got Name', unique_code: 'ABC123', store_id: nil)).not_to be_validendit 'adds a root item' do