From fde9c1e6bf5febd5d26638f268617c10cfecbc92 Mon Sep 17 00:00:00 2001
From: Keith Kim <karmakaze@users.noreply.github.com>
Date: Tue, 26 Nov 2019 11:38:04 -0500
Subject: [PATCH] Update V2 for PR review

---
 .../resources/assigned_fulfillment_order.rb      | 16 ----------------
 lib/shopify_api/resources/fulfillment_order.rb   |  2 +-
 .../resources/fulfillment_order_fulfillment.rb   |  4 ----
 lib/shopify_api/resources/fulfillment_v2.rb      |  4 ++++
 test/assigned_fulfillment_order_test.rb          | 10 +---------
 test/fulfillment_order_test.rb                   |  2 +-
 6 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 lib/shopify_api/resources/fulfillment_order_fulfillment.rb
 create mode 100644 lib/shopify_api/resources/fulfillment_v2.rb

diff --git a/lib/shopify_api/resources/assigned_fulfillment_order.rb b/lib/shopify_api/resources/assigned_fulfillment_order.rb
index cd0e1c90e..4f8a674b9 100644
--- a/lib/shopify_api/resources/assigned_fulfillment_order.rb
+++ b/lib/shopify_api/resources/assigned_fulfillment_order.rb
@@ -1,22 +1,6 @@
 module ShopifyAPI
   class AssignedFulfillmentOrder < Base
-    CANCELLATION_REQUESTED = 'cancellation_requested'
-    FULFILLMENT_REQUESTED = 'fulfillment_requested'
-    FULFILLMENT_ACCEPTED = 'fulfillment_accepted'
-
-    ALL_ASSIGNED_STATUSES = [
-      CANCELLATION_REQUESTED = 'cancellation_requested',
-      FULFILLMENT_REQUESTED = 'fulfillment_requested',
-      FULFILLMENT_ACCEPTED = 'fulfillment_accepted'
-    ].freeze
-
     def self.all(options = {})
-      params = options[:params] || options['params'] || {}
-      assigned_status = params[:assigned_status] || params['assigned_status']
-      if assigned_status && !ALL_ASSIGNED_STATUSES.include?(assigned_status)
-        raise ValidationException, "Invalid 'assigned_status': #{assigned_status}"
-      end
-
       assigned_fulfillment_orders = super(options)
       assigned_fulfillment_orders.map { |afo| FulfillmentOrder.new(afo.as_json) }
     end
diff --git a/lib/shopify_api/resources/fulfillment_order.rb b/lib/shopify_api/resources/fulfillment_order.rb
index 8566c02d6..0569ca4a2 100644
--- a/lib/shopify_api/resources/fulfillment_order.rb
+++ b/lib/shopify_api/resources/fulfillment_order.rb
@@ -10,7 +10,7 @@ def self.all(options = {})
 
     def fulfillments(options = {})
       fo_fulfillments = get(:fulfillments, options)
-      fo_fulfillments.map { |fof| FulfillmentOrderFulfillment.new(fof.as_json) }
+      fo_fulfillments.map { |fof| FulfillmentV2.new(fof.as_json) }
     end
   end
 end
diff --git a/lib/shopify_api/resources/fulfillment_order_fulfillment.rb b/lib/shopify_api/resources/fulfillment_order_fulfillment.rb
deleted file mode 100644
index c61ba71aa..000000000
--- a/lib/shopify_api/resources/fulfillment_order_fulfillment.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module ShopifyAPI
-  class FulfillmentOrderFulfillment < Base
-  end
-end
diff --git a/lib/shopify_api/resources/fulfillment_v2.rb b/lib/shopify_api/resources/fulfillment_v2.rb
new file mode 100644
index 000000000..1aea373eb
--- /dev/null
+++ b/lib/shopify_api/resources/fulfillment_v2.rb
@@ -0,0 +1,4 @@
+module ShopifyAPI
+  class FulfillmentV2 < Base
+  end
+end
diff --git a/test/assigned_fulfillment_order_test.rb b/test/assigned_fulfillment_order_test.rb
index 4d72d37f9..633091d27 100644
--- a/test/assigned_fulfillment_order_test.rb
+++ b/test/assigned_fulfillment_order_test.rb
@@ -3,21 +3,13 @@
 class AssignedFulFillmentOrderTest < Test::Unit::TestCase
   context "AssignedFulfillmentOrder" do
     context "#all" do
-      should "raise ValidationException if assigned_status is invalid" do
-        assert_raises ShopifyAPI::ValidationException do
-          assigned_fulfillment_orders = ShopifyAPI::AssignedFulfillmentOrder.all(
-            params: { assigned_status: 'bogus_status' }
-          )
-        end
-      end
-
       should "list assigned fulfillment orders by assigned_status" do
         fo_fixture = load_fixture('assigned_fulfillment_orders')
         fake 'assigned_fulfillment_orders.json?assigned_status=cancellation_requested', method: :get,
              body: fo_fixture, extension: false
 
         assigned_fulfillment_orders = ShopifyAPI::AssignedFulfillmentOrder.all(
-            params: { assigned_status: ShopifyAPI::AssignedFulfillmentOrder::CANCELLATION_REQUESTED }
+            params: { assigned_status: 'cancellation_requested' }
         )
 
         assert_equal 2, assigned_fulfillment_orders.count
diff --git a/test/fulfillment_order_test.rb b/test/fulfillment_order_test.rb
index 8eb79fd13..d9c16dc3a 100644
--- a/test/fulfillment_order_test.rb
+++ b/test/fulfillment_order_test.rb
@@ -50,7 +50,7 @@ def setup
 
         assert_equal 1, fulfillments.count
         fulfillment = fulfillments.first
-        assert_equal 'ShopifyAPI::FulfillmentOrderFulfillment', fulfillment.class.name
+        assert_equal 'ShopifyAPI::FulfillmentV2', fulfillment.class.name
         assert_equal 450789469, fulfillment.order_id
       end
     end