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.

Improve default handling.

Matthew Kennedy2db336d32409
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 31a6f100bb..133ffdfe1e 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
@@ -55,7 +55,7 @@ module Spree
end
def wished_product_attributes
- params.require(:wished_product).permit(:variant_id, :quantity, :remark)
+ params.require(:wished_product).permit(permitted_wished_product_attributes)
end
def resource_serializer
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 6c1622af1f..7c758423bf 100644
--- a/api/app/controllers/spree/api/v2/storefront/wishlists_controller.rb
+++ b/api/app/controllers/spree/api/v2/storefront/wishlists_controller.rb
@@ -64,7 +64,7 @@ module Spree
private
def wishlist_attributes
- params.require(:wishlist).permit(:name, :is_default, :is_private)
+ params.require(:wishlist).permit(permitted_wishlist_attributes)
end
def resource
diff --git a/core/app/models/spree/wishlist.rb b/core/app/models/spree/wishlist.rb
index 931a961835..d16430b965 100644
--- a/core/app/models/spree/wishlist.rb
+++ b/core/app/models/spree/wishlist.rb
@@ -7,10 +7,11 @@ module Spree
belongs_to :user, class_name: Spree.user_class.to_s
belongs_to :store, touch: true
+ after_commit :ensure_default_exists_and_is_unique
+
has_many :wished_products, dependent: :destroy
- validates :name, presence: true
- validates :is_default, uniqueness: { scope: [:store] }
+ validates :name, :store, :user, presence: true
def include?(variant_id)
wished_products.map(&:variant_id).include? variant_id.to_i
@@ -28,15 +29,16 @@ module Spree
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 public?
!is_private?
end
+
+ private
+
+ def ensure_default_exists_and_is_unique
+ if is_default?
+ Wishlist.where(is_default: true, user_id: user_id, store_id: store_id).where.not(id: id).update_all(is_default: false)
+ end
+ end
end
end
diff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rb
index cbfb082636..995f693181 100644
--- a/core/lib/spree/permitted_attributes.rb
+++ b/core/lib/spree/permitted_attributes.rb
@@ -143,8 +143,8 @@ module Spree
options: [:name, :value], option_value_ids: []
]
- @@wishlist_attributes = [ :name, :is_default, :is_private ]
+ @@wishlist_attributes = [:name, :is_default, :is_private]
- @@wished_product_attributes = [ :variant_id, :remark, :quantity ]
+ @@wished_product_attributes = [:variant_id, :remark, :quantity]
end
end