Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Admin updates can trigger new backorders until the order cycle is closed #13065

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions app/jobs/amend_backorder_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,16 @@ def perform(order)
def amend_backorder(order)
backorder = BackorderUpdater.new.amend_backorder(order)

user = order.distributor.owner
urls = nil # Not needed to send order. The backorder id is the URL.
FdcBackorderer.new(user, urls).send_order(backorder) if backorder
if backorder
user = order.distributor.owner
urls = nil # Not needed to send order. The backorder id is the URL.
FdcBackorderer.new(user, urls).send_order(backorder)
elsif !order.order_cycle.closed?

# We don't have an order to amend but the order cycle is or will open.
# We can assume that this job was triggered by an admin creating a new
# order or adding backorderable items to an order.
BackorderJob.new.place_backorder(order)
end
end
end
2 changes: 1 addition & 1 deletion app/services/backorder_updater.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def amend_backorder(order)

backorder = orderer.find_open_order(order)

update(backorder, user, distributor, order_cycle)
update(backorder, user, distributor, order_cycle) if backorder
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it amounts to the same thing, but I thought that we usually avoid implied booleans and use the more explicit present?

But i'm sure it amounts to the same thing, and this looks cleaner so I like it :)

end

# Update a given backorder according to a distributor's order cycle.
Expand Down
27 changes: 27 additions & 0 deletions spec/jobs/amend_backorder_job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,32 @@
.to change { backorder.lines.count }.from(2).to(1)
.and change { beans.reload.on_hand }.by(-12)
end

it "creates a new order" 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

# Call amending before a backorder has been placed.
expect { subject.amend_backorder(order) }
.to change { backorder.present? }
.to(true)

# We ordered a case of 12 cans: -3 + 12 = 9
expect(beans.on_hand).to eq 9

# Stock controlled items don't change stock in backorder:
expect(chia_seed.on_hand).to eq 7

expect(backorder.lines[0].quantity).to eq 1 # beans
expect(backorder.lines[1].quantity).to eq 5 # chia
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work, that's a tricky one to test. I guess the only other way would be to use VCR.

end
end
7 changes: 7 additions & 0 deletions spec/services/backorder_updater_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@
.to change { backorder.lines.count }.from(2).to(1)
.and change { beans.reload.on_hand }.by(-12)
end

it "skips updating if there's is no backorder" do
allow_any_instance_of(FdcBackorderer).to receive(:find_open_order)
.and_return(nil)

expect { subject.amend_backorder(order) }.not_to raise_error
end
end

describe "#distributed_linked_variants" do
Expand Down
Loading