Change the data models for the input of the lambdas

Author: waisingyiu

liveactivities/src/main/scala/com/gu/liveactivities/BroadcastLambda.scala

@@ -21,7 +21,7 @@ import scala.concurrent.Future
 import com.gu.liveactivities.models.LiveActivityInvalidStateException
 
 // TODO - we should get the channel ID by looking up the match ID in the datastore
-case class BroadcastRequest(matchId: String, channelId: String, payload: String)
+case class BroadcastRequest(matchId: String, payload: String)
 
 object BroadcastRequest {
 	implicit val jf: Format[BroadcastRequest] = Json.format[BroadcastRequest]

liveactivities/src/main/scala/com/gu/liveactivities/ChannelManagerLambda.scala

@@ -23,7 +23,7 @@ import scala.concurrent.Future
 import com.gu.liveactivities.models.LiveActivityInvalidStateException
 
 // TODO - we should get the channel ID by looking up the match ID in the datastore
-case class ChannelRequest(matchId: String, channelId: String, toCreate: Boolean)
+case class ChannelRequest(matchId: String, competitionId: Option[String], eventData: Option[LiveActivityData], toCreate: Boolean)
 
 object ChannelRequest {
   implicit val jf: Format[ChannelRequest] = Json.format[ChannelRequest]
@@ -33,7 +33,7 @@ object ChannelManagerLambda extends RequestStreamHandler with Lambda with Loggin
 
   val channelApiClient = new ChannelApiClient(authentication, config.bundleId, config.sendingToProdServer)
 
-  def processCreateChannelRequest(matchId: String, eventData: Option[LiveActivityData], competitionId: Option[String]): Future[String] = {
+  def processCreateChannelRequest(matchId: String, competitionId: Option[String], eventData: Option[LiveActivityData]): Future[String] = {
     logger.info(s"Received request to create channel for match ID ${matchId}")
     return for {
       mappingExists <- repository.containMapping(matchId)
@@ -76,7 +76,7 @@ object ChannelManagerLambda extends RequestStreamHandler with Lambda with Loggin
   def processRequest(request: ChannelRequest, context: Context): Unit = {
     val channelFuture = 
       if (request.toCreate)
-        processCreateChannelRequest(request.matchId, None, None)
+        processCreateChannelRequest(request.matchId, request.competitionId, request.eventData)
       else
         processCloseChannelRequest(request.matchId)
 

liveactivities/src/main/scala/com/gu/liveactivities/LambdaLocalRun.scala

@@ -6,7 +6,7 @@ import java.nio.charset.StandardCharsets
 object LambdaLocalRun extends App {
 
   println("Start running ChannelManagerLambda locally")
-  val createChannelJson = Json.toJson(ChannelRequest("match123", "channel123", toCreate = true)).toString()
+  val createChannelJson = Json.toJson(ChannelRequest("match123", Some("competiton-001"), None, toCreate = true)).toString()
 
   val createRequestStream = new java.io.ByteArrayInputStream(createChannelJson.getBytes(StandardCharsets.UTF_8))
 
@@ -16,7 +16,7 @@ object LambdaLocalRun extends App {
 
   val channelId = Json.parse(createResponseStream.toString()).as[String]
 
-  val closeRequest = ChannelRequest("match123", channelId, toCreate = false)
+  val closeRequest = ChannelRequest("match123", None, None, toCreate = false)
 
   val closeRequestStream = new java.io.ByteArrayInputStream(Json.toJson(closeRequest).toString().getBytes(StandardCharsets.UTF_8))