Rename isEventLive field to isLive

Author: waisingyiu

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

@@ -70,7 +70,7 @@ object BroadcastLambda extends RequestStreamHandler with Lambda with Logging {
           logger.error(s"Channel not active for match ID ${request.matchId}")
           Future.failed(new LiveActivityInvalidStateException(request.matchId, "Channel not active"))
         } else Future.successful(())
-      _ <- if (!mapping.isEventLive) {
+      _ <- if (!mapping.isLive) {
           logger.error(s"Event not live for match ID ${request.matchId}")
           Future.failed(new LiveActivityInvalidStateException(request.matchId, "Event not live"))
         } else Future.successful(())

liveactivities/src/main/scala/com/gu/liveactivities/models/LiveActivities.scala

@@ -42,7 +42,7 @@ case class LiveActivityMapping(
 		id: String,
 		channelId: String,
     isChannelActive: Boolean,
-    isEventLive: Boolean,
+    isLive: Boolean,
 		data: Option[LiveActivityData],
     competitionId: Option[String],
     lastEventId: Option[String],
@@ -53,7 +53,7 @@ object LiveActivityMapping {
     (JsPath \ "id").read[String] and
     (JsPath \ "channelId").read[String] and
     (JsPath \ "isChannelActive").read[Boolean] and
-    (JsPath \ "isEventLive").read[Boolean] and
+    (JsPath \ "isLive").read[Boolean] and
     (JsPath \ "data").readNullable[LiveActivityData] and
     (JsPath \ "competitionId").readNullable[String] and
     (JsPath \ "lastEventId").readNullable[String] and
@@ -64,10 +64,10 @@ object LiveActivityMapping {
     (JsPath \ "id").write[String] and
     (JsPath \ "channelId").write[String] and
     (JsPath \ "isChannelActive").write[Boolean] and
-    (JsPath \ "isEventLive").write[Boolean] and
+    (JsPath \ "isLive").write[Boolean] and
     (JsPath \ "data").writeNullable[LiveActivityData] and
     (JsPath \ "competitionId").writeNullable[String] and
     (JsPath \ "lastEventId").writeNullable[String] and
     (JsPath \ "lastEventAt").writeNullable[String]
-  )(r => (r.id, r.channelId, r.isChannelActive, r.isEventLive, r.data, r.competitionId, r.lastEventId, r.lastEventAt.map(dateTimeToString)))
+  )(r => (r.id, r.channelId, r.isChannelActive, r.isLive, r.data, r.competitionId, r.lastEventId, r.lastEventAt.map(dateTimeToString)))
 }

liveactivities/src/main/scala/com/gu/liveactivities/service/LiveActivityChannelRepository.scala

@@ -35,7 +35,7 @@ trait ChannelMappingsRepository {
 
   def updateMappingActiveChannel(id: String, isActive: Boolean): Future[Unit]
 
-  def updateMappingLiveEvent(id: String, isLive: Boolean): Future[Unit]
+  def updateMappingSetLive(id: String, isLive: Boolean): Future[Unit]
 
   def updateMappingLastEvent(id: String, lastEventId: Option[String], lastEventUpdate: Option[ZonedDateTime]): Future[Unit]
 
@@ -88,7 +88,7 @@ class LiveActivityChannelRepository(client: DynamoDbAsyncClient, tableName: Stri
       id = id, 
       channelId = channelId, 
       isChannelActive = true, 
-      isEventLive = true, 
+      isLive = true, 
       data = eventData, 
       competitionId = competitionId,
       lastEventId = None,
@@ -113,11 +113,11 @@ class LiveActivityChannelRepository(client: DynamoDbAsyncClient, tableName: Stri
   private def updateMappingById(
       id: String, 
       isChannelActive: Option[Boolean] = None, 
-      isEventLive: Option[Boolean] = None, 
+      isLive: Option[Boolean] = None, 
       lastEventId: Option[String] = None, 
       lastEventAt: Option[ZonedDateTime] = None
   ): Future[Unit] = {
-    if (Seq(isChannelActive, isEventLive, lastEventId, lastEventAt).forall(_.isEmpty)) {
+    if (Seq(isChannelActive, isLive, lastEventId, lastEventAt).forall(_.isEmpty)) {
       logger.warn(s"No fields to update for live activity mapping with id $id")
       Future.successful(())
     } else {
@@ -131,7 +131,7 @@ class LiveActivityChannelRepository(client: DynamoDbAsyncClient, tableName: Stri
             .value(AttributeValue.fromBool(v))
             .build()
         },
-        "isEventLive" -> isEventLive.map {v =>
+        "isLive" -> isLive.map {v =>
           AttributeValueUpdate
             .builder()
             .action(AttributeAction.PUT)
@@ -176,11 +176,11 @@ class LiveActivityChannelRepository(client: DynamoDbAsyncClient, tableName: Stri
   }
 
   override def updateMappingActiveChannel(id: String, isActive: Boolean): Future[Unit] = {
-    updateMappingById(id, isChannelActive = Some(isActive), isEventLive = Some(isActive))
+    updateMappingById(id, isChannelActive = Some(isActive), isLive = Some(isActive))
   }
 
-  override def updateMappingLiveEvent(id: String, isLive: Boolean): Future[Unit] = {
-    updateMappingById(id, isEventLive = Some(isLive))
+  override def updateMappingSetLive(id: String, isLive: Boolean): Future[Unit] = {
+    updateMappingById(id, isLive = Some(isLive))
   }
 
   override def updateMappingLastEvent(id: String, lastEventId: Option[String], lastEventAt: Option[ZonedDateTime]): Future[Unit] = {

liveactivities/src/test/scala/com/gu/liveactivities/LiveActivityChannelRepositorySpec.scala

@@ -88,7 +88,7 @@ class LiveActivityChannelRepositoryTest(implicit ev: ExecutionEnv)
       id = "football-1234567",
       channelId = "test-channel-id",
       isChannelActive = true,
-      isEventLive = true,     
+      isLive = true,     
       data = Some(footballData),
       competitionId = Some("test-competition-id"),
       lastEventId = None,