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 review issues.
Matthew Kennedy6ad93a49a18e
diff --git a/api/app/controllers/spree/api/v2/storefront/wished_products_controller.rb b/api/app/controllers/spree/api/v2/storefront/wished_products_controller.rbindex fca1535c74..31a6f100bb 100644--- a/api/app/controllers/spree/api/v2/storefront/wished_products_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/wished_products_controller.rb@@ -3,7 +3,6 @@ module Spreemodule V2module Storefrontclass WishedProductsController < ::Spree::Api::V2::ResourceController-def createspree_authorize! :create, Spree::WishedProductspree_authorize! :update, wishlist@@ -11,7 +10,7 @@ module Spreewished_product = Spree::WishedProduct.new(wished_product_attributes)if wishlist.include? params[:wished_product][:variant_id]- wished_product = wishlist.wished_products.detect {|wp| wp.variant_id == params[:wished_product][:variant_id].to_i }+ wished_product = wishlist.wished_products.detect { |wp| wp.variant_id == params[:wished_product][:variant_id].to_i }elsewished_product.wishlist = wishlistwished_product.save@@ -52,7 +51,7 @@ module Spreeenddef wishlist- @wishlist ||= Spree::Wishlist.find_by!(token: params[:wishlist_id])+ @wishlist ||= current_store.wishlists.find_by!(token: params[:wishlist_id])enddef wished_product_attributesdiff --git a/api/app/controllers/spree/api/v2/storefront/wishlists_controller.rb b/api/app/controllers/spree/api/v2/storefront/wishlists_controller.rbindex 7acad9933c..6c1622af1f 100644--- a/api/app/controllers/spree/api/v2/storefront/wishlists_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/wishlists_controller.rb@@ -9,18 +9,18 @@ module Spreedef indexspree_authorize! :index, Spree::Wishlist- wishlists = spree_current_user.wishlists.where(store_id: current_store.id).page(params[:page]).per(params[:per_page])++ wishlists = spree_current_user.wishlists.for_store(current_store).page(params[:page]).per(params[:per_page])render_serialized_payload { serialize_collection(wishlists) }enddef createspree_authorize! :create, Spree::Wishlist- wishlist = Spree::Wishlist.new( wishlist_attributes )+ wishlist = spree_current_user.wishlists.new(wishlist_attributes)ensure_current_store(wishlist)- wishlist.user = spree_current_userwishlist.saveif wishlist.persisted?@@ -56,9 +56,9 @@ module Spreedef defaultspree_authorize! :create, Spree::Wishlist- wishlist = spree_current_user.wishlist(current_store.id)+ default_wishlist = spree_current_user.default_wishlist_for_store(current_store)- render_serialized_payload { serialize_resource(wishlist) }+ render_serialized_payload { serialize_resource(default_wishlist) }endprivatediff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rbindex 513e50edae..eead77326e 100644--- a/core/app/models/concerns/spree/user_methods.rb+++ b/core/app/models/concerns/spree/user_methods.rb@@ -68,12 +68,8 @@ module Spreeendend- def wishlist(current_store_id)- default_wishlist = wishlists.where(is_default: true).first- default_wishlist ||= wishlists.first- default_wishlist ||= wishlists.create(name: Spree.t(:default_wishlist_name), is_default: true, store_id: current_store_id)- default_wishlist.update_attribute(:is_default, true) unless default_wishlist.is_default?- default_wishlist+ def default_wishlist_for_store(current_store)+ wishlists.find_or_create_by(name: Spree.t(:default_wishlist_name), is_default: true, store_id: current_store.id)endprivatediff --git a/core/app/models/spree/wishlist.rb b/core/app/models/spree/wishlist.rbindex 89d0a6edd6..89eff3d80c 100644--- a/core/app/models/spree/wishlist.rb+++ b/core/app/models/spree/wishlist.rb@@ -24,17 +24,18 @@ module Spreeenddef can_be_read_by?(user)- !is_private? || user == self.user+ public? || user == self.userenddef is_default=(value)self[:is_default] = valuereturn unless is_default?+Spree::Wishlist.where(is_default: true, user_id: user_id).where.not(id: id).update_all(is_default: false)end- def is_public?- !self.is_private?+ def public?+ !is_private?endendend