Clean-up + New User constructor from Driver User

1 files changed, 11 insertions, 1 deletions

diff --git a/src/main/scala/xyz/driver/pdsuicommon/computation/Computation.scala b/src/main/scala/xyz/driver/pdsuicommon/computation/Computation.scala
index 159c144..af7d051 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/computation/Computation.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/computation/Computation.scala
@@ -72,6 +72,17 @@ final case class Computation[+R, +T](future: Future[Either[R, T]]) {
     })
   }
 
+  def mapAll[R2, T2](onLeft: R => Computation[R2, T2])(onRight: T => Computation[R2, T2])(
+          onFailure: () => Computation[R2, T2])(implicit ec: ExecutionContext): Computation[R2, T2] = {
+
+    Computation(future.flatMap { success =>
+      if (success.isRight) onRight(success.right.get).future
+      else onLeft(success.left.get).future
+    } recoverWith {
+      case _ => onFailure().future
+    })
+  }
+
   def andThen(f: T => Any)(implicit ec: ExecutionContext): Computation[R, T] = map { a =>
     f(a)
     a
@@ -98,7 +109,6 @@ final case class Computation[+R, +T](future: Future[Either[R, T]]) {
     case Left(x)  => x
     case Right(x) => x
   }
-
 }
 
 object Computation {