From 06d9d96f5462239f93571c990b34cd7e08cbee09 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Fri, 17 Jan 2025 12:21:28 +1100
Subject: [PATCH] Fix error on removed product from catalog

---
 app/services/backorder_updater.rb       |  5 +++-
 spec/services/backorder_updater_spec.rb | 38 +++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/app/services/backorder_updater.rb b/app/services/backorder_updater.rb
index e0a4ec8feb..10718296d0 100644
--- a/app/services/backorder_updater.rb
+++ b/app/services/backorder_updater.rb
@@ -58,6 +58,9 @@ class BackorderUpdater
     variants.map do |variant|
       link = variant.semantic_links[0].semantic_id
       solution = broker.best_offer(link)
+
+      next unless solution.offer
+
       line = orderer.find_or_build_order_line(backorder, solution.offer)
       if variant.on_demand
         adjust_stock(variant, solution, line)
@@ -66,7 +69,7 @@ class BackorderUpdater
       end
 
       line
-    end
+    end.compact
   end
 
   def cancel_stale_lines(unprocessed_lines, managed_variants, broker)
diff --git a/spec/services/backorder_updater_spec.rb b/spec/services/backorder_updater_spec.rb
index 3dace91076..af1f5471c1 100644
--- a/spec/services/backorder_updater_spec.rb
+++ b/spec/services/backorder_updater_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe BackorderUpdater do
   let(:order) { create(:completed_order_with_totals) }
+  let(:order_cycle) { order.order_cycle }
   let(:distributor) { order.distributor }
   let(:beans) { beans_item.variant }
   let(:beans_item) { order.line_items[0] }
@@ -116,9 +117,42 @@ RSpec.describe BackorderUpdater do
     end
   end
 
-  describe "#distributed_linked_variants" do
-    let(:order_cycle) { order.order_cycle }
+  describe "#update_order_lines" do
+    it "skips unavailable items" do
+      stub_request(:get, catalog_url).to_return(body: catalog_json)
 
+      # Record the placed backorder:
+      backorder = nil
+      allow_any_instance_of(FdcBackorderer).to receive(:find_order) do |*_args|
+        backorder
+      end
+      allow_any_instance_of(FdcBackorderer).to receive(:send_order) do |*args|
+        backorder = args[1]
+      end
+
+      BackorderJob.new.place_backorder(order)
+
+      # Now one of the products becomes unavailable in the catalog.
+      # I simulate that by changing the link so something unknown.
+      beans.semantic_links[0].update!(semantic_id: "https://example.net/unknown")
+
+      variants = [beans, chia_seed]
+      reference_link = chia_seed.semantic_links[0].semantic_id
+      urls = FdcUrlBuilder.new(reference_link)
+      catalog = DfcCatalog.load(user, urls.catalog_url)
+      orderer = FdcBackorderer.new(user, urls)
+      broker = FdcOfferBroker.new(catalog)
+      updated_lines = subject.update_order_lines(
+        backorder, order_cycle, variants, broker, orderer
+      )
+
+      expect(updated_lines.count).to eq 1
+      expect(updated_lines[0].offer.offeredItem.semanticId)
+        .to eq chia_seed.semantic_links[0].semantic_id
+    end
+  end
+
+  describe "#distributed_linked_variants" do
     it "selects available variants with semantic links" do
       variants = subject.distributed_linked_variants(order_cycle, distributor)
       expect(variants).to match_array [beans, chia_seed]