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
Added `Asset#session_id`
Damian Legawiecffc3797386cc
diff --git a/admin/app/helpers/spree/admin/session_assets_helper.rb b/admin/app/helpers/spree/admin/session_assets_helper.rbindex 0ba8262076..e4c011d6ec 100644--- a/admin/app/helpers/spree/admin/session_assets_helper.rb+++ b/admin/app/helpers/spree/admin/session_assets_helper.rb@@ -7,7 +7,7 @@ module Spreedef store_uploaded_asset_in_session(asset)ensure_session_uploaded_assets_uuid- asset.update(session_uploaded_assets_uuid: session['spree.admin.uploaded_assets.uuid'])+ asset.update(session_id: session['spree.admin.uploaded_assets.uuid'])enddef session_uploaded_assetsdiff --git a/admin/spec/controllers/spree/admin/assets_controller_spec.rb b/admin/spec/controllers/spree/admin/assets_controller_spec.rbindex cde20672ef..123628f50b 100644--- a/admin/spec/controllers/spree/admin/assets_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/assets_controller_spec.rb@@ -25,7 +25,7 @@ describe Spree::Admin::AssetsController, type: :controller doexpect(asset.alt).to eq("some text")expect(asset.attached?).to be trueexpect(asset.viewable).to be_nil- expect(asset.session_uploaded_assets_uuid).to eq(request.session['spree.admin.uploaded_assets.uuid'])+ expect(asset.session_id).to eq(request.session['spree.admin.uploaded_assets.uuid'])endend@@ -42,7 +42,7 @@ describe Spree::Admin::AssetsController, type: :controller doexpect(response).to have_http_status(:ok)expect(asset.viewable).to eq(product.master)- expect(asset.session_uploaded_assets_uuid).to be_nil+ expect(asset.session_id).to be_nilendendenddiff --git a/core/app/models/spree/asset.rb b/core/app/models/spree/asset.rbindex 74bc5cdbf4..e819394629 100644--- a/core/app/models/spree/asset.rb+++ b/core/app/models/spree/asset.rb@@ -17,12 +17,7 @@ module Spreestore_accessor :private_metadata, :session_uploaded_assets_uuidscope :with_session_uploaded_assets_uuid, lambda { |uuid|- case ActiveRecord::Base.connection.adapter_name- when 'PostgreSQL'- where("#{table_name}.private_metadata @> ?", { session_uploaded_assets_uuid: uuid }.to_json)- when 'Mysql2', 'SQLite'- where("JSON_EXTRACT(private_metadata, '$.session_uploaded_assets_uuid') = '#{uuid}'")- end+ where(session_id: uuid)}def productdiff --git a/core/db/migrate/20250509143831_add_session_id_to_spree_assets.rb b/core/db/migrate/20250509143831_add_session_id_to_spree_assets.rbnew file mode 100644index 0000000000..f979d0379b--- /dev/null+++ b/core/db/migrate/20250509143831_add_session_id_to_spree_assets.rb@@ -0,0 +1,5 @@+class AddSessionIdToSpreeAssets < ActiveRecord::Migration[7.2]+ def change+ add_column :spree_assets, :session_id, :string+ end+enddiff --git a/core/spec/models/spree/asset_spec.rb b/core/spec/models/spree/asset_spec.rbindex 473104fe51..5a3a082b72 100644--- a/core/spec/models/spree/asset_spec.rb+++ b/core/spec/models/spree/asset_spec.rb@@ -53,8 +53,8 @@ describe Spree::Asset, type: :model dodescribe '.with_session_uploaded_assets_uuid' dosubject { described_class.with_session_uploaded_assets_uuid(uuid) }- let!(:assets) { create_list(:asset, 2, session_uploaded_assets_uuid: uuid) }- let!(:other_assets) { create_list(:asset, 2, session_uploaded_assets_uuid: SecureRandom.uuid) }+ let!(:assets) { create_list(:asset, 2, session_id: uuid) }+ let!(:other_assets) { create_list(:asset, 2, session_id: SecureRandom.uuid) }let(:uuid) { SecureRandom.uuid }