From 7a47c642c58f52891c2b38a87f06661087d3c36b Mon Sep 17 00:00:00 2001 From: Igor Toporet Date: Sun, 7 Jan 2024 21:31:05 -0800 Subject: [PATCH] Fix typo (from "payed" to "paid") --- .../adapter/persistence/eventstore/EventStore.kt | 4 ++-- .../adapter/publisher/PaymentActionPublisher.kt | 4 ++-- src/main/kotlin/com/fraktalio/domain/OrderDecider.kt | 8 ++++---- src/main/kotlin/com/fraktalio/domain/OrderView.kt | 2 +- src/main/kotlin/com/fraktalio/domain/PaymentSaga.kt | 2 +- src/main/kotlin/com/fraktalio/domain/RestaurantSaga.kt | 2 +- src/main/kotlin/com/fraktalio/domain/api.kt | 10 +++++----- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/kotlin/com/fraktalio/adapter/persistence/eventstore/EventStore.kt b/src/main/kotlin/com/fraktalio/adapter/persistence/eventstore/EventStore.kt index 2c1e796..096bb69 100644 --- a/src/main/kotlin/com/fraktalio/adapter/persistence/eventstore/EventStore.kt +++ b/src/main/kotlin/com/fraktalio/adapter/persistence/eventstore/EventStore.kt @@ -266,13 +266,13 @@ internal class EventStore(private val connectionFactory: ConnectionFactory) { VALUES ('Order', 'com.fraktalio.domain.OrderPreparedEvent'); INSERT INTO deciders - VALUES ('Order', 'com.fraktalio.domain.OrderPayedEvent'); + VALUES ('Order', 'com.fraktalio.domain.OrderPaidEvent'); INSERT INTO deciders VALUES ('Order', 'com.fraktalio.domain.OrderNotPreparedEvent'); INSERT INTO deciders - VALUES ('Order', 'com.fraktalio.domain.OrderNotPayedEvent'); + VALUES ('Order', 'com.fraktalio.domain.OrderNotPaidEvent'); INSERT INTO deciders VALUES ('Order', 'com.fraktalio.domain.OrderRejectedEvent'); diff --git a/src/main/kotlin/com/fraktalio/adapter/publisher/PaymentActionPublisher.kt b/src/main/kotlin/com/fraktalio/adapter/publisher/PaymentActionPublisher.kt index 40f906a..ddb3856 100644 --- a/src/main/kotlin/com/fraktalio/adapter/publisher/PaymentActionPublisher.kt +++ b/src/main/kotlin/com/fraktalio/adapter/publisher/PaymentActionPublisher.kt @@ -3,7 +3,7 @@ package com.fraktalio.adapter.publisher import com.fraktalio.LOGGER import com.fraktalio.application.Aggregate import com.fraktalio.domain.Command -import com.fraktalio.domain.MarkOrderAsPayedCommand +import com.fraktalio.domain.MarkOrderAsPaidCommand import com.fraktalio.domain.PayCommand import com.fraktalio.fmodel.application.ActionPublisher import com.fraktalio.fmodel.application.handleOptimistically @@ -22,7 +22,7 @@ class PaymentActionPublisher(private val aggregate: Aggregate) : ActionPublisher LOGGER.info("Publishing command to the Payment service: $it") delay(1000) // once you get the response from the Payment service, you can emit command back to the internal aggregate - aggregate.handleOptimistically(MarkOrderAsPayedCommand((it as PayCommand).orderId)).collect() + aggregate.handleOptimistically(MarkOrderAsPaidCommand((it as PayCommand).orderId)).collect() // simply emit the successfully published command(s) emit(it) } diff --git a/src/main/kotlin/com/fraktalio/domain/OrderDecider.kt b/src/main/kotlin/com/fraktalio/domain/OrderDecider.kt index 80248be..e6412eb 100644 --- a/src/main/kotlin/com/fraktalio/domain/OrderDecider.kt +++ b/src/main/kotlin/com/fraktalio/domain/OrderDecider.kt @@ -38,15 +38,15 @@ fun orderDecider() = OrderDecider( ) else flowOf(OrderPreparedEvent(c.identifier)) - is MarkOrderAsPayedCommand -> - if (s == null) flowOf(OrderNotPayedEvent(c.identifier, Reason("Order does not exist"))) + is MarkOrderAsPaidCommand -> + if (s == null) flowOf(OrderNotPaidEvent(c.identifier, Reason("Order does not exist"))) else if (OrderStatus.PREPARED != s.status) flowOf( OrderNotPreparedEvent( c.identifier, Reason("Order not in PREPARED status"), ) ) - else flowOf(OrderPayedEvent(c.identifier)) + else flowOf(OrderPaidEvent(c.identifier)) null -> emptyFlow() // We ignore the `null` command by emitting the empty flow. Only the Decider that can handle `null` command can be combined (Monoid) with other Deciders. @@ -56,7 +56,7 @@ fun orderDecider() = OrderDecider( when (e) { is OrderCreatedEvent -> Order(e.identifier, e.restaurantId, e.status, e.lineItems) is OrderPreparedEvent -> s?.copy(status = e.status) - is OrderPayedEvent -> s?.copy(status = e.status) + is OrderPaidEvent -> s?.copy(status = e.status) is OrderRejectedEvent -> s?.copy(status = e.status) is OrderErrorEvent -> s // Error events are not changing the state in our/this case. null -> s // Null events are not changing the state / We return current state instead. Only the Decider that can handle `null` event can be combined (Monoid) with other Deciders. diff --git a/src/main/kotlin/com/fraktalio/domain/OrderView.kt b/src/main/kotlin/com/fraktalio/domain/OrderView.kt index 4e42ca0..f5df06f 100644 --- a/src/main/kotlin/com/fraktalio/domain/OrderView.kt +++ b/src/main/kotlin/com/fraktalio/domain/OrderView.kt @@ -23,7 +23,7 @@ fun orderView() = OrderView( when (e) { is OrderCreatedEvent -> OrderViewState(e.identifier, e.restaurantId, e.status, e.lineItems) is OrderPreparedEvent -> s?.copy(status = e.status) - is OrderPayedEvent -> s?.copy(status = e.status) + is OrderPaidEvent -> s?.copy(status = e.status) is OrderRejectedEvent -> s?.copy(status = e.status) is OrderErrorEvent -> s // Error events are not changing the state in our/this case. null -> s // Null events are not changing the state / We return current state instead. Only the Decider that can handle `null` event can be combined (Monoid) with other Deciders. diff --git a/src/main/kotlin/com/fraktalio/domain/PaymentSaga.kt b/src/main/kotlin/com/fraktalio/domain/PaymentSaga.kt index 67595ad..20be06c 100644 --- a/src/main/kotlin/com/fraktalio/domain/PaymentSaga.kt +++ b/src/main/kotlin/com/fraktalio/domain/PaymentSaga.kt @@ -23,7 +23,7 @@ fun paymentSaga() = PaymentSaga( is OrderPreparedEvent -> flowOf(PayCommand(orderId = e.identifier)) is OrderCreatedEvent -> emptyFlow() is OrderErrorEvent -> emptyFlow() - is OrderPayedEvent -> emptyFlow() + is OrderPaidEvent -> emptyFlow() is RestaurantEvent -> emptyFlow() null -> emptyFlow() // We ignore the `null` event by returning the empty flow of commands. Only the Saga that can handle `null` event/action-result can be combined (Monoid) with other Sagas. } diff --git a/src/main/kotlin/com/fraktalio/domain/RestaurantSaga.kt b/src/main/kotlin/com/fraktalio/domain/RestaurantSaga.kt index f0e6923..549ace8 100644 --- a/src/main/kotlin/com/fraktalio/domain/RestaurantSaga.kt +++ b/src/main/kotlin/com/fraktalio/domain/RestaurantSaga.kt @@ -22,7 +22,7 @@ fun restaurantSaga() = RestaurantSaga( //TODO evolve the example ;), it does not do much at the moment. is OrderCreatedEvent -> emptyFlow() is OrderPreparedEvent -> emptyFlow() - is OrderPayedEvent -> emptyFlow() + is OrderPaidEvent -> emptyFlow() is OrderErrorEvent -> emptyFlow() null -> emptyFlow() // We ignore the `null` event by returning the empty flow of commands. Only the Saga that can handle `null` event/action-result can be combined (Monoid) with other Sagas. } diff --git a/src/main/kotlin/com/fraktalio/domain/api.kt b/src/main/kotlin/com/fraktalio/domain/api.kt index 763650f..47bd5be 100644 --- a/src/main/kotlin/com/fraktalio/domain/api.kt +++ b/src/main/kotlin/com/fraktalio/domain/api.kt @@ -116,7 +116,7 @@ data class OrderLineItem( @Serializable enum class OrderStatus { - CREATED, PREPARED, REJECTED, CANCELLED, PAYED + CREATED, PREPARED, REJECTED, CANCELLED, PAID } @Serializable @@ -178,7 +178,7 @@ data class MarkOrderAsPreparedCommand( ) : OrderCommand() @Serializable -data class MarkOrderAsPayedCommand( +data class MarkOrderAsPaidCommand( override val identifier: OrderId, ) : OrderCommand() @@ -299,11 +299,11 @@ data class OrderPreparedEvent( } @Serializable -data class OrderPayedEvent( +data class OrderPaidEvent( override val identifier: OrderId, override val final: Boolean = false, ) : OrderEvent() { - val status: OrderStatus = OrderStatus.PAYED + val status: OrderStatus = OrderStatus.PAID } @Serializable @@ -314,7 +314,7 @@ data class OrderNotPreparedEvent( ) : OrderErrorEvent() @Serializable -data class OrderNotPayedEvent( +data class OrderNotPaidEvent( override val identifier: OrderId, override val reason: Reason, override val final: Boolean = false,