use only Pricing commands when managing offer

Author: porbas

rails_application/app/controllers/client/orders_controller.rb

@@ -38,7 +38,7 @@ def add_item
       end
       ActiveRecord::Base.transaction do
         command_bus.(
-          Ordering::AddItemToBasket.new(
+          Pricing::AddPriceItem.new(
             order_id: params[:id],
             product_id: params[:product_id]
           )

rails_application/app/controllers/orders_controller.rb

@@ -63,15 +63,15 @@ def add_item
                   alert: "Product not available in requested quantity!" and return
     end
     ActiveRecord::Base.transaction do
-      command_bus.(Ordering::AddItemToBasket.new(order_id: params[:id], product_id: params[:product_id]))
+      command_bus.(Pricing::AddPriceItem.new(order_id: params[:id], product_id: params[:product_id]))
     end
     head :ok
   end
 
   def remove_item
     item = Orders::OrderLine.where(order_uid: params[:id], product_id: params[:product_id]).first
     command_bus.(Pricing::RemovePriceItem.new(
-      order_id: params[:id], product_id: params[:product_id], price: item.price, catalog_price: item.catalog_price)
+      order_id: params[:id], product_id: params[:product_id], catalog_price: item.catalog_price)
     )
     head :ok
   end

rails_application/app/read_models/client_orders/configuration.rb

@@ -43,7 +43,7 @@ class Configuration
     def call(event_store)
       event_store.subscribe(OrderHandlers::ExpireOrder, to: [Ordering::OrderExpired])
       event_store.subscribe(OrderHandlers::CancelOrder, to: [Fulfillment::OrderCancelled])
-      event_store.subscribe(OrderHandlers::SubmitOrder, to: [Ordering::OrderPlaced])
+      event_store.subscribe(OrderHandlers::SubmitOrder, to: [Fulfillment::OrderRegistered])
       event_store.subscribe(OrderHandlers::ConfirmOrder, to: [Fulfillment::OrderConfirmed])
       event_store.subscribe(AddItemToOrder, to: [Pricing::PriceItemAdded])
       event_store.subscribe(RemoveItemFromOrder, to: [Pricing::PriceItemRemoved])

rails_application/app/read_models/orders/configuration.rb

@@ -67,7 +67,7 @@ def call(event_store)
       event_store.subscribe(ChangeProductPrice.new, to: [Pricing::PriceSet])
       event_store.subscribe(CreateCustomer.new, to: [Crm::CustomerRegistered])
       event_store.subscribe(AssignCustomerToOrder.new, to: [Crm::CustomerAssignedToOrder])
-      event_store.subscribe(SubmitOrder.new, to: [Ordering::OrderPlaced])
+      event_store.subscribe(SubmitOrder.new, to: [Fulfillment::OrderRegistered])
       event_store.subscribe(ExpireOrder.new, to: [Ordering::OrderExpired])
       event_store.subscribe(ConfirmOrder.new, to: [Fulfillment::OrderConfirmed])
       event_store.subscribe(CancelOrder.new, to: [Fulfillment::OrderCancelled])

rails_application/app/services/client/orders/submit_service.rb

@@ -38,7 +38,7 @@ def call
 
       def submit_order
         ActiveRecord::Base.transaction do
-          command_bus.(Ordering::SubmitOrder.new(order_id: order_id))
+          command_bus.(Pricing::AcceptOffer.new(order_id: order_id))
           command_bus.(Crm::AssignCustomerToOrder.new(order_id: order_id, customer_id: customer_id))
         end
       end

rails_application/app/services/orders/submit_service.rb

@@ -37,7 +37,7 @@ def call
 
     def submit_order
       ActiveRecord::Base.transaction do
-        command_bus.(Ordering::SubmitOrder.new(order_id: order_id))
+        command_bus.(Pricing::AcceptOffer.new(order_id: order_id))
         command_bus.(Crm::AssignCustomerToOrder.new(order_id: order_id, customer_id: customer_id))
       end
     end

rails_application/test/services/client/orders/submit_service_test.rb

@@ -12,7 +12,7 @@ def test_successful_order_submission
 
         run_command(Crm::RegisterCustomer.new(customer_id: customer_id, name: "John Doe"))
         prepare_product(product_id, "Async Remote", 49)
-        run_command(Ordering::AddItemToBasket.new(order_id: order_id, product_id: product_id))
+        run_command(Pricing::AddPriceItem.new(order_id: order_id, product_id: product_id))
 
         Client::Orders::SubmitService.call(order_id: order_id, customer_id: customer_id)
 
@@ -32,9 +32,9 @@ def test_order_submission_with_unavailable_products
         prepare_product(product_id, "Async Remote", 49)
         run_command(Inventory::Supply.new(product_id: product_id, quantity: 1))
         run_command(Inventory::Reserve.new(product_id: product_id, quantity: 1))
-        run_command(Ordering::AddItemToBasket.new(order_id: order_id, product_id: product_id))
+        run_command(Pricing::AddPriceItem.new(order_id: order_id, product_id: product_id))
         prepare_product(another_product_id, "Fearless Refactoring", 49)
-        run_command(Ordering::AddItemToBasket.new(order_id: order_id, product_id: another_product_id))
+        run_command(Pricing::AddPriceItem.new(order_id: order_id, product_id: another_product_id))
 
         error = assert_raises(OrderHasUnavailableProducts) do
           SubmitService.new(order_id: order_id, customer_id: customer_id).call

rails_application/test/services/orders/submit_service_test.rb

@@ -11,7 +11,7 @@ def test_successful_order_submission
 
       run_command(Crm::RegisterCustomer.new(customer_id: customer_id, name: "John Doe"))
       prepare_product(product_id, "Async Remote", 49)
-      run_command(Ordering::AddItemToBasket.new(order_id: order_id, product_id: product_id))
+      run_command(Pricing::AddPriceItem.new(order_id: order_id, product_id: product_id))
 
       Orders::SubmitService.call(order_id: order_id, customer_id: customer_id)
 
@@ -31,9 +31,9 @@ def test_order_submission_with_unavailable_products
       prepare_product(product_id, "Async Remote", 49)
       run_command(Inventory::Supply.new(product_id: product_id, quantity: 1))
       run_command(Inventory::Reserve.new(product_id: product_id, quantity: 1))
-      run_command(Ordering::AddItemToBasket.new(order_id: order_id, product_id: product_id))
+      run_command(Pricing::AddPriceItem.new(order_id: order_id, product_id: product_id))
       prepare_product(another_product_id, "Fearless Refactoring", 49)
-      run_command(Ordering::AddItemToBasket.new(order_id: order_id, product_id: another_product_id))
+      run_command(Pricing::AddPriceItem.new(order_id: order_id, product_id: another_product_id))
 
       error = assert_raises(Orders::OrderHasUnavailableProducts) do
         Orders::SubmitService.new(order_id: order_id, customer_id: customer_id).call