Merge pull request #73 from drivergroup/zsmith/route-traitv1.6.0v1.5.2

Add DriverRoute trait and APIError types

1 files changed, 18 insertions, 6 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..376b154 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.recoverWith {
+      case _: TcpIdleTimeoutException =>
+        val serviceCalled = s"${requestStub.method} ${requestStub.uri}"
+        Future.failed(ExternalServiceTimeoutException(serviceCalled))
+      case 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))
       }
     }
   }