Extend PercentageDiscountRemoved event by base_total_value

another step to get rid of OrderTotalValueCalculated

Author: lukaszreszke

ecommerce/pricing/lib/pricing/events.rb

@@ -62,6 +62,8 @@ class PriceItemRemoved < Infra::Event
   class PercentageDiscountRemoved < Infra::Event
     attribute :order_id, Infra::Types::UUID
     attribute :type, Infra::Types::String
+    attribute :base_total_value, Infra::Types::Price
+    attribute :total_value, Infra::Types::Price
   end
 
   class PercentageDiscountChanged < Infra::Event

ecommerce/pricing/lib/pricing/offer.rb

@@ -75,10 +75,17 @@ def change_discount(discount)
 
     def remove_discount(type)
       raise NotPossibleToRemoveWithoutDiscount unless discount_exists?(type)
+      discount = @discounts.find { |d| d.type == type }
+
+      discounted_value = @list.base_sum * (discount.value / 100)
+
+
       apply PercentageDiscountRemoved.new(
         data: {
           order_id: @id,
-          type: type
+          type: type,
+          base_total_value: @list.base_sum,
+          total_value: @list.actual_sum + discounted_value,
         }
       )
     end
@@ -175,6 +182,7 @@ def expire
 
     on PriceItemAdded do |event|
       @list.add_item(event.data.fetch(:product_id), event.data.fetch(:base_price), event.data.fetch(:price))
+      @list.apply_discounts(@discounts)
     end
 
     on PriceItemRemoved do |event|

ecommerce/pricing/test/apply_time_promotion_test.rb

@@ -92,7 +92,9 @@ def percentage_discount_removed_event(order_id)
       PercentageDiscountRemoved.new(
         data: {
           order_id: order_id,
-          type: Pricing::Discounts::TIME_PROMOTION_DISCOUNT
+          type: Pricing::Discounts::TIME_PROMOTION_DISCOUNT,
+          base_total_value: 1000,
+          total_value: 1000
         }
       )
     end

ecommerce/pricing/test/pricing_test.rb

@@ -130,7 +130,9 @@ def test_removes_time_promotion_discount
         PercentageDiscountRemoved.new(
           data: {
             order_id: order_id,
-            type: Discounts::TIME_PROMOTION_DISCOUNT
+            type: Discounts::TIME_PROMOTION_DISCOUNT,
+            base_total_value: 0,
+            total_value: 0
           }
         )
       ) { remove_time_promotion_discount(order_id) }
@@ -207,7 +209,9 @@ def test_calculates_total_value_with_discount
         PercentageDiscountRemoved.new(
           data: {
             order_id: order_id,
-            type: Pricing::Discounts::GENERAL_DISCOUNT
+            type: Pricing::Discounts::GENERAL_DISCOUNT,
+            base_total_value: 20,
+            total_value: 20
           }
         ),
         OrderTotalValueCalculated.new(
@@ -408,7 +412,9 @@ def test_removing_discount_possible_when_discount_has_been_set_and_then_changed
         PercentageDiscountRemoved.new(
           data: {
             order_id: order_id,
-            type: Discounts::GENERAL_DISCOUNT
+            type: Discounts::GENERAL_DISCOUNT,
+            base_total_value: 20,
+            total_value: 20
           }
         ),
         OrderTotalValueCalculated.new(