Add ExternalServiceException and use in ServiceTransport

3 files changed, 25 insertions, 7 deletions

diff --git a/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala b/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala
index 1e95811..2bec4c3 100644
--- a/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala
+++ b/src/main/scala/xyz/driver/core/rest/HttpRestServiceTransport.scala
@@ -4,9 +4,12 @@ import akka.actor.ActorSystem
 import akka.http.scaladsl.model._
 import akka.http.scaladsl.model.headers.RawHeader
 import akka.http.scaladsl.unmarshalling.Unmarshal
+import akka.stream.Materializer
+import akka.stream.scaladsl.TcpIdleTimeoutException
 import com.typesafe.scalalogging.Logger
 import org.slf4j.MDC
 import xyz.driver.core.Name
+import xyz.driver.core.rest.errors.{ExternalServiceException, ExternalServiceTimeoutException}
 import xyz.driver.core.time.provider.TimeProvider
 
 import scala.concurrent.{ExecutionContext, Future}
@@ -55,18 +58,27 @@ class HttpRestServiceTransport(applicationName: Name[App],
         log.warn(s"Failed to receive response from ${request.method} ${request.uri} in $responseLatency ms", t)
     }(executionContext)
 
-    response
+    response.transformWith {
+      case Success(r) => Future.successful(r)
+      case Failure(_: TcpIdleTimeoutException) =>
+        Future.failed(ExternalServiceTimeoutException())
+      case Failure(t: Throwable) => Future.failed(t)
+    }
   }
 
-  def sendRequest(context: ServiceRequestContext)(requestStub: HttpRequest): Future[Unmarshal[ResponseEntity]] = {
+  def sendRequest(context: ServiceRequestContext)(requestStub: HttpRequest)(
+          implicit mat: Materializer): Future[Unmarshal[ResponseEntity]] = {
 
-    sendRequestGetResponse(context)(requestStub) map { response =>
+    sendRequestGetResponse(context)(requestStub) flatMap { response =>
       if (response.status == StatusCodes.NotFound) {
-        Unmarshal(HttpEntity.Empty: ResponseEntity)
+        Future.successful(Unmarshal(HttpEntity.Empty: ResponseEntity))
       } else if (response.status.isFailure()) {
-        throw new Exception(s"Http status is failure ${response.status} for ${requestStub.method} ${requestStub.uri}")
+        val serviceCalled = s"${requestStub.method} ${requestStub.uri}"
+        Unmarshal(response.entity).to[String] flatMap { error =>
+          Future.failed(ExternalServiceException(serviceCalled, error))
+        }
       } else {
-        Unmarshal(response.entity)
+        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 7aa70bf..82a1838 100644
--- a/src/main/scala/xyz/driver/core/rest/errors/serviceException.scala
+++ b/src/main/scala/xyz/driver/core/rest/errors/serviceException.scala
@@ -12,6 +12,10 @@ final case class InvalidActionException(override val message: String = "This act
 final case class ResourceNotFoundException(override val message: String = "Resource not found")
     extends ServiceException
 
+final case class ExternalServiceException(serviceName: String, serviceMessage: String) extends ServiceException {
+  override def message = s"Error while calling another service: $serviceMessage"
+}
+
 final case class ExternalServiceTimeoutException(
         override val message: String = "Another service took too long to respond")
     extends ServiceException
diff --git a/src/main/scala/xyz/driver/core/rest/package.scala b/src/main/scala/xyz/driver/core/rest/package.scala
index 942ca3a..531cd8a 100644
--- a/src/main/scala/xyz/driver/core/rest/package.scala
+++ b/src/main/scala/xyz/driver/core/rest/package.scala
@@ -6,6 +6,7 @@ import akka.http.scaladsl.model.{HttpRequest, HttpResponse, ResponseEntity, Stat
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
 import akka.http.scaladsl.unmarshalling.Unmarshal
+import akka.stream.Materializer
 import akka.stream.scaladsl.Flow
 import akka.util.ByteString
 import xyz.driver.tracing.TracingDirectives
@@ -25,7 +26,8 @@ trait ServiceTransport {
 
   def sendRequestGetResponse(context: ServiceRequestContext)(requestStub: HttpRequest): Future[HttpResponse]
 
-  def sendRequest(context: ServiceRequestContext)(requestStub: HttpRequest): Future[Unmarshal[ResponseEntity]]
+  def sendRequest(context: ServiceRequestContext)(requestStub: HttpRequest)(
+          implicit mat: Materializer): Future[Unmarshal[ResponseEntity]]
 }
 
 final case class Pagination(pageSize: Int, pageNumber: Int)