feat(backend): WIP: Courier location

delivery/build.gradle.kts

@@ -34,7 +34,7 @@ val axonVersion = "4.8.3"
 val kotestVersion = "5.7.2"
 
 dependencies {
-    implementation("me.rasztabiga.thesis:shared:0.16.7")
+    implementation("me.rasztabiga.thesis:shared:0.16.8")
 
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
@@ -53,7 +53,7 @@ dependencies {
 
     implementation("com.google.maps:google-maps-services:2.2.0")
 
-    testImplementation(testFixtures("me.rasztabiga.thesis:shared:0.16.7"))
+    testImplementation(testFixtures("me.rasztabiga.thesis:shared:0.16.8"))
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("io.projectreactor:reactor-test")
     testImplementation("org.axonframework:axon-test")

delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/aggregate/Courier.kt

@@ -2,6 +2,8 @@ package me.rasztabiga.thesis.delivery.domain.command.aggregate
 
 import me.rasztabiga.thesis.delivery.domain.command.command.CreateCourierCommand
 import me.rasztabiga.thesis.delivery.domain.command.command.UpdateCourierAvailabilityCommand
+import me.rasztabiga.thesis.delivery.domain.command.command.UpdateCourierLocationCommand
+import me.rasztabiga.thesis.shared.adapter.`in`.rest.api.Location
 import me.rasztabiga.thesis.shared.domain.command.event.CourierAvailabilityUpdatedEvent
 import me.rasztabiga.thesis.shared.domain.command.event.CourierCreatedEvent
 import org.axonframework.commandhandling.CommandHandler
@@ -18,6 +20,7 @@ internal class Courier {
     private lateinit var id: String
     private lateinit var name: String
     private var availability: Availability = Availability.OFFLINE
+    private var location: Location? = null
 
     constructor()
 
@@ -36,6 +39,16 @@ internal class Courier {
         )
     }
 
+    @CommandHandler
+    fun handle(command: UpdateCourierLocationCommand) {
+        apply(
+            CourierLocationUpdatedEvent(
+                id = command.id,
+                location = command.location
+            )
+        )
+    }
+
     @EventSourcingHandler
     fun on(event: CourierCreatedEvent) {
         this.id = event.courierId

delivery/src/main/kotlin/me/rasztabiga/thesis/delivery/domain/command/aggregate/OrderDelivery.kt

@@ -37,8 +37,8 @@ class OrderDelivery {
     @CommandHandler
     constructor(command: CreateOrderDeliveryOfferCommand, calculateDeliveryFeePort: CalculateDeliveryFeePort) {
         val baseFee = calculateDeliveryFeePort.calculateBaseFee(
-            command.restaurantLocation.streetAddress,
-            command.deliveryLocation.streetAddress
+            command.restaurantLocation.streetAddress!!,
+            command.deliveryLocation.streetAddress!!
         )
 
         apply(

order/build.gradle.kts

@@ -36,7 +36,7 @@ val axonVersion = "4.8.3"
 val kotestVersion = "5.7.2"
 
 dependencies {
-    implementation("me.rasztabiga.thesis:shared:0.16.7")
+    implementation("me.rasztabiga.thesis:shared:0.16.8")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
     implementation("org.springframework.boot:spring-boot-starter-security")
@@ -52,7 +52,7 @@ dependencies {
     implementation(kotlin("reflect"))
     implementation(kotlin("stdlib"))
 
-    testImplementation(testFixtures("me.rasztabiga.thesis:shared:0.16.7"))
+    testImplementation(testFixtures("me.rasztabiga.thesis:shared:0.16.8"))
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("io.projectreactor:reactor-test")
     testImplementation("org.axonframework:axon-test")

payment/build.gradle.kts

@@ -34,7 +34,7 @@ val axonVersion = "4.8.3"
 val kotestVersion = "5.7.2"
 
 dependencies {
-    implementation("me.rasztabiga.thesis:shared:0.16.7")
+    implementation("me.rasztabiga.thesis:shared:0.16.8")
 
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
@@ -53,7 +53,7 @@ dependencies {
     implementation(kotlin("reflect"))
     implementation(kotlin("stdlib"))
 
-    testImplementation(testFixtures("me.rasztabiga.thesis:shared:0.16.7"))
+    testImplementation(testFixtures("me.rasztabiga.thesis:shared:0.16.8"))
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("io.projectreactor:reactor-test")
     testImplementation("org.axonframework:axon-test")

query/build.gradle.kts

@@ -34,7 +34,7 @@ val axonVersion = "4.8.3"
 val kotestVersion = "5.7.2"
 
 dependencies {
-    implementation("me.rasztabiga.thesis:shared:0.16.7")
+    implementation("me.rasztabiga.thesis:shared:0.16.8")
 
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
@@ -55,7 +55,7 @@ dependencies {
 
     implementation("com.google.maps:google-maps-services:2.2.0")
 
-    testImplementation(testFixtures("me.rasztabiga.thesis:shared:0.16.7"))
+    testImplementation(testFixtures("me.rasztabiga.thesis:shared:0.16.8"))
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("io.projectreactor:reactor-test")
     testImplementation("org.axonframework:axon-test")

query/src/main/kotlin/me/rasztabiga/thesis/query/domain/query/handler/CourierHandler.kt

@@ -34,6 +34,13 @@ class CourierHandler(
         courierRepository.save(entity)
     }
 
+    @EventHandler
+    fun on(event: CourierLocationUpdatedEvent) {
+        val entity = getCourier(event.id)
+        entity.location = event.location
+        courierRepository.save(entity)
+    }
+
     @QueryHandler
     fun handle(query: FindCourierByIdQuery): Mono<CourierResponse> {
         return courierRepository.load(query.courierId)

query/src/main/kotlin/me/rasztabiga/thesis/query/domain/query/mapper/OrderMapper.kt

@@ -45,6 +45,7 @@ object OrderMapper {
             deliveryAddressId = entity.deliveryAddressId,
             deliveryLocation = entity.deliveryLocation,
             courierId = entity.courierId,
+            courierLocation = entity.courierLocation,
             deliveryFee = entity.deliveryFee
         )
     }

restaurant/build.gradle.kts

@@ -34,7 +34,7 @@ val axonVersion = "4.8.3"
 val kotestVersion = "5.7.2"
 
 dependencies {
-    implementation("me.rasztabiga.thesis:shared:0.16.7")
+    implementation("me.rasztabiga.thesis:shared:0.16.8")
 
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
@@ -51,7 +51,7 @@ dependencies {
     implementation(kotlin("reflect"))
     implementation(kotlin("stdlib"))
 
-    testImplementation(testFixtures("me.rasztabiga.thesis:shared:0.16.7"))
+    testImplementation(testFixtures("me.rasztabiga.thesis:shared:0.16.8"))
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("io.projectreactor:reactor-test")
     testImplementation("org.axonframework:axon-test")

saga/build.gradle.kts

@@ -34,7 +34,7 @@ val axonVersion = "4.8.3"
 val kotestVersion = "5.7.2"
 
 dependencies {
-    implementation("me.rasztabiga.thesis:shared:0.16.7")
+    implementation("me.rasztabiga.thesis:shared:0.16.8")
 
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-security")
@@ -52,7 +52,7 @@ dependencies {
     implementation(kotlin("reflect"))
     implementation(kotlin("stdlib"))
 
-    testImplementation(testFixtures("me.rasztabiga.thesis:shared:0.16.7"))
+    testImplementation(testFixtures("me.rasztabiga.thesis:shared:0.16.8"))
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("io.projectreactor:reactor-test")
     testImplementation("org.axonframework:axon-test")

saga/src/main/kotlin/me/rasztabiga/thesis/saga/domain/command/saga/OrderLifecycleSaga.kt

@@ -97,8 +97,8 @@ class OrderLifecycleSaga {
                         productId = it.productId
                     )
                 },
-                restaurantAddress = order.restaurantLocation.streetAddress,
-                deliveryAddress = order.deliveryLocation!!.streetAddress
+                restaurantAddress = order.restaurantLocation.streetAddress!!,
+                deliveryAddress = order.deliveryLocation!!.streetAddress!!
             )
         )
     }

shared/src/main/kotlin/me/rasztabiga/thesis/shared/domain/command/event/CourierLocationUpdatedEvent.kt

@@ -0,0 +1,10 @@
+package me.rasztabiga.thesis.shared.domain.command.event
+
+import me.rasztabiga.thesis.shared.adapter.`in`.rest.api.Location
+import org.axonframework.serialization.Revision
+
+@Revision("1.0")
+data class CourierLocationUpdatedEvent(
+    val id: String,
+    val location: Location
+)