Add service exception json formatters and pass through exceptions in HttpRestServiceTransport (#168)v1.9.4

3 files changed, 18 insertions, 6 deletions

diff --git a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
index c23c44d..fe3790f 100644
--- a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
+++ b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
@@ -90,11 +90,17 @@ trait DriverRoute {
     }
 
     { (ctx: RequestContext) =>
-      errorResponse(statusCode, serviceException.message, serviceException)(ctx)
+      import xyz.driver.core.json.serviceExceptionFormat
+      val entity =
+        HttpEntity(ContentTypes.`application/json`, serviceExceptionFormat.write(serviceException).toString())
+      errorResponse(statusCode, entity, serviceException)(ctx)
     }
   }
 
-  protected def errorResponse[T <: Exception](statusCode: StatusCode, message: String, exception: T): Route = {
-    complete(HttpResponse(statusCode, entity = message))
+  protected def errorResponse[T <: Exception](statusCode: StatusCode, message: String, exception: T): Route =
+    errorResponse(statusCode, HttpEntity(message), exception)
+
+  protected def errorResponse[T <: Exception](statusCode: StatusCode, entity: ResponseEntity, exception: T): Route = {
+    complete(HttpResponse(statusCode, entity = entity))
   }
 }
diff --git a/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala b/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala
index e54f722..788729a 100644
--- a/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala
+++ b/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala
@@ -75,8 +75,11 @@ class HttpRestServiceTransport(
         Future.successful(Unmarshal(HttpEntity.Empty: ResponseEntity))
       } else if (response.status.isFailure()) {
         val serviceCalled = s"${requestStub.method} ${requestStub.uri}"
-        Unmarshal(response.entity).to[String] flatMap { error =>
-          Future.failed(ExternalServiceException(serviceCalled, error))
+        Unmarshal(response.entity).to[String] flatMap { errorString =>
+          import spray.json._
+          import xyz.driver.core.json._
+          val serviceException = util.Try(serviceExceptionFormat.read(errorString.parseJson)).toOption
+          Future.failed(ExternalServiceException(serviceCalled, errorString, serviceException))
         }
       } else {
         Future.successful(Unmarshal(response.entity))
diff --git a/src/main/scala/xyz/driver/core/rest/errors/serviceException.scala b/src/main/scala/xyz/driver/core/rest/errors/serviceException.scala
index 095936e..db289de 100644
--- a/src/main/scala/xyz/driver/core/rest/errors/serviceException.scala
+++ b/src/main/scala/xyz/driver/core/rest/errors/serviceException.scala
@@ -10,7 +10,10 @@ final case class InvalidActionException(override val message: String = "This act
 final case class ResourceNotFoundException(override val message: String = "Resource not found")
     extends ServiceException(message)
 
-final case class ExternalServiceException(serviceName: String, serviceMessage: String)
+final case class ExternalServiceException(
+    serviceName: String,
+    serviceMessage: String,
+    serviceException: Option[ServiceException])
     extends ServiceException(s"Error while calling '$serviceName': $serviceMessage")
 
 final case class ExternalServiceTimeoutException(serviceName: String)