spree_api 6.0.0.beta4 → 6.0.0.rc2

data/app/serializers/spree/api/v3/admin/payment_split_serializer.rb

@@ -11,23 +11,22 @@ module Spree
           AMOUNTS = %i[authorized_amount captured_amount refunded_amount claimed_amount
                        net_captured_amount refundable_amount].freeze
 
-          typelize currency: :string,
+          typelize currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    payment_id: :string,
                    payment_number: 'string | null',
                    order_id: :string,
                    order_number: 'string | null',
-                   authorized_amount: :string, display_authorized_amount: :string,
-                   captured_amount: :string, display_captured_amount: :string,
-                   refunded_amount: :string, display_refunded_amount: :string,
-                   claimed_amount: :string, display_claimed_amount: :string,
-                   net_captured_amount: :string, display_net_captured_amount: :string,
-                   refundable_amount: :string, display_refundable_amount: :string
+                   authorized_amount: :string,
+                   captured_amount: :string,
+                   refunded_amount: :string,
+                   claimed_amount: :string,
+                   net_captured_amount: :string,
+                   refundable_amount: :string
 
           attributes :currency, created_at: :iso8601, updated_at: :iso8601
 
           AMOUNTS.each do |amount|
-            attribute(amount) { |split| split.public_send(amount).to_s }
-            attribute(:"display_#{amount}") { |split| split.public_send(:"display_#{amount}").to_s }
+            attribute(amount) { |split| Spree::Money::Rounding.format(split.public_send(amount), split.currency) }
           end
 
           attribute(:payment_id) { |split| split.payment&.prefixed_id }

data/app/serializers/spree/api/v3/admin/permission_serializer.rb

@@ -4,7 +4,7 @@ module Spree
       module Admin
         # Serializes one permission catalog entry
         # (Spree::PermissionConfiguration::Entry) for the discovery endpoint.
-        # Labels and descriptions resolve through Spree.t so backend extensions
+        # Labels and descriptions resolve through I18n so backend extensions
         # localize without shipping dashboard translations.
         class PermissionSerializer
           include Alba::Resource
@@ -20,17 +20,17 @@ module Spree
           attribute(:group) { |entry| entry.scope.group.to_s }
 
           attribute(:group_label) do |entry|
-            Spree.t("permissions_catalog.groups.#{entry.scope.group}",
+            I18n.t("spree.permissions_catalog.groups.#{entry.scope.group}",
                     default: entry.scope.group.to_s.humanize)
           end
 
           attribute(:label) do |entry|
-            Spree.t("permissions_catalog.resources.#{entry.scope.name}.label",
+            I18n.t("spree.permissions_catalog.resources.#{entry.scope.name}.label",
                     default: entry.scope.name.to_s.humanize)
           end
 
           attribute(:description) do |entry|
-            Spree.t("permissions_catalog.resources.#{entry.scope.name}.description", default: '')
+            I18n.t("spree.permissions_catalog.resources.#{entry.scope.name}.description", default: '')
           end
         end
       end

data/app/serializers/spree/api/v3/admin/price_adjustment_tier_serializer.rb

@@ -6,15 +6,12 @@ module Spree
         # the list itself — the storefront sees resolved prices, never the
         # arithmetic behind them.
         class PriceAdjustmentTierSerializer < V3::BaseSerializer
-          typelize min_quantity: :number, percentage: :string
+          typelize min_quantity: :number
 
           attributes :min_quantity
 
-          # A decimal as a string, like every other money-shaped value on the
-          # wire — a float would round the merchant's own figure.
-          attribute :percentage do |tier|
-            tier.percentage&.to_s
-          end
+          rate_attributes :percentage
+          typelize percentage: [:string, nullable: false]
         end
       end
     end

data/app/serializers/spree/api/v3/admin/price_history_serializer.rb

@@ -5,9 +5,10 @@ module Spree
     module V3
       module Admin
         class PriceHistorySerializer < V3::PriceHistorySerializer
+          without_formatted_money
+
           typelize variant_id: :string,
                    price_id: :string,
-                   compare_at_amount: [:string, nullable: true],
                    created_at: :string
 
           attribute :variant_id do |price_history|
@@ -18,7 +19,9 @@ module Spree
             price_history.price.prefixed_id
           end
 
-          attributes :compare_at_amount, created_at: :iso8601
+          money_attributes :compare_at_amount, unit_price: true
+
+          attributes created_at: :iso8601
         end
       end
     end

data/app/serializers/spree/api/v3/admin/price_list_serializer.rb

@@ -27,11 +27,7 @@ module Spree
                      starts_at: :iso8601, ends_at: :iso8601, deleted_at: :iso8601,
                      created_at: :iso8601, updated_at: :iso8601
 
-          # A decimal as a string, like every other money-shaped value on the
-          # wire — a float would round the merchant's own figure.
-          attribute :price_adjustment_percentage do |price_list|
-            price_list.price_adjustment_percentage&.to_s
-          end
+          rate_attributes :price_adjustment_percentage
 
           attribute :automatic_pricing, &:automatic_pricing?
 

data/app/serializers/spree/api/v3/admin/price_rule_serializer.rb

@@ -8,8 +8,7 @@ module Spree
         class PriceRuleSerializer < V3::BaseSerializer
           typelize type: [:string, comment: 'Rule type. Built-in: channel_rule, customer_group_rule, market_rule, user_rule, volume_rule, zone_rule. Extensions may register more.'],
                    price_list_id: :string,
-                   preferences: 'Record<string, unknown>',
-                   preference_schema: 'Array<{ key: string; type: string; default: unknown }>'
+                   preferences: 'Record<string, unknown>'
 
           attributes created_at: :iso8601, updated_at: :iso8601
 
@@ -17,12 +16,9 @@ module Spree
             rule.class.api_type
           end
 
-          attribute :price_list_id do |rule|
-            rule.price_list&.prefixed_id
-          end
+          prefixed_id_attributes :price_list
 
           attribute :preferences, &:serialized_preferences
-          attribute :preference_schema, &:serialized_preference_schema
 
           # Embeds skip rules that don't carry the association (e.g.
           # VolumeRule has no markets/customers — the keys are omitted).

data/app/serializers/spree/api/v3/admin/price_serializer.rb

@@ -5,6 +5,8 @@ module Spree
         # Admin API Price Serializer
         # Extends Store Price Serializer with admin-only fields
         class PriceSerializer < V3::PriceSerializer
+          without_formatted_money
+
           typelize variant_id: [:string, nullable: true],
                    min_quantity: :number,
                    created_at: :string,

data/app/serializers/spree/api/v3/admin/product_serializer.rb

@@ -6,6 +6,8 @@ module Spree
         # Full product data including admin-only fields
         # Extends the store serializer with additional attributes
         class ProductSerializer < V3::ProductSerializer
+          without_formatted_money
+
           include Concerns::ExternalReferencesAttribute
 
           include Spree::Api::V3::Admin::Translatable
@@ -24,9 +26,7 @@ module Spree
                      :metadata, deleted_at: :iso8601,
                      created_at: :iso8601, updated_at: :iso8601
 
-          attribute :delivery_profile_id do |product|
-            product.delivery_profile&.prefixed_id
-          end
+          prefixed_id_attributes :delivery_profile
 
           # The live row in the review trail: who submitted, who decided,
           # when, and what the seller was told. Expanded rather than always
@@ -47,13 +47,7 @@ module Spree
               resource: proc { Spree.api.admin_seller_serializer },
               if: proc { expand?('seller') }
 
-          attribute :product_type_id do |product|
-            product.product_type&.prefixed_id
-          end
-
-          attribute :tax_category_id do |product|
-            product.tax_category&.prefixed_id
-          end
+          prefixed_id_attributes :product_type, :tax_category
 
           attribute :price do |product|
             price = price_for(product.default_variant)

data/app/serializers/spree/api/v3/admin/product_submission_serializer.rb

@@ -14,13 +14,7 @@ module Spree
 
           attributes :metadata, updated_at: :iso8601
 
-          attribute :submitted_by_id do |submission|
-            submission.submitted_by&.prefixed_id
-          end
-
-          attribute :reviewed_by_id do |submission|
-            submission.reviewed_by&.prefixed_id
-          end
+          prefixed_id_attributes :submitted_by, :reviewed_by
 
           # An operator reading the trail wants a name, not an id to resolve.
           attribute :reviewed_by_name do |submission|
@@ -29,9 +23,7 @@ module Spree
 
           # Distinguishes "the store approves listings automatically" from a
           # decision whose author we failed to record.
-          attribute :auto_approved do |submission|
-            submission.auto_approved?
-          end
+          attribute :auto_approved, &:auto_approved?
         end
       end
     end

data/app/serializers/spree/api/v3/admin/product_type_serializer.rb

@@ -15,9 +15,7 @@ module Spree
 
           # The creation-time template: stamped onto products at creation,
           # never synced afterwards.
-          attribute :delivery_profile_id do |record|
-            record.delivery_profile&.prefixed_id
-          end
+          prefixed_id_attributes :delivery_profile
 
           # Prefixed ids of the option types and categories this type seeds onto
           # new products — the same payload the client sends back on PATCH.

data/app/serializers/spree/api/v3/admin/promotion_action_serializer.rb

@@ -7,13 +7,13 @@ module Spree
         # Serializes Spree::PromotionAction (and its STI subclasses) for the
         # admin promotion editor. The shape is intentionally generic so a
         # single component can render any subclass — `preferences` is the
-        # current value hash, `preference_schema` describes its fields.
+        # current value hash, described by the `schema` its type's entry in
+        # `/promotion_actions/types` carries.
         class PromotionActionSerializer < BaseSerializer
           typelize type: [:string, comment: 'Action type. Built-in: create_adjustment, create_item_adjustments, create_line_items, free_shipping. Extensions may register more.'],
                    promotion_id: :string,
                    preferences: 'Record<string, unknown>',
-                   preference_schema: "Array<{ key: string; type: string; default: unknown; choices?: string[] }>",
-                   calculator: "{ type: string; preferences: Record<string, unknown>; preference_schema: Array<{ key: string; type: string; default: unknown }> } | null",
+                   calculator: 'TypedPromotionCalculator | null',
                    line_items: 'Array<{ variant_id: string; quantity: number }> | null'
 
           attributes created_at: :iso8601, updated_at: :iso8601
@@ -22,12 +22,9 @@ module Spree
             action.class.api_type
           end
 
-          attribute :promotion_id do |action|
-            action.promotion&.prefixed_id
-          end
+          prefixed_id_attributes :promotion
 
           attribute :preferences, &:serialized_preferences
-          attribute :preference_schema, &:serialized_preference_schema
 
           # Calculator is exposed as a nested object so the SPA can render
           # the calculator picker + its own preference fields. Null for
@@ -40,8 +37,7 @@ module Spree
             calc = action.calculator
             {
               type: calc.class.api_type,
-              preferences: calc.serialized_preferences,
-              preference_schema: calc.serialized_preference_schema
+              preferences: calc.serialized_preferences
             }
           end
 

data/app/serializers/spree/api/v3/admin/promotion_rule_serializer.rb

@@ -11,7 +11,6 @@ module Spree
           typelize type: [:string, comment: 'Rule type. Built-in: currency, country, channel, market, item_total, product, customer, customer_group, first_order, customer_logged_in, one_use_per_user, category, option_value. Extensions may register more.'],
                    promotion_id: :string,
                    preferences: 'Record<string, unknown>',
-                   preference_schema: "Array<{ key: string; type: string; default: unknown; choices?: string[] }>",
                    product_ids: 'Array<string> | null',
                    category_ids: 'Array<string> | null',
                    customer_ids: 'Array<string> | null',
@@ -23,12 +22,9 @@ module Spree
             rule.class.api_type
           end
 
-          attribute :promotion_id do |rule|
-            rule.promotion&.prefixed_id
-          end
+          prefixed_id_attributes :promotion
 
           attribute :preferences, &:serialized_preferences
-          attribute :preference_schema, &:serialized_preference_schema
 
           # Association IDs for rules that wire products/taxons/users through
           # join tables. Returned as prefixed IDs to match the rest of the

data/app/serializers/spree/api/v3/admin/purchase_order_item_serializer.rb

@@ -9,11 +9,7 @@ module Spree
                    quantity_rejected: :number,
                    quantity_over: :number,
                    outstanding: :number,
-                   unit_cost: :string,
-                   display_unit_cost: :string,
-                   total_cost: :string,
-                   display_total_cost: :string,
-                   currency: 'string | null',
+                   currency: [:string, nullable: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    purchase_order_id: 'string | null',
                    thumbnail_url: 'string | null',
                    product_id: 'string | null',
@@ -26,31 +22,16 @@ module Spree
                      :outstanding, :currency,
                      created_at: :iso8601, updated_at: :iso8601
 
-          # Money on the wire is a decimal string: a float would round the
-          # merchant's own figure.
-          attribute :unit_cost do |item|
-            item.unit_cost&.to_s
-          end
-
-          attribute :total_cost do |item|
-            item.total_cost.to_s
-          end
-
-          attribute :display_unit_cost do |item|
-            item.display_unit_cost.to_s
-          end
-
-          attribute :display_total_cost do |item|
-            item.display_total_cost.to_s
-          end
+          money_attributes :unit_cost, unit_price: true
+          money_attributes :total_cost
+          typelize unit_cost: [:string, nullable: false],
+                   total_cost: [:string, nullable: false]
 
           attribute :purchase_order_id do |item|
             Spree::PurchaseOrder.prefixed_id_for(item.purchase_order_id)
           end
 
-          attribute :variant_id do |item|
-            item.variant&.prefixed_id
-          end
+          prefixed_id_attributes :variant
 
           # The product the line's variant belongs to, so a line can link
           # straight to the screen where that SKU's stock lives.

data/app/serializers/spree/api/v3/admin/purchase_order_serializer.rb

@@ -7,7 +7,7 @@ module Spree
         class PurchaseOrderSerializer < V3::BaseSerializer
           typelize number: :string,
                    status: :string,
-                   currency: :string,
+                   currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    reference: 'string | null',
                    notes: 'string | null',
                    supplier_id: 'string | null',
@@ -21,8 +21,6 @@ module Spree
                    quantity_rejected_total: :number,
                    quantity_ordered_total: :number,
                    quantity_received_total: :number,
-                   subtotal: :string,
-                   display_subtotal: :string,
                    editable: :boolean,
                    ordered_at: 'string | null',
                    received_at: 'string | null',
@@ -56,21 +54,10 @@ module Spree
 
           attribute :editable, &:editable?
 
-          attribute :subtotal do |purchase_order|
-            purchase_order.subtotal.to_s
-          end
-
-          attribute :display_subtotal do |purchase_order|
-            purchase_order.display_subtotal.to_s
-          end
+          money_attributes :subtotal
+          typelize subtotal: [:string, nullable: false]
 
-          attribute :supplier_id do |purchase_order|
-            purchase_order.supplier&.prefixed_id
-          end
-
-          attribute :destination_location_id do |purchase_order|
-            purchase_order.destination_location&.prefixed_id
-          end
+          prefixed_id_attributes :supplier, :destination_location
 
           many :items,
                resource: proc { Spree.api.admin_purchase_order_item_serializer },

data/app/serializers/spree/api/v3/admin/refund_reason_serializer.rb

@@ -17,9 +17,7 @@ module Spree
 
           # Lets the dashboard hide destructive controls instead of offering a
           # delete that the model will refuse.
-          attribute :can_be_deleted do |reason|
-            reason.can_be_deleted?
-          end
+          attribute :can_be_deleted, &:can_be_deleted?
         end
       end
     end

data/app/serializers/spree/api/v3/admin/refund_serializer.rb

@@ -3,6 +3,9 @@ module Spree
     module V3
       module Admin
         class RefundSerializer < V3::RefundSerializer
+          # The Store API keeps this deprecated name until 6.1.
+          _attributes.delete(:reimbursement_id)
+
           typelize payment_id: [:string, nullable: true],
                    refund_reason_id: [:string, nullable: true],
                    refunder_id: [:string, nullable: true],
@@ -12,6 +15,10 @@ module Spree
           attributes :metadata,
                      created_at: :iso8601, updated_at: :iso8601
 
+          # The tax inside the amount, when what was refunded carried tax.
+          money_attributes :tax_amount
+          typelize tax_amount: [:string, nullable: false]
+
           # Who issued it — an admin user, or the API key an integration
           # refunded through.
           actor_attributes :refunder

data/app/serializers/spree/api/v3/admin/reporting_result_serializer.rb

@@ -2,8 +2,9 @@ module Spree
   module Api
     module V3
       module Admin
-        # Decorates a Spree::Reporting::Result for the wire: money display
-        # strings, ISO ranges, and dimension hydration (raw group keys become
+        # Decorates a Spree::Reporting::Result for the wire: money as decimal
+        # strings in the result's currency, ratios and growth as plain decimal
+        # strings, counts as integers, money display strings, ISO ranges, and dimension hydration (raw group keys become
         # { id, label, meta } display payloads — see Spree::Reporting::Hydration).
         class ReportingResultSerializer
           attr_reader :result, :store, :params
@@ -39,7 +40,13 @@ module Spree
           end
 
           def metric_payload(name, payload)
+            metric = Spree.reporting.metrics[name]
             output = payload.dup
+            if metric
+              output[:value] = metric.format_value(payload[:value], result.meta[:currency])
+              output[:previous] = metric.format_value(payload[:previous], result.meta[:currency]) if payload.key?(:previous)
+            end
+            output[:growth] = Spree::Money::Rounding.format_decimal(payload[:growth]) if payload.key?(:growth)
             output[:display] = money(payload[:value]) if money_metrics.include?(name)
             output
           end

data/app/serializers/spree/api/v3/admin/return_line_item_serializer.rb

@@ -5,10 +5,19 @@ module Spree
     module V3
       module Admin
         class ReturnLineItemSerializer < V3::ReturnLineItemSerializer
+          without_formatted_money
+
+          # No guest price gating here, so the inherited money fields are always present.
+          typelize pre_tax_amount: [:string, nullable: false],
+                   included_tax_total: [:string, nullable: false], additional_tax_total: [:string, nullable: false],
+                   tax_total: [:string, nullable: false],
+                   refund_amount: [:string, nullable: false]
+
           attributes created_at: :iso8601, updated_at: :iso8601
 
           one :variant, resource: proc { Spree.api.admin_variant_serializer }, if: proc { expand?('variant') }
           one :line_item, resource: proc { Spree.api.admin_line_item_serializer }, if: proc { expand?('line_item') }
+          many :tax_lines, resource: proc { Spree.api.admin_tax_line_serializer }, if: proc { expand?('tax_lines') }
         end
       end
     end

data/app/serializers/spree/api/v3/admin/return_reason_serializer.rb

@@ -11,9 +11,7 @@ module Spree
 
           # Lets the dashboard hide destructive controls instead of offering a
           # delete that the model will refuse.
-          attribute :can_be_deleted do |reason|
-            reason.can_be_deleted?
-          end
+          attribute :can_be_deleted, &:can_be_deleted?
         end
       end
     end

data/app/serializers/spree/api/v3/admin/return_serializer.rb

@@ -5,30 +5,26 @@ module Spree
     module V3
       module Admin
         class ReturnSerializer < V3::ReturnSerializer
+          without_formatted_money
+
           typelize memo: [:string, nullable: true],
                    metadata: 'Record<string, unknown>',
                    documents: "Array<{ kind: string; url: string }>",
                    stock_location_id: [:string, nullable: true],
                    created_by_id: [:string, nullable: true],
                    created_by_type: [:string, nullable: true, enum: Spree::Actor::BUILT_IN_KINDS, enum_type_name: 'ActorKind'],
-                   refunded_total: :string,
-                   refundable_total: :string
+                   refund_total: [:string, nullable: false],
+                   refund_tax_total: [:string, nullable: false]
 
           attributes :memo, :metadata, created_at: :iso8601, updated_at: :iso8601
 
-          attribute :stock_location_id do |return_record|
-            return_record.stock_location&.prefixed_id
-          end
+          prefixed_id_attributes :stock_location
 
           actor_attributes :created_by
 
-          attribute :refunded_total do |return_record|
-            return_record.refunded_total.to_s
-          end
-
-          attribute :refundable_total do |return_record|
-            return_record.refundable_total.to_s
-          end
+          money_attributes :refunded_total, :refundable_total
+          typelize refunded_total: [:string, nullable: false],
+                   refundable_total: [:string, nullable: false]
 
           many :return_line_items,
                resource: proc { Spree.api.admin_return_line_item_serializer },

data/app/serializers/spree/api/v3/admin/saved_report_serializer.rb

@@ -16,9 +16,7 @@ module Spree
 
           attributes :name, :description, :query, :seeded, :created_at, :updated_at
 
-          attribute :user_id do |report|
-            report.user&.prefixed_id
-          end
+          prefixed_id_attributes :user
 
           # The same "name, else email" rule every actor answers, so a report's
           # author and an order's canceler read alike.

data/app/serializers/spree/api/v3/admin/seller_balance_serializer.rb

@@ -6,14 +6,14 @@ module Spree
         # operator. A computed value rather than a record, so it carries no id.
         class SellerBalanceSerializer < V3::BaseSerializer
           typelize seller_id: :string,
-                   currency: :string,
-                   settlement_currency: :string,
+                   currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
+                   settlement_currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    converted: :boolean,
-                   earned: :string, display_earned: :string,
-                   payable: :string, display_payable: :string,
-                   paid: :string, display_paid: :string,
-                   balance: :string, display_balance: :string,
-                   pending: :string, display_pending: :string
+                   earned: :string,
+                   payable: :string,
+                   paid: :string,
+                   balance: :string,
+                   pending: :string
 
           _attributes.delete(:id)
 
@@ -26,9 +26,14 @@ module Spree
 
           attribute(:seller_id) { |balance| balance.seller&.prefixed_id }
 
-          %i[earned payable paid balance pending].each do |figure|
-            attribute(figure) { |balance| balance.public_send(figure).to_s }
-            attribute(:"display_#{figure}") { |balance| balance.public_send(:"display_#{figure}").to_s }
+          # Earnings are in the currency the sales were priced in; what the
+          # account holds is in the one it settles in.
+          %i[earned pending].each do |figure|
+            attribute(figure) { |balance| Spree::Money::Rounding.format(balance.public_send(figure), balance.currency) }
+          end
+
+          %i[payable paid balance].each do |figure|
+            attribute(figure) { |balance| Spree::Money::Rounding.format(balance.public_send(figure), balance.settlement_currency) }
           end
         end
       end

data/app/serializers/spree/api/v3/admin/seller_payout_serializer.rb

@@ -11,21 +11,19 @@ module Spree
           typelize seller_id: :string,
                    seller_name: 'string | null',
                    status: [:string, enum: Spree::SellerPayout.statuses, enum_type_name: 'SellerPayoutStatus'],
-                   provider: [:string, comment: 'Payout provider class name. Built-in: Spree::PayoutProvider::System. Provider gems register more.'],
+                   provider: [:string, comment: 'Payout provider. Built-in: system. Provider gems register more (e.g. stripe).'],
                    amount: :string,
-                   currency: :string,
+                   currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    reference: 'string | null',
                    period_start: 'string | null',
                    period_end: 'string | null',
-                   transfers_count: :number,
-                   display_amount: :string
+                   transfers_count: :number
 
-          attributes :status, :currency, :provider, :reference, :metadata,
+          attributes :status, :currency, :reference, :metadata,
                      period_start: :iso8601, period_end: :iso8601,
                      created_at: :iso8601, updated_at: :iso8601
 
-          attribute(:amount) { |payout| payout.amount&.to_s }
-          attribute(:display_amount) { |payout| payout.display_amount.to_s }
+          attribute(:amount) { |payout| Spree::Money::Rounding.format(payout.amount, payout.currency) }
           attribute(:seller_id) { |payout| payout.seller&.prefixed_id }
           attribute(:seller_name) { |payout| payout.seller&.name }
 
@@ -39,6 +37,8 @@ module Spree
 
             counts ? counts.fetch(payout.id, 0) : payout.transfers.count
           end
+
+          api_type_attributes :provider
         end
       end
     end

data/app/serializers/spree/api/v3/admin/seller_requirement_status_serializer.rb

@@ -22,17 +22,13 @@ module Spree
           # Whether this stands between the seller and approval. Serialized
           # rather than left to each client to derive, so the dashboard's
           # override warning and the approval gate cannot disagree.
-          attribute :blocking do |status|
-            status.blocking?
-          end
+          attribute :blocking, &:blocking?
 
           # The document this line asks for, and what the seller published
           # against it. Embedded rather than left to a second request: the
           # operator is deciding whether to approve, and a line that says
           # "Done" without showing the text is not something to approve on.
-          attribute :required_policy_name do |status|
-            status.required_policy_name
-          end
+          attributes :required_policy_name
 
           one :submission,
               resource: proc { Spree.api.admin_seller_requirement_submission_serializer },

data/app/serializers/spree/api/v3/admin/seller_requirement_submission_serializer.rb

@@ -21,13 +21,7 @@ module Spree
                      created_at: :iso8601,
                      updated_at: :iso8601
 
-          attribute :seller_id do |submission|
-            submission.seller&.prefixed_id
-          end
-
-          attribute :requirement_id do |submission|
-            submission.requirement&.prefixed_id
-          end
+          prefixed_id_attributes :seller, :requirement
 
           # The reviewer is looking at a queue of these and needs to know what
           # each one answers without fetching the requirement.