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.

Consolidate customer metadata to a single column

Łukasz Adamczykefb7f51e2e56
diff --git a/spree/api/spec/controllers/spree/api/v3/store/customers_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/customers_controller_spec.rb
index 36adfc144d..6130e45a06 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/customers_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/customers_controller_spec.rb
@@ -335,12 +335,11 @@ RSpec.describe Spree::Api::V3::Store::CustomersController, type: :controller do
end
it 'ignores restricted attributes' do
- patch :update, params: { first_name: 'John', private_metadata: { secret: 'value' }, internal_note: 'admin only' }
+ patch :update, params: { first_name: 'John', internal_note: 'admin only' }
expect(response).to have_http_status(:ok)
user.reload
expect(user.first_name).to eq('John')
- expect(user.private_metadata).not_to include('secret')
expect(user.internal_note).to be_nil
end
diff --git a/spree/core/app/models/concerns/spree/customer_methods.rb b/spree/core/app/models/concerns/spree/customer_methods.rb
index fba22a9c61..97a995f1ed 100644
--- a/spree/core/app/models/concerns/spree/customer_methods.rb
+++ b/spree/core/app/models/concerns/spree/customer_methods.rb
@@ -4,7 +4,6 @@ module Spree
include Spree::PrefixedId
include Spree::Metafields
- include Spree::Metadata
include Spree::UserAddress
include Spree::UserPaymentSource
include Spree::UserReporting
@@ -16,6 +15,10 @@ module Spree
included do
has_prefix_id :cust # Stripe: cus_
+ # Single consolidated metadata JSON column (docs/plans/decisions.md
+ # 2026-03-16 "Consolidate metadata") — no public/private split.
+ attribute :metadata, default: -> { {} }
+
# Enable lifecycle events for user models
publishes_lifecycle_events
diff --git a/spree/core/db/migrate/20260728000000_create_spree_customers_and_admin_users.rb b/spree/core/db/migrate/20260728000000_create_spree_customers_and_admin_users.rb
index 570455f8c1..897d95243d 100644
--- a/spree/core/db/migrate/20260728000000_create_spree_customers_and_admin_users.rb
+++ b/spree/core/db/migrate/20260728000000_create_spree_customers_and_admin_users.rb
@@ -15,8 +15,6 @@ class CreateSpreeCustomersAndAdminUsers < ActiveRecord::Migration[7.2]
t.integer :failed_attempts
t.datetime :locked_at
- json_columns(t, :public_metadata, :private_metadata)
-
t.timestamps
end
@@ -39,7 +37,8 @@ class CreateSpreeCustomersAndAdminUsers < ActiveRecord::Migration[7.2]
t.integer :failed_attempts
t.datetime :locked_at
- json_columns(t, :public_metadata, :private_metadata)
+ # jsonb on PostgreSQL (binary, indexable); json on MySQL/SQLite.
+ t.respond_to?(:jsonb) ? t.jsonb(:metadata) : t.json(:metadata)
t.timestamps
end
@@ -57,11 +56,4 @@ class CreateSpreeCustomersAndAdminUsers < ActiveRecord::Migration[7.2]
# migration may have found them already present (upgrade / dummy) and must
# not drop a table or column it did not create.
end
-
- private
-
- # jsonb on PostgreSQL (binary, indexable); json on MySQL/SQLite.
- def json_columns(table, *names)
- names.each { |name| table.respond_to?(:jsonb) ? table.jsonb(name) : table.json(name) }
- end
end
diff --git a/spree/core/lib/spree/testing_support/factories/user_factory.rb b/spree/core/lib/spree/testing_support/factories/user_factory.rb
index 039ee0a3d7..7a3fba244a 100644
--- a/spree/core/lib/spree/testing_support/factories/user_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/user_factory.rb
@@ -7,9 +7,6 @@ FactoryBot.define do
first_name { FFaker::Name.first_name }
last_name { FFaker::Name.last_name }
- public_metadata { {} }
- private_metadata { {} }
-
factory :customer_with_addresses, aliases: [:user_with_addresses, :user_with_addreses] do
after(:create) do |customer|
ship_address = create(:address, customer: customer)