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.

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.rb
index 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 Spree
module V2
module Storefront
class WishedProductsController < ::Spree::Api::V2::ResourceController
-
def create
spree_authorize! :create, Spree::WishedProduct
spree_authorize! :update, wishlist
@@ -11,7 +10,7 @@ module Spree
wished_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 }
else
wished_product.wishlist = wishlist
wished_product.save
@@ -52,7 +51,7 @@ module Spree
end
def wishlist
- @wishlist ||= Spree::Wishlist.find_by!(token: params[:wishlist_id])
+ @wishlist ||= current_store.wishlists.find_by!(token: params[:wishlist_id])
end
def wished_product_attributes
diff --git a/api/app/controllers/spree/api/v2/storefront/wishlists_controller.rb b/api/app/controllers/spree/api/v2/storefront/wishlists_controller.rb
index 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 Spree
def index
spree_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) }
end
def create
spree_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_user
wishlist.save
if wishlist.persisted?
@@ -56,9 +56,9 @@ module Spree
def default
spree_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) }
end
private
diff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rb
index 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 Spree
end
end
- 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)
end
private
diff --git a/core/app/models/spree/wishlist.rb b/core/app/models/spree/wishlist.rb
index 89d0a6edd6..89eff3d80c 100644
--- a/core/app/models/spree/wishlist.rb
+++ b/core/app/models/spree/wishlist.rb
@@ -24,17 +24,18 @@ module Spree
end
def can_be_read_by?(user)
- !is_private? || user == self.user
+ public? || user == self.user
end
def is_default=(value)
self[:is_default] = value
return 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?
end
end
end