Skip to content

Commit

Permalink
Updates from PR review
Browse files Browse the repository at this point in the history
  • Loading branch information
@karmakaze
karmakaze committed Nov 14, 2019
1 parent 73fc7ad commit 90ab4b6
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 47 deletions.
22 changes: 13 additions & 9 deletions lib/shopify_api/resources/fulfillment_order.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,32 +41,36 @@ def fulfillment_request(fulfillment_order_line_items:, message:)
message: message
}
}
load_keyed_attributes_from_response(post(:fulfillment_request, body, only_id))
keyed_fos = load_keyed_attributes_from_response(post(:fulfillment_request, {}, body.to_json))
if keyed_fos&.fetch('original_fulfillment_order', nil)&.attributes
load(keyed_fos['original_fulfillment_order'].attributes, false, true)
end
keyed_fos
end

def accept_fulfillment_request(params)
load_attributes_from_response(post('fulfillment_request/accept', params, only_id))
load_attributes_from_response(post('fulfillment_request/accept', {}, params.to_json))
end

def reject_fulfillment_request(params)
load_attributes_from_response(post('fulfillment_request/reject', params, only_id))
load_attributes_from_response(post('fulfillment_request/reject', {}, params.to_json))
end

def cancellation_request(message:)
body = {
cancellation_request: {
message: message
}
cancellation_request: {
message: message
}
}
load_attributes_from_response(post(:cancellation_request, body, only_id))
load_attributes_from_response(post(:cancellation_request, {}, body.to_json))
end

def accept_cancellation_request(params)
load_attributes_from_response(post('cancellation_request/accept', params, only_id))
load_attributes_from_response(post('cancellation_request/accept', {}, params.to_json))
end

def reject_cancellation_request(params)
load_attributes_from_response(post('cancellation_request/reject', params, only_id))
load_attributes_from_response(post('cancellation_request/reject', {}, params.to_json))
end

private
Expand Down
86 changes: 48 additions & 38 deletions test/fulfillment_order_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def setup
end

context "#fulfillment_request" do
should "be able to make a fulfillment request for a fulfillment order" do
should "make a fulfillment request for a fulfillment order" do
original_fulfillment_order = ActiveSupport::JSON.decode(load_fixture('fulfillment_order'))
submitted_fulfillment_order = original_fulfillment_order.clone
submitted_fulfillment_order['id'] = 2
Expand All @@ -143,19 +143,23 @@ def setup
unsubmitted_fulfillment_order = original_fulfillment_order.clone
unsubmitted_fulfillment_order['id'] = 3
unsubmitted_fulfillment_order['request_status'] = 'unsubmitted'
original_fulfillment_order['status'] = 'closed'
original_fulfillment_order['status'] = 'in_progress'
body = {
original_fulfillment_order: original_fulfillment_order,
submitted_fulfillment_order: submitted_fulfillment_order,
unsubmitted_fulfillment_order: unsubmitted_fulfillment_order
}
fake_query = {
'fulfillment_request[fulfillment_order_line_items][0][id]' => '1',
'fulfillment_request[fulfillment_order_line_items][0][quantity]' => '1',
'fulfillment_request[message]' => 'Fulfill this FO, please.'
request_body = {
fulfillment_request: {
fulfillment_order_line_items: [
{ id: 1, quantity: 1 }
],
message: 'Fulfill this FO, please.'
}
}
fake "fulfillment_orders/519788021/fulfillment_request.json#{query_string(fake_query)}", :extension => false,
:method => :post, :body => ActiveSupport::JSON.encode(body)
fake "fulfillment_orders/519788021/fulfillment_request", :method => :post,
:request_body => ActiveSupport::JSON.encode(request_body),
:body => ActiveSupport::JSON.encode(body)

fulfillment_order = ShopifyAPI::FulfillmentOrder.find(519788021)
params = {
Expand All @@ -164,9 +168,11 @@ def setup
}
original_submitted_unsubmitted_fos = fulfillment_order.fulfillment_request(params)

assert_equal 'in_progress', fulfillment_order.status

original_fo = original_submitted_unsubmitted_fos['original_fulfillment_order']
assert_equal 519788021, original_fo.id
assert_equal 'closed', original_fo.status
assert_equal 'in_progress', original_fo.status

submitted_fo = original_submitted_unsubmitted_fos['submitted_fulfillment_order']
assert_equal 2, submitted_fo.id
Expand All @@ -181,21 +187,21 @@ def setup
end

context "#accept_fulfillment_request" do
should "be able to accept a fulfillment request for a fulfillment order" do
should "accept a fulfillment request for a fulfillment order" do
fulfillment_order = ShopifyAPI::FulfillmentOrder.find(519788021)

fake_query = {
'message' => "LGTM. Accept this FO fulfillment request",
'other' => "random"
request_body = {
'message' => "LGTM. Accept this FO fulfillment request",
'other' => "random"
}
fake_response = { fulfillment_order: fulfillment_order.attributes.merge(status: 'in_progress') }
fake "fulfillment_orders/519788021/fulfillment_request/accept.json#{query_string(fake_query)}",
:extension => false, :method => :post,
fake "fulfillment_orders/519788021/fulfillment_request/accept", :method => :post,
:request_body => ActiveSupport::JSON.encode(request_body),
:body => ActiveSupport::JSON.encode(fake_response)

params = {
message: 'LGTM. Accept this FO fulfillment request',
other: 'random'
message: 'LGTM. Accept this FO fulfillment request',
other: 'random'
}
accepted = fulfillment_order.accept_fulfillment_request(params)

Expand All @@ -205,17 +211,17 @@ def setup
end

context "#reject_fulfillment_request" do
should "be able to reject a fulfillment request for a fulfillment order" do
should "reject a fulfillment request for a fulfillment order" do
fulfillment_order = ShopifyAPI::FulfillmentOrder.find(519788021)

fake_query = {
request_body = {
'message' => "LBTM. Reject this FO fulfillment request",
'other' => "text"
}
fake_response = { fulfillment_order: fulfillment_order.attributes.merge(status: 'closed') }
fake "fulfillment_orders/519788021/fulfillment_request/reject.json#{query_string(fake_query)}",
:extension => false, :method => :post,
:body => ActiveSupport::JSON.encode(fake_response)
fake "fulfillment_orders/519788021/fulfillment_request/reject", :method => :post,
:request_body => ActiveSupport::JSON.encode(request_body),
:body => ActiveSupport::JSON.encode(fake_response)

params = {
message: 'LBTM. Reject this FO fulfillment request',
Expand All @@ -229,31 +235,35 @@ def setup
end

context "#cancellation_request" do
should "be able to make a cancellation request for a fulfillment order" do
should "make a cancellation request for a fulfillment order" do
fulfillment_order = ShopifyAPI::FulfillmentOrder.find(519788021)

closed = ActiveSupport::JSON.decode(load_fixture('fulfillment_order'))
closed['status'] = 'closed'
fake "fulfillment_orders/519788021/close", :method => :post, :body => ActiveSupport::JSON.encode(closed)
cancelling = ActiveSupport::JSON.decode(load_fixture('fulfillment_order'))
cancelling['status'] = 'in_progress'
cancelling['request_status'] = 'cancellation_accepted'
fake "fulfillment_orders/519788021/cancellation_request", :method => :post,
:body => ActiveSupport::JSON.encode(cancelling)

assert_equal 'open', fulfillment_order.status
assert fulfillment_order.close
assert_equal 'closed', fulfillment_order.status
cancelled = fulfillment_order.cancellation_request(message: "Cancelling this please.")

assert_equal true, cancelled
assert_equal 'in_progress', fulfillment_order.status
assert_equal 'cancellation_accepted', fulfillment_order.request_status
end
end

context "#accept_cancellation_request" do
should "be able to accept a cancellation request for a fulfillment order" do
should "accept a cancellation request for a fulfillment order" do
fulfillment_order = ShopifyAPI::FulfillmentOrder.find(519788021)

fake_query = {
request_body = {
'message' => "Already in-progress. Reject this FO cancellation request",
'other' => "blah"
}
fake_response = { fulfillment_order: fulfillment_order.attributes.merge(status: 'closed') }
fake "fulfillment_orders/519788021/cancellation_request/accept.json#{query_string(fake_query)}",
:extension => false, :method => :post,
:body => ActiveSupport::JSON.encode(fake_response)
fake "fulfillment_orders/519788021/cancellation_request/accept", :method => :post,
:request_body => ActiveSupport::JSON.encode(request_body),
:body => ActiveSupport::JSON.encode(fake_response)

params = {
message: 'Already in-progress. Reject this FO cancellation request',
Expand All @@ -267,16 +277,16 @@ def setup
end

context "#reject_cancellation_request" do
should "be able to reject a cancellation request for a fulfillment order" do
should "reject a cancellation request for a fulfillment order" do
fulfillment_order = ShopifyAPI::FulfillmentOrder.find(519788021)

fake_query = {
request_body = {
'message' => "Already in-progress. Reject this FO cancellation request",
'other' => "blah"
}
fake_response = { fulfillment_order: fulfillment_order.attributes.merge(status: 'in_progress') }
fake "fulfillment_orders/519788021/cancellation_request/reject.json#{query_string(fake_query)}",
:extension => false, :method => :post,
fake "fulfillment_orders/519788021/cancellation_request/reject", :method => :post,
:request_body => request_body,
:body => ActiveSupport::JSON.encode(fake_response)

params = {
Expand Down

0 comments on commit 90ab4b6

Please sign in to comment.