Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fix FulfillmentSerializer crash when line item is deleted (#13918)
Damian Legawiecc0fa2c5eb29d
diff --git a/spree/api/app/serializers/spree/api/v3/fulfillment_serializer.rb b/spree/api/app/serializers/spree/api/v3/fulfillment_serializer.rbindex 94be676048..0998d09ad8 100644--- a/spree/api/app/serializers/spree/api/v3/fulfillment_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/fulfillment_serializer.rb@@ -36,7 +36,9 @@ module Spree# Which items (and how many) are in this fulfillment.# A line item can be split across fulfillments with different quantities.attribute :items do |shipment|- shipment.manifest.map do |item|+ shipment.manifest.filter_map do |item|+ next unless item.line_item+{item_id: item.line_item.prefixed_id,variant_id: item.variant.prefixed_id,diff --git a/spree/api/spec/serializers/spree/api/v3/fulfillment_serializer_spec.rb b/spree/api/spec/serializers/spree/api/v3/fulfillment_serializer_spec.rbindex 58b94ff942..fb52ac366d 100644--- a/spree/api/spec/serializers/spree/api/v3/fulfillment_serializer_spec.rb+++ b/spree/api/spec/serializers/spree/api/v3/fulfillment_serializer_spec.rb@@ -2,11 +2,21 @@ require 'spec_helper'RSpec.describe Spree::Api::V3::FulfillmentSerializer dolet(:store) { @default_store }- let(:base_params) { { store: store, currency: store.default_currency } }+ let(:params) do+ {+ store: store,+ locale: 'en',+ currency: store.default_currency,+ user: nil,+ includes: [],+ expand: []+ }+ end- let(:shipment) { create(:shipment) }+ let(:order) { create(:order_ready_to_ship, store: store) }+ let(:shipment) { order.shipments.first }- subject { described_class.new(shipment, params: base_params).to_h }+ subject { described_class.new(shipment, params: params).to_h }describe 'serialized attributes' doit 'includes cost and total fields' do@@ -40,17 +50,56 @@ RSpec.describe Spree::Api::V3::FulfillmentSerializer do'fulfillment_type' => 'shipping')end++ it 'returns status mapped from state' do+ expect(subject['status']).to eq(shipment.state)+ end+ end++ describe '#items' do+ it 'serializes manifest items with prefixed IDs' do+ items = subject['items']+ expect(items).to be_an(Array)+ expect(items.length).to be >= 1++ item = items.first+ item_id = item[:item_id] || item['item_id']+ variant_id = item[:variant_id] || item['variant_id']+ qty = item[:quantity] || item['quantity']++ expect(item_id).to be_present+ expect(variant_id).to be_present+ expect(qty).to be_a(Integer)+ end++ context 'when a line item has been deleted' do+ before do+ line_item = shipment.line_items.first+ line_item.delete+ shipment.reload+ end++ it 'skips manifest entries with nil line_item without raising' do+ expect {+ result = described_class.new(shipment, params: params).to_h+ expect(result['items']).to be_an(Array)+ }.not_to raise_error+ end+ endendcontext 'with free shipping promotion' dolet(:free_shipping_promotion) { create(:free_shipping_promotion, code: 'freeship', kind: :coupon_code) }- let(:order) { shipment.order }+ let(:bare_shipment) { create(:shipment) }+ let(:bare_order) { bare_shipment.order }++ subject { described_class.new(bare_shipment, params: params).to_h }before do- order.coupon_code = free_shipping_promotion.code- Spree::PromotionHandler::Coupon.new(order).apply- order.updater.update- shipment.reload+ bare_order.coupon_code = free_shipping_promotion.code+ Spree::PromotionHandler::Coupon.new(bare_order).apply+ bare_order.updater.update+ bare_shipment.reloadendit 'returns discount_total reflecting the promotion' do