fix(mediator) : escala_to configurable (#108)

* Problem report escalato confgurable and renamed type Signed-off-by: Shailesh Patil <[email protected]> * Problem report escalato confgurable and renamed type Signed-off-by: Shailesh Patil <[email protected]> * Problem report escalato confgurable and renamed type Signed-off-by: Shailesh Patil <[email protected]> * removed the hello endpoint Signed-off-by: Shailesh Patil <[email protected]> --------- Signed-off-by: Shailesh Patil <[email protected]>
hyperledger · Sep 4, 2023 · d1f0ac4 · d1f0ac4
1 parent aa19f0a
commit d1f0ac4
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 15 deletions.
diff --git a/mediator/src/main/resources/application.conf b/mediator/src/main/resources/application.conf
@@ -35,4 +35,6 @@ mediator = {
     dbName = "mediator"
     dbName = ${?MONGODB_DB_NAME}
   }
+  problem.report.escalateTo = "[email protected]"
+  problem.report.escalateTo = ${?ESCALATE_TO}
 }
diff --git a/mediator/src/main/scala/io/iohk/atala/mediator/actions/ProtocolExecute.scala b/mediator/src/main/scala/io/iohk/atala/mediator/actions/ProtocolExecute.scala
@@ -18,7 +18,7 @@ import io.iohk.atala.mediator.protocols.MissingProtocolExecuter
 
 trait ProtocolExecuter[-R, +E] { // <: MediatorError | StorageError] {
 
-  def suportedPIURI: Seq[PIURI]
+  def supportedPIURI: Seq[PIURI]
 
   /** @return can return a Sync Reply Msg */
   def execute[R1 <: R](
@@ -37,9 +37,9 @@ case class ProtocolExecuterCollection[-R <: Agent, +E](
     executers: ProtocolExecuter[R, E]*
 ) extends ProtocolExecuter[R, E] {
 
-  override def suportedPIURI: Seq[PIURI] = executers.flatMap(_.suportedPIURI)
+  override def supportedPIURI: Seq[PIURI] = executers.flatMap(_.supportedPIURI)
 
-  def selectExecutersFor(piuri: PIURI) = executers.find(_.suportedPIURI.contains(piuri))
+  def selectExecutersFor(piuri: PIURI) = executers.find(_.supportedPIURI.contains(piuri))
 
   override def execute[R1 <: R](
       plaintextMessage: PlaintextMessage,

diff --git a/mediator/src/main/scala/io/iohk/atala/mediator/app/MediatorStandalone.scala b/mediator/src/main/scala/io/iohk/atala/mediator/app/MediatorStandalone.scala
@@ -68,10 +68,6 @@ object MediatorStandalone extends ZIOAppDefault {
     Request,
     Response
   ] = MediatorAgent.didCommApp
-    ++ Http
-      .collectZIO[Request] { case Method.GET -> Root / "hello" =>
-        ZIO.succeed(Response.text("Hello World! DID Comm Mediator APP")).debug
-      }
   override val run = for {
     _ <- Console.printLine( // https://patorjk.com/software/taag/#p=display&f=ANSI%20Shadow&t=Mediator
       """███╗   ███╗███████╗██████╗ ██╗ █████╗ ████████╗ ██████╗ ██████╗ 
@@ -98,6 +94,12 @@ object MediatorStandalone extends ZIOAppDefault {
       .nested("mediator")
       .load(Config.int("port"))
     _ <- ZIO.log(s"Starting server on port: $port")
+    escalateTo <- configs
+      .nested("report")
+      .nested("problem")
+      .nested("mediator")
+      .load(Config.string("escalateTo"))
+    _ <- ZIO.log(s"Problem reports escalated to : $escalateTo")
     client = Scope.default >>> Client.default
     inboundHub <- Hub.bounded[String](5)
     myServer <- Server

diff --git a/mediator/src/main/scala/io/iohk/atala/mediator/protocols/BasicMessageExecuter.scala b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/BasicMessageExecuter.scala
@@ -9,7 +9,7 @@ import zio.{Console, ZIO}
 
 object BasicMessageExecuter extends ProtocolExecuter[Any, MediatorError] {
 
-  override def suportedPIURI: Seq[PIURI] = Seq(BasicMessage.piuri)
+  override def supportedPIURI: Seq[PIURI] = Seq(BasicMessage.piuri)
   override def program[R1 <: Any](plaintextMessage: PlaintextMessage) = for {
     job <- BasicMessage.fromPlaintextMessage(plaintextMessage) match
       case Left(error) => ZIO.fail(MediatorDidError(FailToParse(error)))

diff --git a/mediator/src/main/scala/io/iohk/atala/mediator/protocols/ForwardMessageExecuter.scala b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/ForwardMessageExecuter.scala
@@ -18,7 +18,7 @@ object ForwardMessageExecuter
       ProtocolExecuter.Erros
     ] {
 
-  override def suportedPIURI: Seq[PIURI] = Seq(ForwardMessage.piuri)
+  override def supportedPIURI: Seq[PIURI] = Seq(ForwardMessage.piuri)
 
   override def program[R1 <: UserAccountRepo & MessageItemRepo & Agent](
       plaintextMessage: PlaintextMessage

diff --git a/mediator/src/main/scala/io/iohk/atala/mediator/protocols/MediatorCoordinationExecuter.scala b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/MediatorCoordinationExecuter.scala
@@ -20,7 +20,7 @@ object MediatorCoordinationExecuter
       ProtocolExecuter.Erros
     ] {
 
-  override def suportedPIURI: Seq[PIURI] = Seq(
+  override def supportedPIURI: Seq[PIURI] = Seq(
     MediateRequest.piuri,
     MediateGrant.piuri,
     MediateDeny.piuri,

diff --git a/mediator/src/main/scala/io/iohk/atala/mediator/protocols/MissingProtocolExecuter.scala b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/MissingProtocolExecuter.scala
@@ -10,7 +10,7 @@ import io.iohk.atala.mediator.actions.Reply
 
 object MissingProtocolExecuter extends ProtocolExecuter[Agent, Nothing] {
 
-  override def suportedPIURI = Seq()
+  override def supportedPIURI = Seq()
   override def program[R1 <: Agent](plaintextMessage: PlaintextMessage) =
     ZIO
       .service[Agent]

diff --git a/mediator/src/main/scala/io/iohk/atala/mediator/protocols/NullProtocolExecuter.scala b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/NullProtocolExecuter.scala
@@ -7,7 +7,7 @@ import zio.ZIO
 
 object NullProtocolExecuter extends ProtocolExecuter[Any, MissingProtocolError] {
 
-  override def suportedPIURI = Seq()
+  override def supportedPIURI = Seq()
   override def program[R1 <: Any](plaintextMessage: PlaintextMessage) =
     ZIO.fail(MissingProtocolError(plaintextMessage.`type`))
 }
diff --git a/mediator/src/main/scala/io/iohk/atala/mediator/protocols/PickupExecuter.scala b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/PickupExecuter.scala
@@ -17,7 +17,7 @@ object PickupExecuter
       ProtocolExecuter.Erros
     ] {
 
-  override def suportedPIURI: Seq[PIURI] = Seq(
+  override def supportedPIURI: Seq[PIURI] = Seq(
     StatusRequest.piuri,
     Status.piuri,
     DeliveryRequest.piuri,

diff --git a/mediator/src/main/scala/io/iohk/atala/mediator/protocols/Problems.scala b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/Problems.scala
@@ -1,11 +1,13 @@
 package io.iohk.atala.mediator.protocols
 
+import com.typesafe.config.{Config, ConfigFactory}
 import fmgp.did.*
 import fmgp.did.comm.*
 import fmgp.did.comm.protocol.reportproblem2.*
 
 object Problems {
-  val email = Some("[email protected]")
+  val config: Config = ConfigFactory.load()
+  val email: Option[String] = Option(config.getString("mediator.problem.report.escalateTo"))
 
   def unsupportedProtocolType(
       to: Set[TO],

diff --git a/mediator/src/main/scala/io/iohk/atala/mediator/protocols/TrustPingExecuter.scala b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/TrustPingExecuter.scala
@@ -15,7 +15,7 @@ import zio.ZIO
 
 class TrustPingExecuter extends ProtocolExecuterWithServices[ProtocolExecuter.Services, MediatorError] {
 
-  override def suportedPIURI: Seq[PIURI] = Seq(TrustPing.piuri, TrustPingResponse.piuri)
+  override def supportedPIURI: Seq[PIURI] = Seq(TrustPing.piuri, TrustPingResponse.piuri)
 
   override def program[R1 <: Agent](
       plaintextMessage: PlaintextMessage