according to the docs only draft orders should be expirable

2nd step towards #267
RailsEventStore · May 6, 2024 · bb57902 · bb57902
1 parent 031bf3b
commit bb57902
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 80 deletions.
diff --git a/ecommerce/ordering/lib/ordering/order.rb b/ecommerce/ordering/lib/ordering/order.rb
@@ -47,13 +47,12 @@ def reject
     end
 
     def confirm
-      raise OrderHasExpired if @state.equal?(:expired)
       raise NotPlaced unless @state.equal?(:placed)
       apply OrderConfirmed.new(data: { order_id: @id })
     end
 
     def expire
-      raise AlreadyConfirmed if @state.equal?(:confirmed)
+      raise AlreadySubmitted unless @state.equal?(:draft)
       apply OrderExpired.new(data: { order_id: @id })
     end
 
@@ -73,7 +72,6 @@ def remove_item(product_id)
     end
 
     def cancel
-      raise OrderHasExpired if @state.equal?(:expired)
       raise AlreadyConfirmed if @state.equal?(:confirmed)
       raise NotPlaced unless @state.equal?(:placed)
       apply OrderCancelled.new(data: { order_id: @id })

diff --git a/ecommerce/ordering/test/cancel_order_test.rb b/ecommerce/ordering/test/cancel_order_test.rb
@@ -68,28 +68,5 @@ def test_confirmed_order_cant_be_cancelled
         act(CancelOrder.new(order_id: aggregate_id))
       end
     end
-
-    def test_expired_order_cant_be_cancelled
-      aggregate_id = SecureRandom.uuid
-      product_id = SecureRandom.uuid
-      customer_id = SecureRandom.uuid
-
-      arrange(
-        AddItemToBasket.new(
-          order_id: aggregate_id,
-          product_id: product_id
-        ),
-        SubmitOrder.new(
-          order_id: aggregate_id,
-          order_number: "2018/12/1",
-          customer_id: customer_id
-        ),
-        SetOrderAsExpired.new(order_id: aggregate_id)
-      )
-
-      assert_raises(Order::OrderHasExpired) do
-        act(CancelOrder.new(order_id: aggregate_id))
-      end
-    end
   end
 end
diff --git a/ecommerce/ordering/test/confirm_order_test.rb b/ecommerce/ordering/test/confirm_order_test.rb
@@ -44,27 +44,5 @@ def test_submitted_order_will_be_confirmed
         act(ConfirmOrder.new(order_id: aggregate_id))
       end
     end
-
-    def test_expired_order_cannot_be_confirmed
-      aggregate_id = SecureRandom.uuid
-      product_id = SecureRandom.uuid
-      customer_id = SecureRandom.uuid
-      arrange(
-        AddItemToBasket.new(
-          order_id: aggregate_id,
-          product_id: product_id
-        ),
-        SubmitOrder.new(
-          order_id: aggregate_id,
-          order_number: "2018/12/1",
-          customer_id: customer_id
-        ),
-        SetOrderAsExpired.new(order_id: aggregate_id)
-      )
-
-      assert_raises(Order::OrderHasExpired) do
-        act(ConfirmOrder.new(order_id: aggregate_id))
-      end
-    end
   end
 end
diff --git a/ecommerce/ordering/test/order_test.rb b/ecommerce/ordering/test/order_test.rb
@@ -49,14 +49,14 @@ def test_disallowed_order_state_transitions
       submitted_order.reject
       assert_raises(Order::InvalidState) { submitted_order.cancel }
       assert_raises(Order::InvalidState) { submitted_order.confirm }
-      submitted_order.expire
+      assert_raises(Order::InvalidState) { submitted_order.expire }
 
       placed_order.submit(NumberGenerator.new.call)
       assert_raises(Order::InvalidState) { placed_order.accept }
       assert_raises(Order::InvalidState) { placed_order.reject }
       placed_order.cancel
       placed_order.confirm
-      placed_order.expire
+      assert_raises(Order::InvalidState) { placed_order.expire }
 
       confirmed_order.submit(NumberGenerator.new.call)
       assert_raises(Order::InvalidState) { confirmed_order.accept }
@@ -77,7 +77,7 @@ def test_disallowed_order_state_transitions
       assert_raises(Order::InvalidState) { expired_order.reject }
       assert_raises(Order::InvalidState) { expired_order.cancel }
       assert_raises(Order::InvalidState) { expired_order.confirm }
-      expired_order.expire
+      assert_raises(Order::InvalidState) { expired_order.expire }
 
       cancelled_order.submit(NumberGenerator.new.call)
       assert_raises(Order::InvalidState) { cancelled_order.accept }

diff --git a/ecommerce/ordering/test/set_order_as_expired_test.rb b/ecommerce/ordering/test/set_order_as_expired_test.rb
@@ -22,7 +22,7 @@ def test_draft_order_will_expire
       ) { act(SetOrderAsExpired.new(order_id: aggregate_id)) }
     end
 
-    def test_submitted_order_will_expire
+    def test_submitted_order_will_not_expire
       aggregate_id = SecureRandom.uuid
       stream = "Ordering::Order$#{aggregate_id}"
       product_id = SecureRandom.uuid
@@ -40,34 +40,7 @@ def test_submitted_order_will_expire
         )
       )
 
-      assert_events(
-        stream,
-        OrderExpired.new(data: { order_id: aggregate_id })
-      ) { act(SetOrderAsExpired.new(order_id: aggregate_id)) }
-    end
-
-    def test_confirmed_order_cannot_expire
-      aggregate_id = SecureRandom.uuid
-      product_id = SecureRandom.uuid
-      customer_id = SecureRandom.uuid
-
-      arrange(
-        AddItemToBasket.new(
-          order_id: aggregate_id,
-          product_id: product_id
-        ),
-        SubmitOrder.new(
-          order_id: aggregate_id,
-          order_number: "2018/12/1",
-          customer_id: customer_id
-        ),
-        AcceptOrder.new(order_id: aggregate_id),
-        ConfirmOrder.new(order_id: aggregate_id)
-      )
-
-      assert_raises(Order::AlreadyConfirmed) do
-        act(SetOrderAsExpired.new(order_id: aggregate_id))
-      end
+      assert_raises(Order::AlreadySubmitted) { act(SetOrderAsExpired.new(order_id: aggregate_id)) }
     end
   end
 end