Skip to content

Commit 2a85856

Browse files
authored
Fix 500 bug for requests export after changing item name (#5028)
* Fix 500 bug for requests export after changing item name * Refactor test changes
1 parent 07e3e4c commit 2a85856

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

app/models/partners/item_request.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ def request_unit_is_supported
3838

3939
def name_with_unit(quantity_override = nil)
4040
if Flipper.enabled?(:enable_packs) && request_unit.present?
41-
"#{name} - #{request_unit.pluralize(quantity_override || quantity.to_i)}"
41+
"#{item.name} - #{request_unit.pluralize(quantity_override || quantity.to_i)}"
4242
else
43-
name
43+
item.name
4444
end
4545
end
4646
end

app/services/requests_total_items_service.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ def calculate
1515
private
1616

1717
def item_requests
18-
@item_requests ||= Partners::ItemRequest.where(request: @requests)
18+
@item_requests ||= Partners::ItemRequest.includes(:item).where(request: @requests)
1919
end
2020
end

spec/services/exports/export_request_service_spec.rb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@
8484
])
8585
end
8686

87+
# Update item name after the request has been created to ensure export shows
88+
# current item name.
89+
before do
90+
item_2t.update!(name: "2T Diapers -- UPDATED")
91+
end
92+
8793
subject do
8894
described_class.new(Request.all).generate_csv_data
8995
end
@@ -100,7 +106,7 @@
100106
"Requestor",
101107
"Type",
102108
"Status",
103-
"2T Diapers",
109+
"2T Diapers -- UPDATED",
104110
"3T Diapers",
105111
"4T Diapers",
106112
"4T Diapers - packs",
@@ -225,7 +231,7 @@
225231
"Requestor",
226232
"Type",
227233
"Status",
228-
"2T Diapers",
234+
"2T Diapers -- UPDATED",
229235
"3T Diapers",
230236
"4T Diapers",
231237
"<DELETED_ITEMS>"

0 commit comments

Comments
 (0)