Skip to content

Commit

Permalink
Merge pull request #666 from Shopify/fulfillment-orders-fulfillment
Browse files Browse the repository at this point in the history
Add save, update_tracking, and cancel actions to FulfillmentOrderFulfillment resource
  • Loading branch information
karmakaze committed Jan 14, 2020
2 parents b731cc8 + 4842030 commit 2818c3b
Show file tree
Hide file tree
Showing 4 changed files with 211 additions and 1 deletion.
34 changes: 34 additions & 0 deletions lib/shopify_api/resources/fulfillment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,39 @@ def order_id
def cancel; load_attributes_from_response(post(:cancel, {}, only_id)); end
def complete; load_attributes_from_response(post(:complete, {}, only_id)); end
def open; load_attributes_from_response(post(:open, {}, only_id)); end

def order_id=(order_id)
prefix_options[:order_id] = order_id
end

def load(attributes, remove_root = false, persisted = false)
order_id = attributes['order_id']
prefix_options[:order_id] = order_id if order_id
super(attributes, remove_root, persisted)
end

def save
if prefix_options[:order_id].present?
super
else
line_items = attributes['line_items_by_fulfillment_order'] || attributes[:line_items_by_fulfillment_order]
if line_items.blank?
raise ShopifyAPI::ValidationException,
"either 'line_items_by_fulfillment_order' or prefix_options[:order_id] is required"
end

fulfillmentV2 = FulfillmentV2.new(attributes)
result = fulfillmentV2.save
load(fulfillmentV2.attributes, false, true)
result
end
end

def update_tracking(tracking_info:, notify_customer:)
fulfillmentV2 = FulfillmentV2.new(attributes)
result = fulfillmentV2.update_tracking(tracking_info: tracking_info, notify_customer: notify_customer)
load(fulfillmentV2.attributes, false, true)
result
end
end
end
15 changes: 15 additions & 0 deletions lib/shopify_api/resources/fulfillment_v2.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module ShopifyAPI
class FulfillmentV2 < Base
self.element_name = 'fulfillment'

def update_tracking(tracking_info:, notify_customer:)
body = {
fulfillment: {
tracking_info: tracking_info,
notify_customer: notify_customer
}
}
load_attributes_from_response(post(:update_tracking, {}, body.to_json))
end
end
end
123 changes: 122 additions & 1 deletion test/fulfillment_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,127 @@ def setup
assert_equal 450789469, fulfillment.order_id
end
end
end

context "#create" do
should "create a fulfillment with line_items_by_fulfillment_order" do
create_fulfillment_attributes = {
message: "The message for this FO fulfillment",
notify_customer: true,
tracking_info: {
number: "XSDFHYR23475",
url: "https://tracking.example.com/XSDFHYR23475",
company: "TFTC - the fulfillment/tracking company"
},
line_items_by_fulfillment_order: [
{
fulfillment_order_id: 3,
fulfillment_order_line_items: [{ id: 2, quantity: 1 }]
}
]
}
request_body = { fulfillment: create_fulfillment_attributes }
response_body = { fulfillment: create_fulfillment_attributes.merge(id: 346743624) }
fake "fulfillments", :method => :post,
request_body: ActiveSupport::JSON.encode(request_body),
body: ActiveSupport::JSON.encode(response_body)

fulfillment = ShopifyAPI::Fulfillment.create(create_fulfillment_attributes)
assert fulfillment.is_a?(ShopifyAPI::Fulfillment)
assert fulfillment.persisted?
assert_equal 346743624, fulfillment.id
end
end

context "#save" do
should "save a fulfillment with line_items_by_fulfillment_order" do
create_fulfillment_attributes = {
message: "The message for this FO fulfillment",
notify_customer: true,
tracking_info: {
number: "XSDFHYR23475",
url: "https://tracking.example.com/XSDFHYR23475",
company: "TFTC - the fulfillment/tracking company"
},
line_items_by_fulfillment_order: [
{
fulfillment_order_id: 3,
fulfillment_order_line_items: [{ id: 2, quantity: 1 }]
}
]
}
request_body = { fulfillment: create_fulfillment_attributes }
response_body = { fulfillment: create_fulfillment_attributes.merge(id: 346743624) }
fake "fulfillments", :method => :post,
request_body: ActiveSupport::JSON.encode(request_body),
body: ActiveSupport::JSON.encode(response_body)

fulfillment = ShopifyAPI::Fulfillment.new(create_fulfillment_attributes)
assert fulfillment.save
assert fulfillment.is_a?(ShopifyAPI::Fulfillment)
assert fulfillment.persisted?
assert_equal 346743624, fulfillment.id
end

should "save a fulfillment without line_items_by_fulfillment_order" do
order_id = 8
create_fulfillment_attributes = {
message: "The message for this FO fulfillment",
notify_customer: true,
tracking_info: {
number: "XSDFHYR23475",
url: "https://tracking.example.com/XSDFHYR23475",
company: "TFTC - the fulfillment/tracking company"
}
}
request_body = { fulfillment: create_fulfillment_attributes }
response_body = { fulfillment: create_fulfillment_attributes.merge(id: 346743624) }
fake "orders/#{order_id}/fulfillments", :method => :post,
request_body: ActiveSupport::JSON.encode(request_body),
body: ActiveSupport::JSON.encode(response_body)

fulfillment = ShopifyAPI::Fulfillment.new(create_fulfillment_attributes)
fulfillment.prefix_options[:order_id] = order_id

assert fulfillment.save
assert fulfillment.is_a?(ShopifyAPI::Fulfillment)
assert fulfillment.persisted?
assert_equal 346743624, fulfillment.id
end
end

context "#update_tracking" do
should "be able to update tracking info for a fulfillment" do
tracking_info = {
number: 'JSDHFHAG',
url: 'https://example.com/fulfillment_tracking/JSDHFHAG',
company: 'ACME co',
}
fake_fulfillment = ActiveSupport::JSON.decode(load_fixture('fulfillment'))['fulfillment']
fake_fulfillment['tracking_number'] = tracking_info[:number]
fake_fulfillment['tracking_numbers'] = [tracking_info[:number]]
fake_fulfillment['tracking_url'] = tracking_info[:url]
fake_fulfillment['tracking_urls'] = [tracking_info[:url]]
fake_fulfillment['tracking_company'] = tracking_info[:company]

request_body = {
fulfillment: {
tracking_info: tracking_info,
notify_customer: true
}
}
fake "fulfillments/#{fake_fulfillment['id']}/update_tracking", method: :post,
request_body: ActiveSupport::JSON.encode(request_body),
body: ActiveSupport::JSON.encode(fulfillment: fake_fulfillment)

fulfillment = ShopifyAPI::Fulfillment.new(id: fake_fulfillment['id'])
assert fulfillment.update_tracking(tracking_info: tracking_info, notify_customer: true)

assert_equal tracking_info[:number], fulfillment.tracking_number
assert_equal [tracking_info[:number]], fulfillment.tracking_numbers
assert_equal tracking_info[:url], fulfillment.tracking_url
assert_equal [tracking_info[:url]], fulfillment.tracking_urls
assert_equal tracking_info[:company], fulfillment.tracking_company
end
end
end
end
40 changes: 40 additions & 0 deletions test/fulfillment_v2_test.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
require 'test_helper'

class FulfillmentV2Test < Test::Unit::TestCase
context "FulfillmentV2" do
context "#update_tracking" do
should "be able to update tracking info for a fulfillment" do
tracking_info = {
number: 'JSDHFHAG',
url: 'https://example.com/fulfillment_tracking/JSDHFHAG',
company: 'ACME co',
}
fake_fulfillment = ActiveSupport::JSON.decode(load_fixture('fulfillment'))['fulfillment']
fake_fulfillment['tracking_number'] = tracking_info[:number]
fake_fulfillment['tracking_numbers'] = [tracking_info[:number]]
fake_fulfillment['tracking_url'] = tracking_info[:url]
fake_fulfillment['tracking_urls'] = [tracking_info[:url]]
fake_fulfillment['tracking_company'] = tracking_info[:company]

request_body = {
fulfillment: {
tracking_info: tracking_info,
notify_customer: true
}
}
fake "fulfillments/#{fake_fulfillment['id']}/update_tracking", method: :post,
request_body: ActiveSupport::JSON.encode(request_body),
body: ActiveSupport::JSON.encode(fulfillment: fake_fulfillment)

fulfillment = ShopifyAPI::FulfillmentV2.new(id: fake_fulfillment['id'])
assert fulfillment.update_tracking(tracking_info: tracking_info, notify_customer: true)

assert_equal tracking_info[:number], fulfillment.tracking_number
assert_equal [tracking_info[:number]], fulfillment.tracking_numbers
assert_equal tracking_info[:url], fulfillment.tracking_url
assert_equal [tracking_info[:url]], fulfillment.tracking_urls
assert_equal tracking_info[:company], fulfillment.tracking_company
end
end
end
end

0 comments on commit 2818c3b

Please sign in to comment.