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.

Simplify `Spree::Event` model and ensuring deserialiation work

Damian Legawiecd273d7fbdc17
diff --git a/core/app/models/spree/event.rb b/core/app/models/spree/event.rb
index f31ef45ab9..269639d85e 100644
--- a/core/app/models/spree/event.rb
+++ b/core/app/models/spree/event.rb
@@ -33,17 +33,18 @@ module Spree
attribute :metadata, default: -> { {} }
attribute :created_at, :datetime
+ # @param id [String] Optional UUID (generated if not provided)
# @param name [String] The event name (e.g., 'order.complete')
# @param payload [Hash] The serialized event data
# @param metadata [Hash] Additional contextual information
- def initialize(name: nil, payload: {}, metadata: {})
+ # @param created_at [Time, String] Optional timestamp (generated if not provided)
+ def initialize(id: nil, name: nil, payload: {}, metadata: {}, created_at: nil)
super()
- @created_at = Time.current.freeze
- self.id = SecureRandom.uuid
+ self.id = id || SecureRandom.uuid
+ self.created_at = created_at ? Time.zone.parse(created_at.to_s) : Time.current
self.name = name.to_s.freeze if name
self.payload = (payload || {}).deep_stringify_keys.freeze
self.metadata = build_metadata(metadata).freeze
- self.created_at = @created_at
end
# Returns the resource type from the event name
@@ -103,7 +104,6 @@ module Spree
def build_metadata(custom_metadata)
base_metadata = {
- 'created_at' => @created_at.iso8601,
'spree_version' => Spree.version
}
@@ -118,23 +118,7 @@ module Spree
base_metadata['request_id'] = Current.request_id
end
- # Merge custom metadata and ensure IDs are strings for JSON consistency
- base_metadata.merge(stringify_metadata(custom_metadata || {}))
- end
-
- def stringify_metadata(hash)
- hash.deep_stringify_keys.transform_values do |value|
- case value
- when Integer, BigDecimal
- value.to_s
- when Hash
- stringify_metadata(value)
- when Array
- value.map { |v| v.is_a?(Hash) ? stringify_metadata(v) : v }
- else
- value
- end
- end
+ base_metadata.merge((custom_metadata || {}).deep_stringify_keys)
end
end
end
diff --git a/core/spec/models/spree/event_spec.rb b/core/spec/models/spree/event_spec.rb
index 966d23272b..ef65bf4a4a 100644
--- a/core/spec/models/spree/event_spec.rb
+++ b/core/spec/models/spree/event_spec.rb
@@ -137,7 +137,7 @@ RSpec.describe Spree::Event do
expect(hash['name']).to eq('order.complete')
expect(hash['payload']).to eq({ 'id' => 1 })
- expect(hash['metadata']['user_id']).to eq('5')
+ expect(hash['metadata']['user_id']).to eq(5)
expect(hash['created_at']).to eq(event.created_at)
end
end