Adding executions to render call in client. (openlawteam#231)

* Adding executions to render call in client. * scala lint fix Co-authored-by: jdville03 <[email protected]>
thekerp · Aug 7, 2020 · ef0bae0 · ef0bae0
1 parent 040af88
commit ef0bae0
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/src/main/scala/org/adridadou/openlaw/client/Openlaw.scala b/src/main/scala/org/adridadou/openlaw/client/Openlaw.scala
@@ -8,14 +8,14 @@ import org.adridadou.openlaw.parser.template.variableTypes._
 
 import scala.scalajs.js
 import cats.implicits._
-import org.adridadou.openlaw.result.{Failure, Result, Success}
+import org.adridadou.openlaw.result.{Failure, Result, Success, attempt}
 import org.adridadou.openlaw.result.Implicits._
 import org.adridadou.openlaw.values.{
   ContractId,
   TemplateParameters,
   TemplateTitle
 }
-import org.adridadou.openlaw.vm.OpenlawExecutionEngine
+import org.adridadou.openlaw.vm.{Executions, OpenlawExecutionEngine}
 import slogging.LazyLogging
 import io.circe.parser._
 import io.circe.syntax._
@@ -89,6 +89,7 @@ object Openlaw extends LazyLogging {
       proofs: js.Dictionary[String],
       jsTemplates: js.Dictionary[CompiledTemplate],
       jsParams: js.Dictionary[Any],
+      executions: js.Dictionary[String],
       externalCallStructures: js.Dictionary[Any],
       contractId: js.UndefOr[String],
       profileAddress: js.UndefOr[String],
@@ -100,7 +101,7 @@ object Openlaw extends LazyLogging {
         prepareParameters(jsParams),
         prepareTemplates(jsTemplates),
         signatureProofs = prepareProofs(proofs.toMap).getOrThrow(),
-        executions = Map.empty,
+        executions = prepareExecutions(executions.toMap).getOrThrow(),
         prepareStructures(externalCallStructures),
         contractId.toOption.map(ContractId(_)),
         contractCreationDate.toOption
@@ -110,6 +111,24 @@ object Openlaw extends LazyLogging {
       )
     )
 
+  private def prepareExecutions(
+      executions: Map[String, String]
+  ): Result[Map[ActionIdentifier, Executions]] = {
+    executions.toList
+      .map {
+        case (k, v) =>
+          for {
+            one <- decode[ActionIdentifier](k)
+            two <- decode[Executions](v)
+          } yield one -> two
+      }
+      .sequence
+      .map(_.toMap)
+  } match {
+    case Right(map)  => Success(map)
+    case Left(error) => Failure(error)
+  }
+
   private def prepareProofs(
       proofs: Map[String, String]
   ): Result[Map[Email, SignatureProof]] =