From b67263ca6f30f8cd302422f01ae0d74d60999b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Rasztabiga?= <contact@rasztabiga.me>
Date: Sat, 7 Oct 2023 21:21:54 +0200
Subject: [PATCH] feat(backend): Replace interceptors with calls to ports

---
 .../domain/command/aggregate/OrderDelivery.kt | 25 ++++-
 .../command/command/PickupDeliveryCommand.kt  |  1 -
 .../command/port/CourierOnlineVerifierPort.kt |  6 ++
 .../axon/AxonCourierOnlineVerifierAdapter.kt  | 22 +++++
 frontend/app/models/order.server.ts           |  3 +-
 .../ordering.orders.$orderId.payment.tsx      | 22 ++---
 .../ordering.restaurants.$restaurantId.tsx    |  1 +
 .../out/axon/AxonOrderVerificationAdapter.kt  | 71 ++++++++++++++
 .../order/config/CommandConfiguration.kt      | 22 -----
 .../order/domain/command/aggregate/Order.kt   | 26 ++++-
 .../FinalizeOrderCommandInterceptor.kt        | 95 -------------------
 .../StartOrderCommandInterceptor.kt           | 63 ------------
 .../command/port/OrderVerificationPort.kt     | 16 ++++
 .../payment/config/CommandConfiguration.kt    | 17 ----
 14 files changed, 171 insertions(+), 219 deletions(-)
 create mode 100644 delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/port/CourierOnlineVerifierPort.kt
 create mode 100644 delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/infrastructure/axon/AxonCourierOnlineVerifierAdapter.kt
 create mode 100644 order/src/main/kotlin/me/rasztabiga/thesis/order/adapter/out/axon/AxonOrderVerificationAdapter.kt
 delete mode 100644 order/src/main/kotlin/me/rasztabiga/thesis/order/config/CommandConfiguration.kt
 delete mode 100644 order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/interceptor/FinalizeOrderCommandInterceptor.kt
 delete mode 100644 order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/interceptor/StartOrderCommandInterceptor.kt
 create mode 100644 order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/port/OrderVerificationPort.kt
 delete mode 100644 restaurant/src/main/kotlin/me/rasztabiga/thesis/payment/config/CommandConfiguration.kt

diff --git a/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/aggregate/OrderDelivery.kt b/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/aggregate/OrderDelivery.kt
index e0e46d8f..9abb2666 100644
--- a/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/aggregate/OrderDelivery.kt
+++ b/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/aggregate/OrderDelivery.kt
@@ -5,6 +5,7 @@ import me.rasztabiga.thesis.delivery.domain.command.command.DeliverDeliveryComma
 import me.rasztabiga.thesis.delivery.domain.command.command.PickupDeliveryCommand
 import me.rasztabiga.thesis.delivery.domain.command.command.RejectDeliveryOfferCommand
 import me.rasztabiga.thesis.delivery.domain.command.port.CalculateDeliveryFeePort
+import me.rasztabiga.thesis.delivery.domain.command.port.CourierOnlineVerifierPort
 import me.rasztabiga.thesis.delivery.domain.command.port.OrderPreparedVerifierPort
 import me.rasztabiga.thesis.shared.domain.command.command.CreateOrderDeliveryOfferCommand
 import me.rasztabiga.thesis.shared.domain.command.event.OrderDeliveryAcceptedEvent
@@ -52,8 +53,11 @@ class OrderDelivery {
     }
 
     @CommandHandler
-    fun handle(command: RejectDeliveryOfferCommand) {
+    fun handle(command: RejectDeliveryOfferCommand, courierOnlineVerifierPort: CourierOnlineVerifierPort) {
         require(this.status == DeliveryStatus.OFFER) { "Delivery can be rejected only if it's in OFFER status." }
+        require(courierOnlineVerifierPort.isCourierOnline(this.courierId!!)) {
+            "Delivery can be rejected only if the courier is online."
+        }
 
         apply(
             OrderDeliveryRejectedEvent(
@@ -64,8 +68,11 @@ class OrderDelivery {
     }
 
     @CommandHandler
-    fun handle(command: AcceptDeliveryOfferCommand) {
+    fun handle(command: AcceptDeliveryOfferCommand, courierOnlineVerifierPort: CourierOnlineVerifierPort) {
         require(this.status == DeliveryStatus.OFFER) { "Delivery can be accepted only if it's in OFFER status." }
+        require(courierOnlineVerifierPort.isCourierOnline(this.courierId!!)) {
+            "Delivery can be accepted only if the courier is online."
+        }
 
         apply(
             OrderDeliveryAcceptedEvent(
@@ -77,7 +84,11 @@ class OrderDelivery {
     }
 
     @CommandHandler
-    fun handle(command: PickupDeliveryCommand, orderPreparedVerifierPort: OrderPreparedVerifierPort) {
+    fun handle(
+        command: PickupDeliveryCommand,
+        orderPreparedVerifierPort: OrderPreparedVerifierPort,
+        courierOnlineVerifierPort: CourierOnlineVerifierPort
+    ) {
         require(this.status == DeliveryStatus.ACCEPTED) { "Delivery can be picked up only if it's in ACCEPTED status." }
         require(this.courierId == command.courierId) {
             "Delivery can be picked up only by the courier who accepted it."
@@ -85,6 +96,9 @@ class OrderDelivery {
         require(orderPreparedVerifierPort.isOrderPrepared(this.orderId)) {
             "Delivery can be picked up only if the order is prepared."
         }
+        require(courierOnlineVerifierPort.isCourierOnline(this.courierId!!)) {
+            "Delivery can be picked up only if the courier is online."
+        }
 
         apply(
             OrderDeliveryPickedUpEvent(
@@ -96,13 +110,16 @@ class OrderDelivery {
     }
 
     @CommandHandler
-    fun handle(command: DeliverDeliveryCommand) {
+    fun handle(command: DeliverDeliveryCommand, courierOnlineVerifierPort: CourierOnlineVerifierPort) {
         require(this.status == DeliveryStatus.PICKED_UP) {
             "Delivery can be delivered only if it's in PICKED_UP status."
         }
         require(this.courierId == command.courierId) {
             "Delivery can be delivered only by the courier who picked it up."
         }
+        require(courierOnlineVerifierPort.isCourierOnline(this.courierId!!)) {
+            "Delivery can be delivered only if the courier is online."
+        }
 
         apply(
             OrderDeliveryDeliveredEvent(
diff --git a/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/command/PickupDeliveryCommand.kt b/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/command/PickupDeliveryCommand.kt
index 8ed772f6..d9c69a4a 100644
--- a/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/command/PickupDeliveryCommand.kt
+++ b/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/command/PickupDeliveryCommand.kt
@@ -3,7 +3,6 @@ package me.rasztabiga.thesis.delivery.domain.command.command
 import org.axonframework.modelling.command.TargetAggregateIdentifier
 import java.util.UUID
 
-// TODO verify that restaurant order is prepared
 data class PickupDeliveryCommand(
     @TargetAggregateIdentifier val id: UUID,
     val courierId: String
diff --git a/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/port/CourierOnlineVerifierPort.kt b/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/port/CourierOnlineVerifierPort.kt
new file mode 100644
index 00000000..138741e7
--- /dev/null
+++ b/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/port/CourierOnlineVerifierPort.kt
@@ -0,0 +1,6 @@
+package me.rasztabiga.thesis.delivery.domain.command.port
+
+interface CourierOnlineVerifierPort {
+
+    fun isCourierOnline(courierId: String): Boolean
+}
diff --git a/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/infrastructure/axon/AxonCourierOnlineVerifierAdapter.kt b/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/infrastructure/axon/AxonCourierOnlineVerifierAdapter.kt
new file mode 100644
index 00000000..f5cccd94
--- /dev/null
+++ b/delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/infrastructure/axon/AxonCourierOnlineVerifierAdapter.kt
@@ -0,0 +1,22 @@
+package me.rasztabiga.thesis.delivery.infrastructure.axon
+
+import me.rasztabiga.thesis.delivery.domain.command.port.CourierOnlineVerifierPort
+import me.rasztabiga.thesis.shared.adapter.`in`.rest.api.CourierResponse
+import me.rasztabiga.thesis.shared.domain.query.query.FindCourierByIdQuery
+import org.axonframework.messaging.responsetypes.ResponseTypes
+import org.axonframework.queryhandling.QueryGateway
+import org.springframework.stereotype.Service
+
+@Service
+class AxonCourierOnlineVerifierAdapter(
+    private val queryGateway: QueryGateway
+) : CourierOnlineVerifierPort {
+
+    override fun isCourierOnline(courierId: String): Boolean {
+        val courier = queryGateway.query(
+            FindCourierByIdQuery(courierId),
+            ResponseTypes.instanceOf(CourierResponse::class.java)
+        ).join()
+        return courier.availability == CourierResponse.Availability.ONLINE
+    }
+}
diff --git a/frontend/app/models/order.server.ts b/frontend/app/models/order.server.ts
index bb760e5b..42940679 100644
--- a/frontend/app/models/order.server.ts
+++ b/frontend/app/models/order.server.ts
@@ -64,10 +64,11 @@ export interface OrderResponse {
   restaurantId: string;
   restaurantLocation: Location;
   deliveryLocation: Location;
+  deliveryFee: number;
   userId: string;
   status: OrderStatus;
   items: OrderItemResponse[];
-  total: number;
+  itemsTotal: number;
   paymentId: string;
   paymentSessionUrl: string;
 }
diff --git a/frontend/app/routes/ordering.orders.$orderId.payment.tsx b/frontend/app/routes/ordering.orders.$orderId.payment.tsx
index 2ed3b672..4a53a3c3 100644
--- a/frontend/app/routes/ordering.orders.$orderId.payment.tsx
+++ b/frontend/app/routes/ordering.orders.$orderId.payment.tsx
@@ -88,25 +88,21 @@ export default function OrderPaymentPage() {
                     </div>
                   );
                 })}
+                <div>
+                  <p className="flex-grow">
+                    {" "}
+                    1x Delivery fee, {data.order.deliveryFee} PLN
+                  </p>
+                </div>
               </div>
               <hr className="my-4" />
               <div>
-                <p className="flex-grow">Total: {data.order.total} PLN</p>
-              </div>
-              <hr className="my-4" />
-              <div>
-                <p className="flex-grow">Choose payment method</p>
-                <select
-                  className="select select-bordered w-full max-w-xs"
-                  name="address"
-                >
-                  <option value="1">Stripe (fake)</option>
-                </select>
+                <p className="flex-grow font-bold">Total: {data.order.itemsTotal + data.order.deliveryFee} PLN</p>
               </div>
               <hr className="my-4" />
               <div>
-                <p className="flex-grow">Selected delivery address</p>
-                <span>TODO</span>
+                <p className="flex-grow font-bold">Selected delivery address</p>
+                <span>{data.order.deliveryLocation.streetAddress}</span>
               </div>
               <hr className="my-4" />
               {error && (
diff --git a/frontend/app/routes/ordering.restaurants.$restaurantId.tsx b/frontend/app/routes/ordering.restaurants.$restaurantId.tsx
index 04f2a12e..0f590a02 100644
--- a/frontend/app/routes/ordering.restaurants.$restaurantId.tsx
+++ b/frontend/app/routes/ordering.restaurants.$restaurantId.tsx
@@ -193,6 +193,7 @@ export default function RestaurantPage() {
             );
           })}
           <p className="text-lg text-center">Total: {orderSum} PLN</p>
+          <p className="text-sm text-center">+ delivery fee</p>
           <Form method="post">
             <select
               className="select select-bordered w-full max-w-xs"
diff --git a/order/src/main/kotlin/me/rasztabiga/thesis/order/adapter/out/axon/AxonOrderVerificationAdapter.kt b/order/src/main/kotlin/me/rasztabiga/thesis/order/adapter/out/axon/AxonOrderVerificationAdapter.kt
new file mode 100644
index 00000000..0e779df5
--- /dev/null
+++ b/order/src/main/kotlin/me/rasztabiga/thesis/order/adapter/out/axon/AxonOrderVerificationAdapter.kt
@@ -0,0 +1,71 @@
+package me.rasztabiga.thesis.order.adapter.out.axon
+
+import me.rasztabiga.thesis.order.domain.command.port.OrderVerificationPort
+import me.rasztabiga.thesis.shared.adapter.`in`.rest.api.RestaurantResponse
+import me.rasztabiga.thesis.shared.adapter.`in`.rest.api.UserResponse
+import me.rasztabiga.thesis.shared.domain.query.query.FindRestaurantByIdQuery
+import me.rasztabiga.thesis.shared.domain.query.query.FindUserByIdQuery
+import org.axonframework.messaging.responsetypes.ResponseTypes
+import org.axonframework.queryhandling.QueryGateway
+import org.springframework.stereotype.Service
+import java.util.*
+
+@Service
+class AxonOrderVerificationAdapter(
+    private val queryGateway: QueryGateway
+) : OrderVerificationPort {
+    override fun restaurantExists(restaurantId: UUID): Boolean {
+        val restaurant = queryGateway.query(
+            FindRestaurantByIdQuery(
+                restaurantId,
+            ),
+            ResponseTypes.optionalInstanceOf(RestaurantResponse::class.java)
+        ).get()
+
+        return restaurant.isPresent
+    }
+
+    override fun isRestaurantOpen(restaurantId: UUID): Boolean {
+        val restaurant = queryGateway.query(
+            FindRestaurantByIdQuery(
+                restaurantId,
+            ),
+            ResponseTypes.instanceOf(RestaurantResponse::class.java)
+        ).get()
+
+        return restaurant.availability == RestaurantResponse.Availability.OPEN
+    }
+
+    override fun userExists(userId: String): Boolean {
+        val user = queryGateway.query(
+            FindUserByIdQuery(
+                userId,
+            ),
+            ResponseTypes.optionalInstanceOf(UserResponse::class.java)
+        ).get()
+
+        return user.isPresent
+    }
+
+    override fun productExists(productId: UUID, restaurantId: UUID): Boolean {
+        val restaurant = queryGateway.query(
+            FindRestaurantByIdQuery(
+                restaurantId,
+            ),
+            ResponseTypes.instanceOf(RestaurantResponse::class.java)
+        ).get()
+
+        return restaurant.menu.any { it.id == productId }
+    }
+
+    override fun deliveryAddressExists(deliveryAddressId: UUID, userId: String): Boolean {
+        val user = queryGateway.query(
+            FindUserByIdQuery(
+                userId,
+            ),
+            ResponseTypes.instanceOf(UserResponse::class.java)
+        ).get()
+
+        return user.deliveryAddresses.any { it.id == deliveryAddressId }
+    }
+}
diff --git a/order/src/main/kotlin/me/rasztabiga/thesis/order/config/CommandConfiguration.kt b/order/src/main/kotlin/me/rasztabiga/thesis/order/config/CommandConfiguration.kt
deleted file mode 100644
index 52de17ce..00000000
--- a/order/src/main/kotlin/me/rasztabiga/thesis/order/config/CommandConfiguration.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package me.rasztabiga.thesis.order.config
-
-import me.rasztabiga.thesis.order.domain.command.interceptor.FinalizeOrderCommandInterceptor
-import me.rasztabiga.thesis.order.domain.command.interceptor.StartOrderCommandInterceptor
-import org.axonframework.commandhandling.CommandBus
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.context.properties.ConfigurationPropertiesScan
-import org.springframework.context.annotation.Configuration
-
-@Configuration
-@ConfigurationPropertiesScan
-class CommandConfiguration(
-    private val startOrderCommandInterceptor: StartOrderCommandInterceptor,
-    private val finalizeOrderCommandInterceptor: FinalizeOrderCommandInterceptor
-) {
-
-    @Autowired
-    fun registerCommandInterceptors(commandBus: CommandBus) {
-        commandBus.registerDispatchInterceptor(startOrderCommandInterceptor)
-        commandBus.registerDispatchInterceptor(finalizeOrderCommandInterceptor)
-    }
-}
diff --git a/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/aggregate/Order.kt b/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/aggregate/Order.kt
index a00a400e..ddea1317 100644
--- a/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/aggregate/Order.kt
+++ b/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/aggregate/Order.kt
@@ -5,15 +5,16 @@ import me.rasztabiga.thesis.order.domain.command.command.CancelOrderCommand
 import me.rasztabiga.thesis.order.domain.command.command.DeleteOrderItemCommand
 import me.rasztabiga.thesis.order.domain.command.command.FinalizeOrderCommand
 import me.rasztabiga.thesis.order.domain.command.command.StartOrderCommand
+import me.rasztabiga.thesis.order.domain.command.port.OrderVerificationPort
 import me.rasztabiga.thesis.shared.domain.command.command.MarkOrderAsPaidCommand
 import me.rasztabiga.thesis.shared.domain.command.command.RejectOrderCommand
 import me.rasztabiga.thesis.shared.domain.command.event.OrderCanceledEvent
 import me.rasztabiga.thesis.shared.domain.command.event.OrderFinalizedEvent
 import me.rasztabiga.thesis.shared.domain.command.event.OrderItemAddedEvent
 import me.rasztabiga.thesis.shared.domain.command.event.OrderItemDeletedEvent
+import me.rasztabiga.thesis.shared.domain.command.event.OrderPaidEvent
 import me.rasztabiga.thesis.shared.domain.command.event.OrderRejectedEvent
 import me.rasztabiga.thesis.shared.domain.command.event.OrderStartedEvent
-import me.rasztabiga.thesis.shared.domain.command.event.OrderPaidEvent
 import org.axonframework.commandhandling.CommandHandler
 import org.axonframework.eventsourcing.EventSourcingHandler
 import org.axonframework.modelling.command.AggregateIdentifier
@@ -39,7 +40,17 @@ internal class Order {
     private constructor()
 
     @CommandHandler
-    constructor(command: StartOrderCommand) {
+    constructor(command: StartOrderCommand, orderVerificationPort: OrderVerificationPort) {
+        require(orderVerificationPort.restaurantExists(command.restaurantId)) {
+            "Restaurant with id ${command.restaurantId} does not exist"
+        }
+        require(orderVerificationPort.isRestaurantOpen(command.restaurantId)) {
+            "Restaurant with id ${command.restaurantId} is closed"
+        }
+        require(orderVerificationPort.userExists(command.userId)) {
+            "User with id ${command.userId} does not exist"
+        }
+
         apply(
             OrderStartedEvent(
                 orderId = command.orderId,
@@ -97,9 +108,18 @@ internal class Order {
     }
 
     @CommandHandler
-    fun handle(command: FinalizeOrderCommand) {
+    fun handle(command: FinalizeOrderCommand, orderVerificationPort: OrderVerificationPort) {
         require(this.userId == command.userId) { "Order can be finalized only by the user who created it." }
         require(this.status == OrderStatus.CREATED) { "Order can be finalized only if it's in CREATED status." }
+        require(orderVerificationPort.deliveryAddressExists(command.deliveryAddressId, this.userId)) {
+            "Delivery address with id ${command.deliveryAddressId} does not exist for user with id ${this.userId}"
+        }
+
+        this.items.forEach {
+            require(orderVerificationPort.productExists(it.productId, this.restaurantId)) {
+                "Product with id ${it.productId} does not exist in restaurant with id ${this.restaurantId}"
+            }
+        }
 
         apply(
             OrderFinalizedEvent(
diff --git a/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/interceptor/FinalizeOrderCommandInterceptor.kt b/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/interceptor/FinalizeOrderCommandInterceptor.kt
deleted file mode 100644
index 5c5c1611..00000000
--- a/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/interceptor/FinalizeOrderCommandInterceptor.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-package me.rasztabiga.thesis.order.domain.command.interceptor
-
-import me.rasztabiga.thesis.order.domain.command.command.FinalizeOrderCommand
-import me.rasztabiga.thesis.shared.adapter.`in`.rest.api.OrderResponse
-import me.rasztabiga.thesis.shared.adapter.`in`.rest.api.RestaurantResponse
-import me.rasztabiga.thesis.shared.adapter.`in`.rest.api.UserResponse
-import me.rasztabiga.thesis.shared.domain.query.query.FindOrderByIdQuery
-import me.rasztabiga.thesis.shared.domain.query.query.FindRestaurantByIdQuery
-import me.rasztabiga.thesis.shared.domain.query.query.FindUserByIdQuery
-import org.axonframework.commandhandling.CommandMessage
-import org.axonframework.extensions.reactor.queryhandling.gateway.ReactorQueryGateway
-import org.axonframework.messaging.MessageDispatchInterceptor
-import org.axonframework.messaging.responsetypes.ResponseTypes
-import org.springframework.stereotype.Component
-import java.util.*
-import java.util.function.BiFunction
-
-@Component
-class FinalizeOrderCommandInterceptor(
-    private val reactorQueryGateway: ReactorQueryGateway
-) : MessageDispatchInterceptor<CommandMessage<*>> {
-
-    override fun handle(messages: List<CommandMessage<*>>): BiFunction<Int, CommandMessage<*>, CommandMessage<*>> {
-        return BiFunction { _, commandMessage ->
-            val command = commandMessage.payload as? FinalizeOrderCommand
-
-            command?.let { finalizeOrderCommand ->
-                // TODO do all in parallel
-                val order = getOrder(finalizeOrderCommand.orderId)
-                val restaurant = getRestaurant(order.restaurantId)
-                val user = getUser(order.userId)
-                // TODO validate delivery address id
-
-                validateRestaurant(restaurant, order)
-                validateUser(user, finalizeOrderCommand)
-            }
-
-            commandMessage
-        }
-    }
-
-    private fun getOrder(orderId: UUID): OrderResponse {
-        return reactorQueryGateway.query(
-            FindOrderByIdQuery(orderId),
-            ResponseTypes.optionalInstanceOf(OrderResponse::class.java)
-        ).share().block()!!.let {
-            require(it.isPresent) {
-                "Order with id $orderId does not exist"
-            }
-            it.get()
-        }
-    }
-
-    private fun getRestaurant(restaurantId: UUID): RestaurantResponse {
-        return reactorQueryGateway.query(
-            FindRestaurantByIdQuery(restaurantId),
-            ResponseTypes.optionalInstanceOf(RestaurantResponse::class.java)
-        ).share().block()!!.let {
-            require(it.isPresent) {
-                "Restaurant with id $restaurantId does not exist"
-            }
-            it.get()
-        }
-    }
-
-    private fun getUser(userId: String): UserResponse {
-        return reactorQueryGateway.query(
-            FindUserByIdQuery(userId),
-            ResponseTypes.optionalInstanceOf(UserResponse::class.java)
-        ).share().block()!!.let {
-            require(it.isPresent) {
-                "User with id $userId does not exist"
-            }
-            it.get()
-        }
-    }
-
-    private fun validateRestaurant(restaurant: RestaurantResponse, order: OrderResponse) {
-        require(restaurant.availability == RestaurantResponse.Availability.OPEN) {
-            "Restaurant with id ${order.restaurantId} is closed"
-        }
-
-        order.items.forEach { item ->
-            require(restaurant.menu.any { it.id == item.productId }) {
-                "Product with id ${item.productId} does not exist in restaurant with id ${order.restaurantId}"
-            }
-        }
-    }
-
-    private fun validateUser(user: UserResponse, command: FinalizeOrderCommand) {
-        require(user.deliveryAddresses.any { it.id == command.deliveryAddressId }) {
-            "Delivery address with id ${command.deliveryAddressId} does not exist for user with id ${command.userId}"
-        }
-    }
-}
diff --git a/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/interceptor/StartOrderCommandInterceptor.kt b/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/interceptor/StartOrderCommandInterceptor.kt
deleted file mode 100644
index 2489baae..00000000
--- a/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/interceptor/StartOrderCommandInterceptor.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package me.rasztabiga.thesis.order.domain.command.interceptor
-
-import me.rasztabiga.thesis.order.domain.command.command.StartOrderCommand
-import me.rasztabiga.thesis.shared.adapter.`in`.rest.api.RestaurantResponse
-import me.rasztabiga.thesis.shared.adapter.`in`.rest.api.UserResponse
-import me.rasztabiga.thesis.shared.domain.query.query.FindRestaurantByIdQuery
-import me.rasztabiga.thesis.shared.domain.query.query.FindUserByIdQuery
-import org.axonframework.commandhandling.CommandMessage
-import org.axonframework.extensions.reactor.queryhandling.gateway.ReactorQueryGateway
-import org.axonframework.messaging.MessageDispatchInterceptor
-import org.axonframework.messaging.responsetypes.ResponseTypes
-import org.springframework.stereotype.Component
-import java.util.function.BiFunction
-
-@Component
-class StartOrderCommandInterceptor(
-    private val reactorQueryGateway: ReactorQueryGateway
-) : MessageDispatchInterceptor<CommandMessage<*>> {
-
-    override fun handle(messages: List<CommandMessage<*>>): BiFunction<Int, CommandMessage<*>, CommandMessage<*>> {
-        return BiFunction { _, commandMessage ->
-            val command = commandMessage.payload as? StartOrderCommand
-
-            command?.let {
-                // TODO do both in parallel
-                requireRestaurant(it)
-                requireUser(it)
-            }
-
-            commandMessage
-        }
-    }
-
-    private fun requireRestaurant(command: StartOrderCommand) {
-        val restaurant = reactorQueryGateway.query(
-            FindRestaurantByIdQuery(
-                command.restaurantId,
-            ),
-            ResponseTypes.optionalInstanceOf(RestaurantResponse::class.java)
-        ).share().block()!!
-
-        require(restaurant.isPresent) {
-            "Restaurant with id ${command.restaurantId} does not exist"
-        }
-
-        require(restaurant.get().availability == RestaurantResponse.Availability.OPEN) {
-            "Restaurant with id ${command.restaurantId} is closed"
-        }
-    }
-
-    private fun requireUser(command: StartOrderCommand) {
-        val user = reactorQueryGateway.query(
-            FindUserByIdQuery(
-                command.userId,
-            ),
-            ResponseTypes.optionalInstanceOf(UserResponse::class.java)
-        ).share().block()!!
-
-        require(user.isPresent) {
-            "User with id ${command.userId} does not exist"
-        }
-    }
-}
diff --git a/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/port/OrderVerificationPort.kt b/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/port/OrderVerificationPort.kt
new file mode 100644
index 00000000..9a724d10
--- /dev/null
+++ b/order/src/main/kotlin/me/rasztabiga/thesis/order/domain/command/port/OrderVerificationPort.kt
@@ -0,0 +1,16 @@
+package me.rasztabiga.thesis.order.domain.command.port
+
+import java.util.*
+
+interface OrderVerificationPort {
+
+    fun restaurantExists(restaurantId: UUID): Boolean
+
+    fun isRestaurantOpen(restaurantId: UUID): Boolean
+
+    fun userExists(userId: String): Boolean
+
+    fun productExists(productId: UUID, restaurantId: UUID): Boolean
+
+    fun deliveryAddressExists(deliveryAddressId: UUID, userId: String): Boolean
+}
diff --git a/restaurant/src/main/kotlin/me/rasztabiga/thesis/payment/config/CommandConfiguration.kt b/restaurant/src/main/kotlin/me/rasztabiga/thesis/payment/config/CommandConfiguration.kt
deleted file mode 100644
index 5e68ffbc..00000000
--- a/restaurant/src/main/kotlin/me/rasztabiga/thesis/payment/config/CommandConfiguration.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package me.rasztabiga.thesis.payment.config
-
-import org.axonframework.commandhandling.CommandBus
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.context.properties.ConfigurationPropertiesScan
-import org.springframework.context.annotation.Configuration
-
-@Configuration
-@ConfigurationPropertiesScan
-class CommandConfiguration {
-
-    @Autowired
-    @Suppress("EmptyFunctionBlock", "UnusedParameter")
-    fun registerCommandInterceptors(commandBus: CommandBus) {
-
-    }
-}