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.

Migrate Events and Webhooks to use Prefixed IDs (#13545)

Damian Legawiecf0cd897798ee
diff --git a/core/app/serializers/spree/events/asset_serializer.rb b/core/app/serializers/spree/events/asset_serializer.rb
index 1e898b2401..b8b4807198 100644
--- a/core/app/serializers/spree/events/asset_serializer.rb
+++ b/core/app/serializers/spree/events/asset_serializer.rb
@@ -7,10 +7,10 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
type: resource.type,
viewable_type: resource.viewable_type,
- viewable_id: resource.viewable_id,
+ viewable_id: public_id(resource.viewable),
position: resource.position,
alt: resource.alt,
created_at: timestamp(resource.created_at),
diff --git a/core/app/serializers/spree/events/base_serializer.rb b/core/app/serializers/spree/events/base_serializer.rb
index a39d302f1c..a52def6dd8 100644
--- a/core/app/serializers/spree/events/base_serializer.rb
+++ b/core/app/serializers/spree/events/base_serializer.rb
@@ -25,7 +25,7 @@ module Spree
# Override in subclasses to define attributes
def attributes
{
- id: resource.id
+ id: public_id(resource)
}
end
@@ -38,6 +38,15 @@ module Spree
context[:triggered_at] || Time.current
end
+ # Returns the public-facing ID for a record.
+ # Prefers prefix_id when available (handles FriendlyId models that
+ # return slugs from to_param), falls back to to_param.
+ def public_id(record)
+ return nil if record.nil?
+
+ record.try(:prefix_id).presence || record.to_param
+ end
+
# Attribute helpers
# Safely get attribute, returns nil if not present
diff --git a/core/app/serializers/spree/events/customer_return_serializer.rb b/core/app/serializers/spree/events/customer_return_serializer.rb
index 3a9a9bebfc..4f4b799c66 100644
--- a/core/app/serializers/spree/events/customer_return_serializer.rb
+++ b/core/app/serializers/spree/events/customer_return_serializer.rb
@@ -7,10 +7,10 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
number: resource.number,
- stock_location_id: resource.stock_location_id,
- store_id: resource.store_id,
+ stock_location_id: public_id(resource.stock_location),
+ store_id: public_id(resource.store),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/digital_link_serializer.rb b/core/app/serializers/spree/events/digital_link_serializer.rb
index 66a8d03cad..87afb7bca9 100644
--- a/core/app/serializers/spree/events/digital_link_serializer.rb
+++ b/core/app/serializers/spree/events/digital_link_serializer.rb
@@ -7,9 +7,9 @@ module Spree
def attributes
{
- id: resource.id,
- digital_id: resource.digital_id,
- line_item_id: resource.line_item_id,
+ id: public_id(resource),
+ digital_id: public_id(resource.digital),
+ line_item_id: public_id(resource.line_item),
access_counter: resource.access_counter,
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
diff --git a/core/app/serializers/spree/events/digital_serializer.rb b/core/app/serializers/spree/events/digital_serializer.rb
index ddce35828e..dec9b48b9a 100644
--- a/core/app/serializers/spree/events/digital_serializer.rb
+++ b/core/app/serializers/spree/events/digital_serializer.rb
@@ -7,8 +7,8 @@ module Spree
def attributes
{
- id: resource.id,
- variant_id: resource.variant_id,
+ id: public_id(resource),
+ variant_id: public_id(resource.variant),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/export_serializer.rb b/core/app/serializers/spree/events/export_serializer.rb
index ea313de947..9e2df6f349 100644
--- a/core/app/serializers/spree/events/export_serializer.rb
+++ b/core/app/serializers/spree/events/export_serializer.rb
@@ -7,12 +7,12 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
number: resource.number,
type: resource.type,
format: resource.format,
- user_id: resource.user_id,
- store_id: resource.store_id,
+ user_id: public_id(resource.user),
+ store_id: public_id(resource.store),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/gift_card_batch_serializer.rb b/core/app/serializers/spree/events/gift_card_batch_serializer.rb
index 767fe9a277..e8fdad48f8 100644
--- a/core/app/serializers/spree/events/gift_card_batch_serializer.rb
+++ b/core/app/serializers/spree/events/gift_card_batch_serializer.rb
@@ -7,14 +7,14 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
codes_count: resource.codes_count,
amount: money(resource.amount),
currency: resource.currency,
prefix: resource.prefix,
expires_at: resource.expires_at&.to_s,
- store_id: resource.store_id,
- created_by_id: resource.created_by_id,
+ store_id: public_id(resource.store),
+ created_by_id: public_id(resource.created_by),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/gift_card_serializer.rb b/core/app/serializers/spree/events/gift_card_serializer.rb
index 37c32f3cf1..d42c0c082c 100644
--- a/core/app/serializers/spree/events/gift_card_serializer.rb
+++ b/core/app/serializers/spree/events/gift_card_serializer.rb
@@ -7,7 +7,7 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
code: resource.code,
state: resource.state.to_s,
amount: money(resource.amount),
@@ -17,9 +17,9 @@ module Spree
currency: resource.currency,
expires_at: resource.expires_at&.iso8601,
redeemed_at: timestamp(resource.redeemed_at),
- user_id: resource.user_id,
- store_id: resource.store_id,
- gift_card_batch_id: resource.gift_card_batch_id,
+ user_id: public_id(resource.user),
+ store_id: public_id(resource.store),
+ gift_card_batch_id: public_id(resource.batch),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/import_row_serializer.rb b/core/app/serializers/spree/events/import_row_serializer.rb
index c20f5c63b4..b2a6b6b986 100644
--- a/core/app/serializers/spree/events/import_row_serializer.rb
+++ b/core/app/serializers/spree/events/import_row_serializer.rb
@@ -7,13 +7,13 @@ module Spree
def attributes
{
- id: resource.id,
- import_id: resource.import_id,
+ id: public_id(resource),
+ import_id: public_id(resource.import),
row_number: resource.row_number,
status: resource.status,
validation_errors: resource.validation_errors,
item_type: resource.item_type,
- item_id: resource.item_id,
+ item_id: public_id(resource.item),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/import_serializer.rb b/core/app/serializers/spree/events/import_serializer.rb
index ee1798c7b5..fb8568503f 100644
--- a/core/app/serializers/spree/events/import_serializer.rb
+++ b/core/app/serializers/spree/events/import_serializer.rb
@@ -7,13 +7,13 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
number: resource.number,
type: resource.type,
status: resource.status.to_s,
owner_type: resource.owner_type,
- owner_id: resource.owner_id,
- user_id: resource.user_id,
+ owner_id: public_id(resource.owner),
+ user_id: public_id(resource.user),
rows_count: resource.rows_count,
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
diff --git a/core/app/serializers/spree/events/invitation_serializer.rb b/core/app/serializers/spree/events/invitation_serializer.rb
index 8f1c1f902a..42db9cfd19 100644
--- a/core/app/serializers/spree/events/invitation_serializer.rb
+++ b/core/app/serializers/spree/events/invitation_serializer.rb
@@ -7,16 +7,16 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
email: resource.email,
status: resource.status.to_s,
resource_type: resource.resource_type,
- resource_id: resource.resource_id,
+ resource_id: public_id(resource.resource),
inviter_type: resource.inviter_type,
- inviter_id: resource.inviter_id,
+ inviter_id: public_id(resource.inviter),
invitee_type: resource.invitee_type,
- invitee_id: resource.invitee_id,
- role_id: resource.role_id,
+ invitee_id: public_id(resource.invitee),
+ role_id: public_id(resource.role),
expires_at: timestamp(resource.expires_at),
accepted_at: timestamp(resource.accepted_at),
created_at: timestamp(resource.created_at),
diff --git a/core/app/serializers/spree/events/line_item_serializer.rb b/core/app/serializers/spree/events/line_item_serializer.rb
index 2fbea9d63b..0673d2cc72 100644
--- a/core/app/serializers/spree/events/line_item_serializer.rb
+++ b/core/app/serializers/spree/events/line_item_serializer.rb
@@ -7,7 +7,7 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
quantity: resource.quantity,
price: money(resource.price),
currency: resource.currency,
@@ -19,9 +19,9 @@ module Spree
pre_tax_amount: money(resource.pre_tax_amount),
taxable_adjustment_total: money(resource.taxable_adjustment_total),
non_taxable_adjustment_total: money(resource.non_taxable_adjustment_total),
- variant_id: resource.variant_id,
- order_id: resource.order_id,
- tax_category_id: resource.tax_category_id,
+ variant_id: public_id(resource.variant),
+ order_id: public_id(resource.order),
+ tax_category_id: public_id(resource.tax_category),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/newsletter_subscriber_serializer.rb b/core/app/serializers/spree/events/newsletter_subscriber_serializer.rb
index ca7d0d4369..3f8a289d9b 100644
--- a/core/app/serializers/spree/events/newsletter_subscriber_serializer.rb
+++ b/core/app/serializers/spree/events/newsletter_subscriber_serializer.rb
@@ -7,11 +7,11 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
email: resource.email,
verified: resource.verified?,
verified_at: timestamp(resource.verified_at),
- user_id: resource.user_id,
+ user_id: public_id(resource.user),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/order_serializer.rb b/core/app/serializers/spree/events/order_serializer.rb
index 7166981a81..0199f039c4 100644
--- a/core/app/serializers/spree/events/order_serializer.rb
+++ b/core/app/serializers/spree/events/order_serializer.rb
@@ -7,7 +7,7 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
number: resource.number,
state: resource.state.to_s,
payment_state: resource.payment_state.to_s,
@@ -22,10 +22,10 @@ module Spree
item_count: resource.item_count,
currency: resource.currency,
email: resource.email,
- user_id: resource.user_id,
- store_id: resource.store_id,
- canceler_id: resource.canceler_id,
- approver_id: resource.approver_id,
+ user_id: public_id(resource.user),
+ store_id: public_id(resource.store),
+ canceler_id: public_id(resource.canceler),
+ approver_id: public_id(resource.approver),
considered_risky: resource.considered_risky,
completed_at: timestamp(resource.completed_at),
canceled_at: timestamp(resource.canceled_at),
diff --git a/core/app/serializers/spree/events/payment_serializer.rb b/core/app/serializers/spree/events/payment_serializer.rb
index 3480ab864f..3e485c54c2 100644
--- a/core/app/serializers/spree/events/payment_serializer.rb
+++ b/core/app/serializers/spree/events/payment_serializer.rb
@@ -7,14 +7,14 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
number: resource.number,
state: resource.state.to_s,
amount: money(resource.amount),
- order_id: resource.order_id,
- payment_method_id: resource.payment_method_id,
+ order_id: public_id(resource.order),
+ payment_method_id: public_id(resource.payment_method),
source_type: resource.source_type,
- source_id: resource.source_id,
+ source_id: public_id(resource.source),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/post_category_serializer.rb b/core/app/serializers/spree/events/post_category_serializer.rb
index 791c07a942..8dacdcee9b 100644
--- a/core/app/serializers/spree/events/post_category_serializer.rb
+++ b/core/app/serializers/spree/events/post_category_serializer.rb
@@ -7,10 +7,10 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
title: resource.title,
slug: resource.slug,
- store_id: resource.store_id,
+ store_id: public_id(resource.store),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/post_serializer.rb b/core/app/serializers/spree/events/post_serializer.rb
index cd2c785eb5..1d5353fc39 100644
--- a/core/app/serializers/spree/events/post_serializer.rb
+++ b/core/app/serializers/spree/events/post_serializer.rb
@@ -7,16 +7,16 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
title: resource.title,
slug: resource.slug,
meta_title: resource.meta_title,
meta_description: resource.meta_description,
published_at: timestamp(resource.published_at),
deleted_at: timestamp(resource.deleted_at),
- author_id: resource.author_id,
- post_category_id: resource.post_category_id,
- store_id: resource.store_id,
+ author_id: public_id(resource.author),
+ post_category_id: public_id(resource.post_category),
+ store_id: public_id(resource.store),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/price_serializer.rb b/core/app/serializers/spree/events/price_serializer.rb
index 4d39500c01..6514e4481f 100644
--- a/core/app/serializers/spree/events/price_serializer.rb
+++ b/core/app/serializers/spree/events/price_serializer.rb
@@ -7,11 +7,11 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
amount: money(resource.amount),
compare_at_amount: money(resource.compare_at_amount),
currency: resource.currency,
- variant_id: resource.variant_id,
+ variant_id: public_id(resource.variant),
deleted_at: timestamp(resource.deleted_at),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
diff --git a/core/app/serializers/spree/events/product_serializer.rb b/core/app/serializers/spree/events/product_serializer.rb
index 49d0bad6dd..fa5408d2ef 100644
--- a/core/app/serializers/spree/events/product_serializer.rb
+++ b/core/app/serializers/spree/events/product_serializer.rb
@@ -7,12 +7,12 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
name: resource.name,
slug: resource.slug,
status: resource.status.to_s,
- tax_category_id: resource.tax_category_id,
- shipping_category_id: resource.shipping_category_id,
+ tax_category_id: public_id(resource.tax_category),
+ shipping_category_id: public_id(resource.shipping_category),
available_on: timestamp(resource.available_on),
discontinue_on: timestamp(resource.discontinue_on),
created_at: timestamp(resource.created_at),
diff --git a/core/app/serializers/spree/events/promotion_serializer.rb b/core/app/serializers/spree/events/promotion_serializer.rb
index 5e0a77de69..e14569e8a8 100644
--- a/core/app/serializers/spree/events/promotion_serializer.rb
+++ b/core/app/serializers/spree/events/promotion_serializer.rb
@@ -7,7 +7,7 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
name: resource.name,
description: resource.description,
code: resource.code,
@@ -22,7 +22,7 @@ module Spree
number_of_codes: resource.number_of_codes,
starts_at: timestamp(resource.starts_at),
expires_at: timestamp(resource.expires_at),
- promotion_category_id: resource.promotion_category_id,
+ promotion_category_id: public_id(resource.promotion_category),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/refund_serializer.rb b/core/app/serializers/spree/events/refund_serializer.rb
index ee1e2cedba..90aa62e258 100644
--- a/core/app/serializers/spree/events/refund_serializer.rb
+++ b/core/app/serializers/spree/events/refund_serializer.rb
@@ -7,13 +7,13 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
amount: money(resource.amount),
transaction_id: resource.transaction_id,
- payment_id: resource.payment_id,
- refund_reason_id: resource.refund_reason_id,
- reimbursement_id: resource.reimbursement_id,
- refunder_id: resource.refunder_id,
+ payment_id: public_id(resource.payment),
+ refund_reason_id: public_id(resource.reason),
+ reimbursement_id: public_id(resource.reimbursement),
+ refunder_id: public_id(resource.refunder),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/reimbursement_serializer.rb b/core/app/serializers/spree/events/reimbursement_serializer.rb
index 040538fcda..fadf354f9a 100644
--- a/core/app/serializers/spree/events/reimbursement_serializer.rb
+++ b/core/app/serializers/spree/events/reimbursement_serializer.rb
@@ -7,12 +7,12 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
number: resource.number,
reimbursement_status: resource.reimbursement_status,
total: money(resource.total),
- order_id: resource.order_id,
- customer_return_id: resource.customer_return_id,
+ order_id: public_id(resource.order),
+ customer_return_id: public_id(resource.customer_return),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/report_serializer.rb b/core/app/serializers/spree/events/report_serializer.rb
index 18601c6a7b..4b14fb82f1 100644
--- a/core/app/serializers/spree/events/report_serializer.rb
+++ b/core/app/serializers/spree/events/report_serializer.rb
@@ -7,10 +7,10 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
type: resource.type,
- store_id: resource.store_id,
- user_id: resource.user_id,
+ store_id: public_id(resource.store),
+ user_id: public_id(resource.user),
currency: resource.currency,
date_from: timestamp(resource.date_from),
date_to: timestamp(resource.date_to),
diff --git a/core/app/serializers/spree/events/return_authorization_serializer.rb b/core/app/serializers/spree/events/return_authorization_serializer.rb
index dfb0975272..ff932c5fa0 100644
--- a/core/app/serializers/spree/events/return_authorization_serializer.rb
+++ b/core/app/serializers/spree/events/return_authorization_serializer.rb
@@ -7,12 +7,12 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
number: resource.number,
state: resource.state.to_s,
- order_id: resource.order_id,
- stock_location_id: resource.stock_location_id,
- return_authorization_reason_id: resource.return_authorization_reason_id,
+ order_id: public_id(resource.order),
+ stock_location_id: public_id(resource.stock_location),
+ return_authorization_reason_id: public_id(resource.reason),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/return_item_serializer.rb b/core/app/serializers/spree/events/return_item_serializer.rb
index bb3f0d0792..6377fdcf98 100644
--- a/core/app/serializers/spree/events/return_item_serializer.rb
+++ b/core/app/serializers/spree/events/return_item_serializer.rb
@@ -7,17 +7,17 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
reception_status: resource.reception_status,
acceptance_status: resource.acceptance_status,
pre_tax_amount: money(resource.pre_tax_amount),
included_tax_total: money(resource.included_tax_total),
additional_tax_total: money(resource.additional_tax_total),
- inventory_unit_id: resource.inventory_unit_id,
- return_authorization_id: resource.return_authorization_id,
- customer_return_id: resource.customer_return_id,
- reimbursement_id: resource.reimbursement_id,
- exchange_variant_id: resource.exchange_variant_id,
+ inventory_unit_id: public_id(resource.inventory_unit),
+ return_authorization_id: public_id(resource.return_authorization),
+ customer_return_id: public_id(resource.customer_return),
+ reimbursement_id: public_id(resource.reimbursement),
+ exchange_variant_id: public_id(resource.exchange_variant),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/shipment_serializer.rb b/core/app/serializers/spree/events/shipment_serializer.rb
index 5e1a318c32..e4c788da0d 100644
--- a/core/app/serializers/spree/events/shipment_serializer.rb
+++ b/core/app/serializers/spree/events/shipment_serializer.rb
@@ -7,13 +7,13 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
number: resource.number,
state: resource.state.to_s,
tracking: resource.tracking,
cost: money(resource.cost),
- order_id: resource.order_id,
- stock_location_id: resource.stock_location_id,
+ order_id: public_id(resource.order),
+ stock_location_id: public_id(resource.stock_location),
shipped_at: timestamp(resource.shipped_at),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
diff --git a/core/app/serializers/spree/events/stock_item_serializer.rb b/core/app/serializers/spree/events/stock_item_serializer.rb
index 513ed12a29..6d6d500214 100644
--- a/core/app/serializers/spree/events/stock_item_serializer.rb
+++ b/core/app/serializers/spree/events/stock_item_serializer.rb
@@ -7,11 +7,11 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
count_on_hand: resource.count_on_hand,
backorderable: resource.backorderable,
- stock_location_id: resource.stock_location_id,
- variant_id: resource.variant_id,
+ stock_location_id: public_id(resource.stock_location),
+ variant_id: public_id(resource.variant),
deleted_at: timestamp(resource.deleted_at),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
diff --git a/core/app/serializers/spree/events/stock_movement_serializer.rb b/core/app/serializers/spree/events/stock_movement_serializer.rb
index e79a4f3cab..e305892571 100644
--- a/core/app/serializers/spree/events/stock_movement_serializer.rb
+++ b/core/app/serializers/spree/events/stock_movement_serializer.rb
@@ -7,12 +7,12 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
quantity: resource.quantity,
action: resource.action,
originator_type: resource.originator_type,
- originator_id: resource.originator_id,
- stock_item_id: resource.stock_item_id,
+ originator_id: public_id(resource.originator),
+ stock_item_id: public_id(resource.stock_item),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/stock_transfer_serializer.rb b/core/app/serializers/spree/events/stock_transfer_serializer.rb
index db669e3c56..6f8dc60673 100644
--- a/core/app/serializers/spree/events/stock_transfer_serializer.rb
+++ b/core/app/serializers/spree/events/stock_transfer_serializer.rb
@@ -7,12 +7,12 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
number: resource.number,
type: resource.type,
reference: resource.reference,
- source_location_id: resource.source_location_id,
- destination_location_id: resource.destination_location_id,
+ source_location_id: public_id(resource.source_location),
+ destination_location_id: public_id(resource.destination_location),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/store_credit_serializer.rb b/core/app/serializers/spree/events/store_credit_serializer.rb
index 0feedea7af..86c64a5263 100644
--- a/core/app/serializers/spree/events/store_credit_serializer.rb
+++ b/core/app/serializers/spree/events/store_credit_serializer.rb
@@ -7,19 +7,19 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
amount: money(resource.amount),
amount_used: money(resource.amount_used),
amount_authorized: money(resource.amount_authorized),
currency: resource.currency,
memo: resource.memo,
- user_id: resource.user_id,
- category_id: resource.category_id,
- type_id: resource.type_id,
- store_id: resource.store_id,
- created_by_id: resource.created_by_id,
+ user_id: public_id(resource.user),
+ category_id: public_id(resource.category),
+ type_id: public_id(resource.credit_type),
+ store_id: public_id(resource.store),
+ created_by_id: public_id(resource.created_by),
originator_type: resource.originator_type,
- originator_id: resource.originator_id,
+ originator_id: public_id(resource.originator),
deleted_at: timestamp(resource.deleted_at),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
diff --git a/core/app/serializers/spree/events/user_serializer.rb b/core/app/serializers/spree/events/user_serializer.rb
index 8df13e10c2..70547cb0f6 100644
--- a/core/app/serializers/spree/events/user_serializer.rb
+++ b/core/app/serializers/spree/events/user_serializer.rb
@@ -7,7 +7,7 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
email: resource.email,
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
diff --git a/core/app/serializers/spree/events/variant_serializer.rb b/core/app/serializers/spree/events/variant_serializer.rb
index d72ab180f2..284ce8b9b2 100644
--- a/core/app/serializers/spree/events/variant_serializer.rb
+++ b/core/app/serializers/spree/events/variant_serializer.rb
@@ -7,7 +7,7 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
sku: resource.sku,
barcode: resource.barcode,
is_master: resource.is_master,
@@ -21,8 +21,8 @@ module Spree
cost_price: money(resource.cost_price),
cost_currency: resource.cost_currency,
track_inventory: resource.track_inventory,
- product_id: resource.product_id,
- tax_category_id: resource.tax_category_id,
+ product_id: public_id(resource.product),
+ tax_category_id: public_id(resource.tax_category),
discontinue_on: timestamp(resource.discontinue_on),
deleted_at: timestamp(resource.deleted_at),
created_at: timestamp(resource.created_at),
diff --git a/core/app/serializers/spree/events/wished_item_serializer.rb b/core/app/serializers/spree/events/wished_item_serializer.rb
index 811acfc73f..0ae3ec4086 100644
--- a/core/app/serializers/spree/events/wished_item_serializer.rb
+++ b/core/app/serializers/spree/events/wished_item_serializer.rb
@@ -7,10 +7,10 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
quantity: resource.quantity,
- variant_id: resource.variant_id,
- wishlist_id: resource.wishlist_id,
+ variant_id: public_id(resource.variant),
+ wishlist_id: public_id(resource.wishlist),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/app/serializers/spree/events/wishlist_serializer.rb b/core/app/serializers/spree/events/wishlist_serializer.rb
index 694bf7341b..382845775e 100644
--- a/core/app/serializers/spree/events/wishlist_serializer.rb
+++ b/core/app/serializers/spree/events/wishlist_serializer.rb
@@ -7,12 +7,12 @@ module Spree
def attributes
{
- id: resource.id,
+ id: public_id(resource),
name: resource.name,
is_private: resource.is_private,
is_default: resource.is_default,
- user_id: resource.user_id,
- store_id: resource.store_id,
+ user_id: public_id(resource.user),
+ store_id: public_id(resource.store),
created_at: timestamp(resource.created_at),
updated_at: timestamp(resource.updated_at)
}
diff --git a/core/spec/serializers/spree/events/asset_serializer_spec.rb b/core/spec/serializers/spree/events/asset_serializer_spec.rb
index 3f11e786da..2ba5b389f3 100644
--- a/core/spec/serializers/spree/events/asset_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/asset_serializer_spec.rb
@@ -11,13 +11,13 @@ RSpec.describe Spree::Events::AssetSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(asset.id)
+ expect(subject[:id]).to eq(asset.prefix_id)
expect(subject[:type]).to eq(asset.type)
end
it 'includes viewable polymorphic reference' do
expect(subject[:viewable_type]).to eq('Spree::Variant')
- expect(subject[:viewable_id]).to eq(variant.id)
+ expect(subject[:viewable_id]).to eq(variant.prefix_id)
end
it 'includes position' do
diff --git a/core/spec/serializers/spree/events/customer_return_serializer_spec.rb b/core/spec/serializers/spree/events/customer_return_serializer_spec.rb
index 839689e952..affa739fa2 100644
--- a/core/spec/serializers/spree/events/customer_return_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/customer_return_serializer_spec.rb
@@ -9,12 +9,12 @@ RSpec.describe Spree::Events::CustomerReturnSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(customer_return.id)
+ expect(subject[:id]).to eq(customer_return.prefix_id)
expect(subject[:number]).to eq(customer_return.number)
end
it 'includes foreign keys' do
- expect(subject[:stock_location_id]).to eq(customer_return.stock_location_id)
+ expect(subject[:stock_location_id]).to eq(customer_return.stock_location&.prefix_id)
expect(subject).to have_key(:store_id)
end
diff --git a/core/spec/serializers/spree/events/digital_link_serializer_spec.rb b/core/spec/serializers/spree/events/digital_link_serializer_spec.rb
index 7d5c0eb1c4..2dd4c43540 100644
--- a/core/spec/serializers/spree/events/digital_link_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/digital_link_serializer_spec.rb
@@ -9,12 +9,12 @@ RSpec.describe Spree::Events::DigitalLinkSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(digital_link.id)
+ expect(subject[:id]).to eq(digital_link.prefix_id)
end
it 'includes foreign keys' do
- expect(subject[:digital_id]).to eq(digital_link.digital_id)
- expect(subject[:line_item_id]).to eq(digital_link.line_item_id)
+ expect(subject[:digital_id]).to eq(digital_link.digital&.prefix_id)
+ expect(subject[:line_item_id]).to eq(digital_link.line_item&.prefix_id)
end
it 'includes access_counter' do
diff --git a/core/spec/serializers/spree/events/digital_serializer_spec.rb b/core/spec/serializers/spree/events/digital_serializer_spec.rb
index c9f60907ab..13f01e3568 100644
--- a/core/spec/serializers/spree/events/digital_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/digital_serializer_spec.rb
@@ -10,11 +10,11 @@ RSpec.describe Spree::Events::DigitalSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(digital.id)
+ expect(subject[:id]).to eq(digital.prefix_id)
end
it 'includes variant_id' do
- expect(subject[:variant_id]).to eq(variant.id)
+ expect(subject[:variant_id]).to eq(variant.prefix_id)
end
it 'includes timestamps' do
diff --git a/core/spec/serializers/spree/events/export_serializer_spec.rb b/core/spec/serializers/spree/events/export_serializer_spec.rb
index ebd8c6f2cd..93f876a92b 100644
--- a/core/spec/serializers/spree/events/export_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/export_serializer_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Spree::Events::ExportSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(export.id)
+ expect(subject[:id]).to eq(export.prefix_id)
expect(subject[:number]).to eq(export.number)
end
@@ -24,8 +24,8 @@ RSpec.describe Spree::Events::ExportSerializer do
end
it 'includes foreign keys' do
- expect(subject[:user_id]).to eq(admin_user.id)
- expect(subject[:store_id]).to eq(store.id)
+ expect(subject[:user_id]).to eq(admin_user.prefix_id)
+ expect(subject[:store_id]).to eq(store.prefix_id)
end
it 'includes timestamps' do
diff --git a/core/spec/serializers/spree/events/gift_card_batch_serializer_spec.rb b/core/spec/serializers/spree/events/gift_card_batch_serializer_spec.rb
index 0461ea9585..2565f50db5 100644
--- a/core/spec/serializers/spree/events/gift_card_batch_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/gift_card_batch_serializer_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Spree::Events::GiftCardBatchSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(gift_card_batch.id)
+ expect(subject[:id]).to eq(gift_card_batch.prefix_id)
end
it 'includes codes_count' do
@@ -40,8 +40,8 @@ RSpec.describe Spree::Events::GiftCardBatchSerializer do
end
it 'includes foreign keys' do
- expect(subject[:store_id]).to eq(store.id)
- expect(subject[:created_by_id]).to eq(admin_user.id)
+ expect(subject[:store_id]).to eq(store.prefix_id)
+ expect(subject[:created_by_id]).to eq(admin_user.prefix_id)
end
it 'includes timestamps' do
diff --git a/core/spec/serializers/spree/events/gift_card_serializer_spec.rb b/core/spec/serializers/spree/events/gift_card_serializer_spec.rb
index a8cb3c638d..48e2d02dfe 100644
--- a/core/spec/serializers/spree/events/gift_card_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/gift_card_serializer_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Spree::Events::GiftCardSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(gift_card.id)
+ expect(subject[:id]).to eq(gift_card.prefix_id)
expect(subject[:code]).to eq(gift_card.code)
end
@@ -37,7 +37,7 @@ RSpec.describe Spree::Events::GiftCardSerializer do
end
it 'includes foreign keys' do
- expect(subject[:store_id]).to eq(store.id)
+ expect(subject[:store_id]).to eq(store.prefix_id)
expect(subject).to have_key(:user_id)
expect(subject).to have_key(:gift_card_batch_id)
end
diff --git a/core/spec/serializers/spree/events/import_row_serializer_spec.rb b/core/spec/serializers/spree/events/import_row_serializer_spec.rb
index 6a6b1e8b09..b25b799ab3 100644
--- a/core/spec/serializers/spree/events/import_row_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/import_row_serializer_spec.rb
@@ -21,11 +21,11 @@ RSpec.describe Spree::Events::ImportRowSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(import_row.id)
+ expect(subject[:id]).to eq(import_row.prefix_id)
end
it 'includes import reference' do
- expect(subject[:import_id]).to eq(import.id)
+ expect(subject[:import_id]).to eq(import.prefix_id)
end
it 'includes row_number' do
@@ -42,7 +42,7 @@ RSpec.describe Spree::Events::ImportRowSerializer do
it 'includes item polymorphic reference' do
expect(subject[:item_type]).to eq('Spree::Product')
- expect(subject[:item_id]).to eq(product.id)
+ expect(subject[:item_id]).to eq(product.prefix_id)
end
it 'includes timestamps' do
diff --git a/core/spec/serializers/spree/events/import_serializer_spec.rb b/core/spec/serializers/spree/events/import_serializer_spec.rb
index 307c9314eb..3e176d084a 100644
--- a/core/spec/serializers/spree/events/import_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/import_serializer_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Spree::Events::ImportSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(import.id)
+ expect(subject[:id]).to eq(import.prefix_id)
expect(subject[:number]).to eq(import.number)
end
@@ -25,11 +25,11 @@ RSpec.describe Spree::Events::ImportSerializer do
it 'includes owner polymorphic reference' do
expect(subject[:owner_type]).to eq('Spree::Store')
- expect(subject[:owner_id]).to eq(store.id)
+ expect(subject[:owner_id]).to eq(store.prefix_id)
end
it 'includes user_id' do
- expect(subject[:user_id]).to eq(admin_user.id)
+ expect(subject[:user_id]).to eq(admin_user.prefix_id)
end
it 'includes rows_count' do
diff --git a/core/spec/serializers/spree/events/invitation_serializer_spec.rb b/core/spec/serializers/spree/events/invitation_serializer_spec.rb
index 9004e42c04..5920c340ce 100644
--- a/core/spec/serializers/spree/events/invitation_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/invitation_serializer_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Spree::Events::InvitationSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(invitation.id)
+ expect(subject[:id]).to eq(invitation.prefix_id)
expect(subject[:email]).to eq(invitation.email)
end
@@ -19,12 +19,12 @@ RSpec.describe Spree::Events::InvitationSerializer do
it 'includes resource polymorphic reference' do
expect(subject[:resource_type]).to eq(invitation.resource_type)
- expect(subject[:resource_id]).to eq(invitation.resource_id)
+ expect(subject[:resource_id]).to eq(invitation.resource&.prefix_id)
end
it 'includes inviter polymorphic reference' do
expect(subject[:inviter_type]).to eq(invitation.inviter_type)
- expect(subject[:inviter_id]).to eq(invitation.inviter_id)
+ expect(subject[:inviter_id]).to eq(invitation.inviter&.prefix_id)
end
it 'includes invitee polymorphic reference' do
@@ -33,7 +33,7 @@ RSpec.describe Spree::Events::InvitationSerializer do
end
it 'includes role_id' do
- expect(subject[:role_id]).to eq(invitation.role_id)
+ expect(subject[:role_id]).to eq(invitation.role&.prefix_id)
end
it 'includes dates' do
diff --git a/core/spec/serializers/spree/events/line_item_serializer_spec.rb b/core/spec/serializers/spree/events/line_item_serializer_spec.rb
index cf785da085..e08705d723 100644
--- a/core/spec/serializers/spree/events/line_item_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/line_item_serializer_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Spree::Events::LineItemSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(line_item.id)
+ expect(subject[:id]).to eq(line_item.prefix_id)
end
it 'includes quantity' do
@@ -34,8 +34,8 @@ RSpec.describe Spree::Events::LineItemSerializer do
end
it 'includes foreign keys' do
- expect(subject[:variant_id]).to eq(line_item.variant_id)
- expect(subject[:order_id]).to eq(order.id)
+ expect(subject[:variant_id]).to eq(line_item.variant&.prefix_id)
+ expect(subject[:order_id]).to eq(order.prefix_id)
expect(subject).to have_key(:tax_category_id)
end
diff --git a/core/spec/serializers/spree/events/newsletter_subscriber_serializer_spec.rb b/core/spec/serializers/spree/events/newsletter_subscriber_serializer_spec.rb
index c359885b34..cd6c851edb 100644
--- a/core/spec/serializers/spree/events/newsletter_subscriber_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/newsletter_subscriber_serializer_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Spree::Events::NewsletterSubscriberSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(subscriber.id)
+ expect(subject[:id]).to eq(subscriber.prefix_id)
expect(subject[:email]).to eq('[email protected]')
end
diff --git a/core/spec/serializers/spree/events/order_serializer_spec.rb b/core/spec/serializers/spree/events/order_serializer_spec.rb
index 51498713d6..2b4a1a9a0d 100644
--- a/core/spec/serializers/spree/events/order_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/order_serializer_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Spree::Events::OrderSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(order.id)
+ expect(subject[:id]).to eq(order.prefix_id)
expect(subject[:number]).to eq(order.number)
end
@@ -48,8 +48,8 @@ RSpec.describe Spree::Events::OrderSerializer do
end
it 'includes foreign keys' do
- expect(subject[:user_id]).to eq(user.id)
- expect(subject[:store_id]).to eq(store.id)
+ expect(subject[:user_id]).to eq(user.prefix_id)
+ expect(subject[:store_id]).to eq(store.prefix_id)
end
it 'includes timestamps' do
diff --git a/core/spec/serializers/spree/events/payment_serializer_spec.rb b/core/spec/serializers/spree/events/payment_serializer_spec.rb
index 55468864e0..e756825e7c 100644
--- a/core/spec/serializers/spree/events/payment_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/payment_serializer_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Spree::Events::PaymentSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(payment.id)
+ expect(subject[:id]).to eq(payment.prefix_id)
expect(subject[:number]).to eq(payment.number)
end
@@ -30,8 +30,8 @@ RSpec.describe Spree::Events::PaymentSerializer do
end
it 'includes foreign keys' do
- expect(subject[:order_id]).to eq(order.id)
- expect(subject[:payment_method_id]).to eq(payment_method.id)
+ expect(subject[:order_id]).to eq(order.prefix_id)
+ expect(subject[:payment_method_id]).to eq(payment_method.prefix_id)
end
it 'includes source polymorphic reference' do
diff --git a/core/spec/serializers/spree/events/post_category_serializer_spec.rb b/core/spec/serializers/spree/events/post_category_serializer_spec.rb
index 9025f7253f..6c5251688d 100644
--- a/core/spec/serializers/spree/events/post_category_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/post_category_serializer_spec.rb
@@ -10,13 +10,13 @@ RSpec.describe Spree::Events::PostCategorySerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(post_category.id)
+ expect(subject[:id]).to eq(post_category.prefix_id)
expect(subject[:title]).to eq('News')
expect(subject[:slug]).to eq(post_category.slug)
end
it 'includes store_id' do
- expect(subject[:store_id]).to eq(store.id)
+ expect(subject[:store_id]).to eq(store.prefix_id)
end
it 'includes timestamps' do
diff --git a/core/spec/serializers/spree/events/post_serializer_spec.rb b/core/spec/serializers/spree/events/post_serializer_spec.rb
index 6424a7bd61..a3b153a797 100644
--- a/core/spec/serializers/spree/events/post_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/post_serializer_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Spree::Events::PostSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(post.id)
+ expect(subject[:id]).to eq(post.prefix_id)
expect(subject[:title]).to eq('Test Post')
expect(subject[:slug]).to eq(post.slug)
end
@@ -38,9 +38,9 @@ RSpec.describe Spree::Events::PostSerializer do
end
it 'includes foreign keys' do
- expect(subject[:author_id]).to eq(author.id)
- expect(subject[:post_category_id]).to eq(post_category.id)
- expect(subject[:store_id]).to eq(store.id)
+ expect(subject[:author_id]).to eq(author.prefix_id)
+ expect(subject[:post_category_id]).to eq(post_category.prefix_id)
+ expect(subject[:store_id]).to eq(store.prefix_id)
end
it 'includes timestamps' do
diff --git a/core/spec/serializers/spree/events/price_serializer_spec.rb b/core/spec/serializers/spree/events/price_serializer_spec.rb
index 13e24a03ae..ff7a9b4493 100644
--- a/core/spec/serializers/spree/events/price_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/price_serializer_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Spree::Events::PriceSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(price.id)
+ expect(subject[:id]).to eq(price.prefix_id)
end
it 'includes amount fields' do
@@ -20,7 +20,7 @@ RSpec.describe Spree::Events::PriceSerializer do
end
it 'includes variant_id' do
- expect(subject[:variant_id]).to eq(variant.id)
+ expect(subject[:variant_id]).to eq(variant.prefix_id)
end
it 'includes deleted_at' do
diff --git a/core/spec/serializers/spree/events/product_serializer_spec.rb b/core/spec/serializers/spree/events/product_serializer_spec.rb
index 31fda92639..5d6d7899dc 100644
--- a/core/spec/serializers/spree/events/product_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/product_serializer_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Spree::Events::ProductSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(product.id)
+ expect(subject[:id]).to eq(product.prefix_id)
expect(subject[:name]).to eq('Test Product')
expect(subject[:slug]).to eq(product.slug)
end
diff --git a/core/spec/serializers/spree/events/promotion_serializer_spec.rb b/core/spec/serializers/spree/events/promotion_serializer_spec.rb
index 2a088e71a9..9df057c17e 100644
--- a/core/spec/serializers/spree/events/promotion_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/promotion_serializer_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Spree::Events::PromotionSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(promotion.id)
+ expect(subject[:id]).to eq(promotion.prefix_id)
expect(subject[:name]).to eq('Test Promotion')
end
diff --git a/core/spec/serializers/spree/events/refund_serializer_spec.rb b/core/spec/serializers/spree/events/refund_serializer_spec.rb
index d6a14733c4..d0b6630477 100644
--- a/core/spec/serializers/spree/events/refund_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/refund_serializer_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Spree::Events::RefundSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(refund.id)
+ expect(subject[:id]).to eq(refund.prefix_id)
end
it 'includes amount' do
@@ -22,7 +22,7 @@ RSpec.describe Spree::Events::RefundSerializer do
end
it 'includes foreign keys' do
- expect(subject[:payment_id]).to eq(refund.payment_id)
+ expect(subject[:payment_id]).to eq(refund.payment&.prefix_id)
expect(subject).to have_key(:refund_reason_id)
expect(subject).to have_key(:reimbursement_id)
expect(subject).to have_key(:refunder_id)
diff --git a/core/spec/serializers/spree/events/reimbursement_serializer_spec.rb b/core/spec/serializers/spree/events/reimbursement_serializer_spec.rb
index 1a4028a2af..4d8e72c2cb 100644
--- a/core/spec/serializers/spree/events/reimbursement_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/reimbursement_serializer_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Spree::Events::ReimbursementSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(reimbursement.id)
+ expect(subject[:id]).to eq(reimbursement.prefix_id)
expect(subject[:number]).to eq(reimbursement.number)
end
@@ -22,8 +22,8 @@ RSpec.describe Spree::Events::ReimbursementSerializer do
end
it 'includes foreign keys' do
- expect(subject[:order_id]).to eq(reimbursement.order_id)
- expect(subject[:customer_return_id]).to eq(reimbursement.customer_return_id)
+ expect(subject[:order_id]).to eq(reimbursement.order&.prefix_id)
+ expect(subject[:customer_return_id]).to eq(reimbursement.customer_return&.prefix_id)
end
it 'includes timestamps' do
diff --git a/core/spec/serializers/spree/events/report_serializer_spec.rb b/core/spec/serializers/spree/events/report_serializer_spec.rb
index 74bb4f1fb9..3398b6f3ab 100644
--- a/core/spec/serializers/spree/events/report_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/report_serializer_spec.rb
@@ -19,16 +19,16 @@ RSpec.describe Spree::Events::ReportSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(report.id)
+ expect(subject[:id]).to eq(report.prefix_id)
expect(subject[:type]).to eq(report.type)
end
it 'includes store reference' do
- expect(subject[:store_id]).to eq(store.id)
+ expect(subject[:store_id]).to eq(store.prefix_id)
end
it 'includes user reference' do
- expect(subject[:user_id]).to eq(user.id)
+ expect(subject[:user_id]).to eq(user.prefix_id)
end
it 'includes currency' do
diff --git a/core/spec/serializers/spree/events/return_authorization_serializer_spec.rb b/core/spec/serializers/spree/events/return_authorization_serializer_spec.rb
index 95329f5368..71e7369d9d 100644
--- a/core/spec/serializers/spree/events/return_authorization_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/return_authorization_serializer_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Spree::Events::ReturnAuthorizationSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(return_authorization.id)
+ expect(subject[:id]).to eq(return_authorization.prefix_id)
expect(subject[:number]).to eq(return_authorization.number)
end
@@ -18,8 +18,8 @@ RSpec.describe Spree::Events::ReturnAuthorizationSerializer do
end
it 'includes foreign keys' do
- expect(subject[:order_id]).to eq(return_authorization.order_id)
- expect(subject[:stock_location_id]).to eq(return_authorization.stock_location_id)
+ expect(subject[:order_id]).to eq(return_authorization.order&.prefix_id)
+ expect(subject[:stock_location_id]).to eq(return_authorization.stock_location&.prefix_id)
expect(subject).to have_key(:return_authorization_reason_id)
end
diff --git a/core/spec/serializers/spree/events/return_item_serializer_spec.rb b/core/spec/serializers/spree/events/return_item_serializer_spec.rb
index 15467cb855..90c556e71b 100644
--- a/core/spec/serializers/spree/events/return_item_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/return_item_serializer_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Spree::Events::ReturnItemSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(return_item.id)
+ expect(subject[:id]).to eq(return_item.prefix_id)
end
it 'includes status fields' do
@@ -24,8 +24,8 @@ RSpec.describe Spree::Events::ReturnItemSerializer do
end
it 'includes foreign keys' do
- expect(subject[:inventory_unit_id]).to eq(return_item.inventory_unit_id)
- expect(subject[:return_authorization_id]).to eq(return_item.return_authorization_id)
+ expect(subject[:inventory_unit_id]).to eq(return_item.inventory_unit&.prefix_id)
+ expect(subject[:return_authorization_id]).to eq(return_item.return_authorization&.prefix_id)
expect(subject).to have_key(:customer_return_id)
expect(subject).to have_key(:reimbursement_id)
expect(subject).to have_key(:exchange_variant_id)
diff --git a/core/spec/serializers/spree/events/shipment_serializer_spec.rb b/core/spec/serializers/spree/events/shipment_serializer_spec.rb
index c730b2afd5..51172333b1 100644
--- a/core/spec/serializers/spree/events/shipment_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/shipment_serializer_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Spree::Events::ShipmentSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(shipment.id)
+ expect(subject[:id]).to eq(shipment.prefix_id)
expect(subject[:number]).to eq(shipment.number)
end
@@ -26,8 +26,8 @@ RSpec.describe Spree::Events::ShipmentSerializer do
end
it 'includes foreign keys' do
- expect(subject[:order_id]).to eq(shipment.order_id)
- expect(subject[:stock_location_id]).to eq(shipment.stock_location_id)
+ expect(subject[:order_id]).to eq(shipment.order&.prefix_id)
+ expect(subject[:stock_location_id]).to eq(shipment.stock_location&.prefix_id)
end
it 'includes timestamps' do
diff --git a/core/spec/serializers/spree/events/stock_item_serializer_spec.rb b/core/spec/serializers/spree/events/stock_item_serializer_spec.rb
index 4dc94fbb8d..21d0e8eb12 100644
--- a/core/spec/serializers/spree/events/stock_item_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/stock_item_serializer_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Spree::Events::StockItemSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(stock_item.id)
+ expect(subject[:id]).to eq(stock_item.prefix_id)
end
it 'includes count_on_hand' do
@@ -23,8 +23,8 @@ RSpec.describe Spree::Events::StockItemSerializer do
end
it 'includes foreign keys' do
- expect(subject[:stock_location_id]).to eq(stock_item.stock_location_id)
- expect(subject[:variant_id]).to eq(stock_item.variant_id)
+ expect(subject[:stock_location_id]).to eq(stock_item.stock_location&.prefix_id)
+ expect(subject[:variant_id]).to eq(stock_item.variant&.prefix_id)
end
it 'includes deleted_at' do
diff --git a/core/spec/serializers/spree/events/stock_movement_serializer_spec.rb b/core/spec/serializers/spree/events/stock_movement_serializer_spec.rb
index 9d60e53fa5..bb7153c41b 100644
--- a/core/spec/serializers/spree/events/stock_movement_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/stock_movement_serializer_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Spree::Events::StockMovementSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(stock_movement.id)
+ expect(subject[:id]).to eq(stock_movement.prefix_id)
end
it 'includes quantity' do
@@ -29,7 +29,7 @@ RSpec.describe Spree::Events::StockMovementSerializer do
end
it 'includes stock_item_id' do
- expect(subject[:stock_item_id]).to eq(stock_item.id)
+ expect(subject[:stock_item_id]).to eq(stock_item.prefix_id)
end
it 'includes timestamps' do
diff --git a/core/spec/serializers/spree/events/stock_transfer_serializer_spec.rb b/core/spec/serializers/spree/events/stock_transfer_serializer_spec.rb
index 5c2e2904b1..9a47832d08 100644
--- a/core/spec/serializers/spree/events/stock_transfer_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/stock_transfer_serializer_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Spree::Events::StockTransferSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(stock_transfer.id)
+ expect(subject[:id]).to eq(stock_transfer.prefix_id)
expect(subject[:number]).to eq(stock_transfer.number)
end
@@ -29,8 +29,8 @@ RSpec.describe Spree::Events::StockTransferSerializer do
end
it 'includes location foreign keys' do
- expect(subject[:source_location_id]).to eq(source_location.id)
- expect(subject[:destination_location_id]).to eq(destination_location.id)
+ expect(subject[:source_location_id]).to eq(source_location.prefix_id)
+ expect(subject[:destination_location_id]).to eq(destination_location.prefix_id)
end
it 'includes timestamps' do
diff --git a/core/spec/serializers/spree/events/store_credit_serializer_spec.rb b/core/spec/serializers/spree/events/store_credit_serializer_spec.rb
index 9c2398d091..47c9ff63fe 100644
--- a/core/spec/serializers/spree/events/store_credit_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/store_credit_serializer_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Spree::Events::StoreCreditSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(store_credit.id)
+ expect(subject[:id]).to eq(store_credit.prefix_id)
end
it 'includes amount fields' do
@@ -34,8 +34,8 @@ RSpec.describe Spree::Events::StoreCreditSerializer do
end
it 'includes user foreign keys' do
- expect(subject[:user_id]).to eq(user.id)
- expect(subject[:created_by_id]).to eq(admin_user.id)
+ expect(subject[:user_id]).to eq(user.prefix_id)
+ expect(subject[:created_by_id]).to eq(admin_user.prefix_id)
end
it 'includes category and type ids' do
@@ -44,7 +44,7 @@ RSpec.describe Spree::Events::StoreCreditSerializer do
end
it 'includes store_id' do
- expect(subject[:store_id]).to eq(store.id)
+ expect(subject[:store_id]).to eq(store.prefix_id)
end
it 'includes originator polymorphic reference' do
diff --git a/core/spec/serializers/spree/events/user_serializer_spec.rb b/core/spec/serializers/spree/events/user_serializer_spec.rb
index da0c5780b8..5cf9cb7c38 100644
--- a/core/spec/serializers/spree/events/user_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/user_serializer_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Spree::Events::UserSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(user.id)
+ expect(subject[:id]).to eq(user.prefix_id)
expect(subject[:email]).to eq('[email protected]')
end
diff --git a/core/spec/serializers/spree/events/variant_serializer_spec.rb b/core/spec/serializers/spree/events/variant_serializer_spec.rb
index e6d26ab3ac..0061336996 100644
--- a/core/spec/serializers/spree/events/variant_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/variant_serializer_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Spree::Events::VariantSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(variant.id)
+ expect(subject[:id]).to eq(variant.prefix_id)
expect(subject[:sku]).to eq('TEST-SKU-001')
end
@@ -45,7 +45,7 @@ RSpec.describe Spree::Events::VariantSerializer do
end
it 'includes foreign keys' do
- expect(subject[:product_id]).to eq(product.id)
+ expect(subject[:product_id]).to eq(product.prefix_id)
expect(subject).to have_key(:tax_category_id)
end
diff --git a/core/spec/serializers/spree/events/wished_item_serializer_spec.rb b/core/spec/serializers/spree/events/wished_item_serializer_spec.rb
index 42f83b2c2c..10a6217282 100644
--- a/core/spec/serializers/spree/events/wished_item_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/wished_item_serializer_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Spree::Events::WishedItemSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(wished_item.id)
+ expect(subject[:id]).to eq(wished_item.prefix_id)
end
it 'includes quantity' do
@@ -20,8 +20,8 @@ RSpec.describe Spree::Events::WishedItemSerializer do
end
it 'includes foreign keys' do
- expect(subject[:variant_id]).to eq(variant.id)
- expect(subject[:wishlist_id]).to eq(wishlist.id)
+ expect(subject[:variant_id]).to eq(variant.prefix_id)
+ expect(subject[:wishlist_id]).to eq(wishlist.prefix_id)
end
it 'includes timestamps' do
diff --git a/core/spec/serializers/spree/events/wishlist_serializer_spec.rb b/core/spec/serializers/spree/events/wishlist_serializer_spec.rb
index 02b12a6b94..cea30888a9 100644
--- a/core/spec/serializers/spree/events/wishlist_serializer_spec.rb
+++ b/core/spec/serializers/spree/events/wishlist_serializer_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe Spree::Events::WishlistSerializer do
describe '#as_json' do
it 'includes identity attributes' do
- expect(subject[:id]).to eq(wishlist.id)
+ expect(subject[:id]).to eq(wishlist.prefix_id)
expect(subject[:name]).to eq('My Wishlist')
end
@@ -28,8 +28,8 @@ RSpec.describe Spree::Events::WishlistSerializer do
end
it 'includes foreign keys' do
- expect(subject[:user_id]).to eq(user.id)
- expect(subject[:store_id]).to eq(store.id)
+ expect(subject[:user_id]).to eq(user.prefix_id)
+ expect(subject[:store_id]).to eq(store.prefix_id)
end
it 'includes timestamps' do