Fix proto breaking changes ✨ (#197)

Author: Tochemey

core/lagompb-core/src/main/scala/io/superflat/lagompb/AggregateRoot.scala

@@ -166,7 +166,7 @@ abstract class AggregateRoot(
    */
   private[lagompb] def nextMeta(
       stateWrapper: StateWrapper,
-      data: Map[String, String]
+      data: Map[String, Any]
   ): MetaData = {
     MetaData()
       .withRevisionNumber(stateWrapper.getMeta.revisionNumber + 1)

core/lagompb-core/src/main/scala/io/superflat/lagompb/BaseServiceImpl.scala

@@ -2,6 +2,7 @@ package io.superflat.lagompb
 
 import akka.cluster.sharding.typed.scaladsl.ClusterSharding
 import akka.grpc.GrpcServiceException
+import com.google.protobuf.any.Any
 import com.lightbend.lagom.scaladsl.api.transport.{BadRequest, NotFound}
 import com.lightbend.lagom.scaladsl.persistence.PersistentEntityRegistry
 import io.grpc.Status
@@ -32,7 +33,7 @@ trait SharedBaseServiceImpl extends SendCommand {
   def sendCommand(
       entityId: String,
       cmd: GeneratedMessage,
-      data: Map[String, String]
+      data: Map[String, Any]
   )(implicit
       ec: ExecutionContext
   ): Future[StateWrapper] = {

core/lagompb-core/src/main/scala/io/superflat/lagompb/Command.scala

@@ -17,5 +17,5 @@ import io.superflat.lagompb.protobuf.v1.core.CommandReply
 final case class Command(
     command: Any,
     replyTo: ActorRef[CommandReply],
-    data: Map[String, String]
+    data: Map[String, Any]
 )

core/lagompb-core/src/main/scala/io/superflat/lagompb/SendCommand.scala

@@ -34,7 +34,7 @@ trait SendCommand {
       aggregateRoot: AggregateRoot,
       entityId: String,
       cmd: scalapb.GeneratedMessage,
-      data: Map[String, String]
+      data: Map[String, Any]
   )(implicit ec: ExecutionContext): Future[StateWrapper] =
     clusterSharding
       .entityRefFor(aggregateRoot.typeKey, entityId)
@@ -59,7 +59,7 @@ trait SendCommand {
       aggregateRoot: AggregateRoot,
       entityId: String,
       cmd: scalapb.GeneratedMessage,
-      data: Map[String, String]
+      data: Map[String, Any]
   )(implicit
       ec: ExecutionContext
   ): Future[(scalapb.GeneratedMessage, MetaData)] =

core/lagompb-core/src/test/protobuf/lagompb/v1/tests.proto

@@ -13,6 +13,11 @@ message TestCommand {
   string name = 2;
 }
 
+// used for auditing plugin
+message AuditingData{
+  map<string, string> data = 1;
+}
+
 // used to test NoEvent to be persisted
 message NoEventTestCommand {}
 

core/lagompb-core/src/test/scala/io/superflat/lagompb/AggregateRootSpec.scala

@@ -65,7 +65,8 @@ class AggregateRootSpec extends BaseActorTestKit(s"""
       val testCmd = TestCommand(companyUUID, "first test")
 
       // let us send the command to the aggregate
-      val data = Map("audit|employeeUuid" -> "1223", "audit|createdAt" -> "2020-04-17")
+      val auditing = AuditingData.defaultInstance.withData(Map("employeeUuid" -> "123"))
+      val data = Map("audit" -> Any.pack(auditing))
 
       aggregateRef ! Command(Any.pack(testCmd), commandSender.ref, data)
 
@@ -104,7 +105,7 @@ class AggregateRootSpec extends BaseActorTestKit(s"""
       val testCmd = TestCommand("", "first test")
 
       // let us send the command to the aggregate
-      aggregateRef ! Command(Any.pack(testCmd), commandSender.ref, Map.empty[String, String])
+      aggregateRef ! Command(Any.pack(testCmd), commandSender.ref, Map.empty[String, Any])
 
       commandSender.receiveMessage(replyTimeout) match {
         case CommandReply(reply, _) =>
@@ -141,8 +142,8 @@ class AggregateRootSpec extends BaseActorTestKit(s"""
       val testCmd = NoEventTestCommand.defaultInstance
 
       // let us send the command to the aggregate
-      val data =
-        Map("audit|employeeUuid" -> "1223", "audit|createdAt" -> "2020-04-17")
+      val auditing = AuditingData.defaultInstance.withData(Map("employeeUuid" -> "123"))
+      val data = Map("audit" -> Any.pack(auditing))
 
       aggregateRef ! Command(Any.pack(testCmd), commandSender.ref, data)
 

core/lagompb-core/src/test/scala/io/superflat/lagompb/CommandSerializerSpec.scala

@@ -3,7 +3,7 @@ package io.superflat.lagompb
 import akka.actor.testkit.typed.scaladsl.TestProbe
 import com.google.protobuf.any.Any
 import io.superflat.lagompb.protobuf.v1.core.CommandReply
-import io.superflat.lagompb.protobuf.v1.tests.TestCommand
+import io.superflat.lagompb.protobuf.v1.tests.{AuditingData, TestCommand}
 import io.superflat.lagompb.testkit.BaseActorTestKit
 
 class CommandSerializerSpec extends BaseActorTestKit(s"""
@@ -26,8 +26,8 @@ class CommandSerializerSpec extends BaseActorTestKit(s"""
   "Verification of command serializer" in {
     val probe: TestProbe[CommandReply] = createTestProbe[CommandReply]()
     val command = TestCommand(companyUUID, "John Ross")
-    val data =
-      Map("audit|employeeUuid" -> "1223", "audit|createdAt" -> "2020-04-17")
+    val auditing = AuditingData.defaultInstance.withData(Map("employeeUuid" -> "123"))
+    val data = Map("audit" -> Any.pack(auditing))
     serializationTestKit.verifySerialization(Command(Any.pack(command), probe.ref, data))
   }
 }

core/lagompb-core/src/test/scala/io/superflat/lagompb/data/TestService.scala

@@ -4,6 +4,7 @@ import java.util.UUID
 
 import akka.actor.ActorSystem
 import akka.cluster.sharding.typed.scaladsl.ClusterSharding
+import com.google.protobuf.any.Any
 import com.lightbend.lagom.scaladsl.api.Service.restCall
 import com.lightbend.lagom.scaladsl.api.transport.Method
 import com.lightbend.lagom.scaladsl.api.{Descriptor, ServiceCall}
@@ -37,7 +38,7 @@ class TestServiceImpl(
   override def testHello: ServiceCall[TestCommand, TestState] = { req =>
     val companyId: String = UUID.randomUUID().toString
     val cmd = req.update(_.companyUuid := companyId)
-    sendCommand(companyId, cmd, Map.empty[String, String])
+    sendCommand(companyId, cmd, Map.empty[String, Any])
       .map((rst: StateWrapper) => rst.state.get.unpack(TestState))
   }
 }