Rely on Pricing/Offering events instead of Ordering

We want to remove items tracking from Ordering eventually.
RailsEventStore · Sep 27, 2024 · 120070d · 120070d
1 parent d46feee
commit 120070d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 39 deletions.
diff --git a/rails_application/app/read_models/client_orders/configuration.rb b/rails_application/app/read_models/client_orders/configuration.rb
@@ -45,8 +45,8 @@ def call(event_store)
       event_store.subscribe(OrderHandlers::CancelOrder, to: [Fulfillment::OrderCancelled])
       event_store.subscribe(OrderHandlers::SubmitOrder, to: [Ordering::OrderPlaced])
       event_store.subscribe(OrderHandlers::ConfirmOrder, to: [Fulfillment::OrderConfirmed])
-      event_store.subscribe(AddItemToOrder, to: [Ordering::ItemAddedToBasket])
-      event_store.subscribe(RemoveItemFromOrder, to: [Ordering::ItemRemovedFromBasket])
+      event_store.subscribe(AddItemToOrder, to: [Pricing::PriceItemAdded])
+      event_store.subscribe(RemoveItemFromOrder, to: [Pricing::PriceItemRemoved])
 
       event_store.subscribe(CreateCustomer.new, to: [Crm::CustomerRegistered])
       event_store.subscribe(OrderHandlers::AssignCustomerToOrder, to: [Crm::CustomerAssignedToOrder])

diff --git a/rails_application/app/read_models/orders/configuration.rb b/rails_application/app/read_models/orders/configuration.rb
@@ -32,8 +32,8 @@ def call(event_store)
 
       Rails.configuration.broadcaster = Orders::Broadcaster.new
 
-      event_store.subscribe(AddItemToOrder.new, to: [Ordering::ItemAddedToBasket])
-      event_store.subscribe(RemoveItemFromOrder.new, to: [Ordering::ItemRemovedFromBasket])
+      event_store.subscribe(AddItemToOrder.new, to: [Pricing::PriceItemAdded])
+      event_store.subscribe(RemoveItemFromOrder.new, to: [Pricing::PriceItemRemoved])
       event_store.subscribe(UpdateDiscount.new, to: [Pricing::PercentageDiscountSet, Pricing::PercentageDiscountChanged])
       event_store.subscribe(ResetDiscount.new, to: [Pricing::PercentageDiscountReset])
       event_store.subscribe(UpdateOrderTotalValue.new, to: [Pricing::OrderTotalValueCalculated])

diff --git a/rails_application/test/client_orders/item_added_to_basket_test.rb b/rails_application/test/client_orders/item_added_to_basket_test.rb
@@ -30,11 +30,10 @@ def test_add_new_item
       order_id = SecureRandom.uuid
 
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: product_id,
-            quantity_before: 0
           }
         )
       )
@@ -73,21 +72,19 @@ def test_add_the_same_item_2nd_time
 
       order_id = SecureRandom.uuid
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: product_id,
-            quantity_before: 0
           }
         )
       )
 
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: product_id,
-            quantity_before: 1
           }
         )
       )
@@ -142,17 +139,16 @@ def test_add_another_item
 
       order_id = SecureRandom.uuid
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: product_id,
-            quantity_before: 0
           }
         )
       )
 
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: another_product_id,

diff --git a/rails_application/test/integration/orders_test.rb b/rails_application/test/integration/orders_test.rb
@@ -356,7 +356,7 @@ def assert_res_browser_order_history
         .map { |data| data.fetch("attributes").fetch("event_type") }
 
     assert(event_names.include?("Fulfillment::OrderConfirmed"))
-    assert(event_names.include?("Ordering::ItemAddedToBasket"))
+    assert(event_names.include?("Pricing::PriceItemAdded"))
     assert(event_names.include?("Pricing::OrderTotalValueCalculated"))
     assert(event_names.include?("Ordering::OrderPlaced"))
   end

diff --git a/rails_application/test/orders/item_added_to_basket_test.rb b/rails_application/test/orders/item_added_to_basket_test.rb
@@ -29,11 +29,10 @@ def test_add_new_item
 
       order_id = SecureRandom.uuid
 
-      item_added_to_basket = Ordering::ItemAddedToBasket.new(
+      item_added_to_basket = Pricing::PriceItemAdded.new(
         data: {
           order_id: order_id,
           product_id: product_id,
-          quantity_before: 0
         }
       )
       event_store.publish(item_added_to_basket)
@@ -73,21 +72,19 @@ def test_add_the_same_item_2nd_time
 
       order_id = SecureRandom.uuid
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: product_id,
-            quantity_before: 0
           }
         )
       )
 
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: product_id,
-            quantity_before: 1
           }
         )
       )
@@ -142,21 +139,19 @@ def test_add_another_item
 
       order_id = SecureRandom.uuid
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: product_id,
-            quantity_before: 0
           }
         )
       )
 
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: another_product_id,
-            quantity_before: 0
           }
         )
       )

diff --git a/rails_application/test/orders/item_removed_from_basket_test.rb b/rails_application/test/orders/item_removed_from_basket_test.rb
@@ -33,24 +33,22 @@ def test_remove_item_when_quantity_gt_1
       )
       order_id = SecureRandom.uuid
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: product_id,
-            quantity_before: 0
           }
         )
       )
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: product_id,
-            quantity_before: 1
           }
         )
       )
-      item_removed_from_basket = Ordering::ItemRemovedFromBasket.new(
+      item_removed_from_basket = Pricing::PriceItemRemoved.new(
         data: {
           order_id: order_id,
           product_id: product_id
@@ -82,16 +80,15 @@ def test_remove_item_when_quantity_eq_1
       )
       order_id = SecureRandom.uuid
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: product_id,
-            quantity_before: 0
           }
         )
       )
       event_store.publish(
-        Ordering::ItemRemovedFromBasket.new(
+        Pricing::PriceItemRemoved.new(
           data: {
             order_id: order_id,
             product_id: product_id
@@ -140,34 +137,31 @@ def test_remove_item_when_there_is_another_item
       )
       order_id = SecureRandom.uuid
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: product_id,
-            quantity_before: 0
           }
         )
       )
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: product_id,
-            quantity_before: 1
           }
         )
       )
       event_store.publish(
-        Ordering::ItemAddedToBasket.new(
+        Pricing::PriceItemAdded.new(
           data: {
             order_id: order_id,
             product_id: another_product_id,
-            quantity_before: 0
           }
         )
       )
       event_store.publish(
-        Ordering::ItemRemovedFromBasket.new(
+        Pricing::PriceItemRemoved.new(
           data: {
             order_id: order_id,
             product_id: another_product_id