Handle timeouts more gracefully in OrderService

src/main/kotlin/no/nb/mlt/wls/order/service/OrderService.kt

@@ -27,27 +27,27 @@ class OrderService(val db: OrderRepository, val synqService: SynqOrderService) {
             return ResponseEntity.badRequest().build()
         }
 
-        try {
-            // TODO - Usages?
-            val synqResponse = synqService.createOrder(payload.toOrder().toSynqPayload())
-            // Return what the database saved, as it could contain changes
-            val order =
-                db.save(payload.toOrder())
-                    .timeout(Duration.ofSeconds(6))
-                    .awaitSingle()
-            return ResponseEntity.status(HttpStatus.CREATED).body(order.toApiOrderPayload())
-        } catch (e: Exception) {
-            throw ServerErrorException("Failed to create order in storage system", e)
-        }
+        synqService.createOrder(payload.toOrder().toSynqPayload())
+        // Return what the database saved, as it could contain changes
+        val order =
+            db.save(payload.toOrder())
+                .timeout(Duration.ofSeconds(6))
+                .onErrorMap(TimeoutException::class.java) {
+                    logger.error { "Saving order timed out for payload: %s".format(payload.toString()) }
+                    ServerErrorException("Failed to create the order in storage system", it)
+                }
+                .awaitSingle()
+
+        return ResponseEntity.status(HttpStatus.CREATED).body(order.toApiOrderPayload())
     }
 
     suspend fun getByHostNameAndHostOrderId(payload: ApiOrderPayload): Order? {
         // TODO - See if timeouts can be made configurable
         return db.getByHostNameAndHostOrderId(payload.hostName, payload.orderId)
             .timeout(Duration.ofSeconds(8))
-            .doOnError {
-                if (it is TimeoutException) {
-                    logger.error(it, { "Timed out while fetching from WLS database" })
+            .doOnError(TimeoutException::class.java) {
+                logger.error(it) {
+                    "Timed out while fetching from WLS database. Relevant payload: $payload"
                 }
             }
             .onErrorComplete(TimeoutException::class.java)