From 26eee4631f22a9e5bda4968a65634ae5e17a5529 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 28 Jul 2020 23:40:49 +0100 Subject: [PATCH] Rename AdvanceOrderService to OrderWorkflow --- .../spree/admin/orders/customer_details_controller.rb | 2 +- app/controllers/spree/admin/orders_controller.rb | 2 +- app/jobs/subscription_placement_job.rb | 2 +- .../{advance_order_service.rb => order_workflow.rb} | 6 +++--- ...ce_order_service_spec.rb => order_workflow_spec.rb} | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) rename app/services/{advance_order_service.rb => order_workflow.rb} (94%) rename spec/services/{advance_order_service_spec.rb => order_workflow_spec.rb} (89%) diff --git a/app/controllers/spree/admin/orders/customer_details_controller.rb b/app/controllers/spree/admin/orders/customer_details_controller.rb index 82c0c2347e..3239ffff01 100644 --- a/app/controllers/spree/admin/orders/customer_details_controller.rb +++ b/app/controllers/spree/admin/orders/customer_details_controller.rb @@ -23,7 +23,7 @@ module Spree @order.associate_user!(Spree.user_class.find_by(email: @order.email)) end - AdvanceOrderService.new(@order).call + OrderWorkflow.new(@order).complete @order.shipments.map(&:refresh_rates) flash[:success] = Spree.t('customer_details_updated') diff --git a/app/controllers/spree/admin/orders_controller.rb b/app/controllers/spree/admin/orders_controller.rb index 8cde99be81..e0b07fbbd9 100644 --- a/app/controllers/spree/admin/orders_controller.rb +++ b/app/controllers/spree/admin/orders_controller.rb @@ -35,7 +35,7 @@ module Spree def edit @order.shipments.map(&:refresh_rates) - AdvanceOrderService.new(@order).call + OrderWorkflow.new(@order).complete # The payment step shows an error of 'No pending payments' # Clearing the errors from the order object will stop this error diff --git a/app/jobs/subscription_placement_job.rb b/app/jobs/subscription_placement_job.rb index 8b5df2b159..320c7b199a 100644 --- a/app/jobs/subscription_placement_job.rb +++ b/app/jobs/subscription_placement_job.rb @@ -66,7 +66,7 @@ class SubscriptionPlacementJob end def move_to_completion(order) - AdvanceOrderService.new(order).call! + OrderWorkflow.new(order).complete! end def unavailable_stock_lines_for(order) diff --git a/app/services/advance_order_service.rb b/app/services/order_workflow.rb similarity index 94% rename from app/services/advance_order_service.rb rename to app/services/order_workflow.rb index 1377c36147..ab4673b970 100644 --- a/app/services/advance_order_service.rb +++ b/app/services/order_workflow.rb @@ -1,15 +1,15 @@ -class AdvanceOrderService +class OrderWorkflow attr_reader :order def initialize(order) @order = order end - def call + def complete advance_order(advance_order_options) end - def call! + def complete! advance_order!(advance_order_options) end diff --git a/spec/services/advance_order_service_spec.rb b/spec/services/order_workflow_spec.rb similarity index 89% rename from spec/services/advance_order_service_spec.rb rename to spec/services/order_workflow_spec.rb index 58a2fcb03a..5b2b6f0bf5 100644 --- a/spec/services/advance_order_service_spec.rb +++ b/spec/services/order_workflow_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -describe AdvanceOrderService do +describe OrderWorkflow do let!(:distributor) { create(:distributor_enterprise) } let!(:order) do create(:order_with_totals_and_distribution, distributor: distributor, @@ -13,7 +13,7 @@ describe AdvanceOrderService do it "transitions the order multiple steps" do expect(order.state).to eq("cart") - service.call + service.complete order.reload expect(order.state).to eq("complete") end @@ -30,7 +30,7 @@ describe AdvanceOrderService do it "retains delivery method of the order" do order.select_shipping_method(shipping_method_b.id) - service.call + service.complete order.reload expect(order.shipping_method).to eq(shipping_method_b) end @@ -38,7 +38,7 @@ describe AdvanceOrderService do context "when raising on error" do it "transitions the order multiple steps" do - service.call! + service.complete! order.reload expect(order.state).to eq("complete") end @@ -49,7 +49,7 @@ describe AdvanceOrderService do end it "raises error" do - expect { service.call! }.to raise_error(StateMachine::InvalidTransition) + expect { service.complete! }.to raise_error(StateMachine::InvalidTransition) end end end