add detailedMatchStatus field

Author: aracho1

api-models/src/main/scala/com/gu/mobile.notifications.client/models/Payloads.scala

@@ -193,6 +193,7 @@ object FootballMatchStatusPayload {
     "eventId" -> o.eventId,
     "kickOffTimestamp" -> o.kickOffTimestamp,
     "lineupsAvailable" -> o.lineupsAvailable,
+    "detailedMatchStatus" -> o.detailedMatchStatus,
     "debug" -> o.debug
   )
 }
@@ -225,6 +226,7 @@ case class FootballMatchStatusPayload(
   eventId: String,
   kickOffTimestamp: Option[Long] = None,
   lineupsAvailable: Option[Boolean] = None,
+  detailedMatchStatus: Option[String] = None,
   debug: Boolean,
   dryRun: Option[Boolean]
 ) extends NotificationPayload with derivedId {

common/src/main/scala/models/Notification.scala

@@ -160,6 +160,8 @@ case class FootballMatchStatusNotification(
   matchStatus: String,
   eventId: String,
   kickOffTimestamp: Option[Long] = None,
+  lineupsAvailable: Option[Boolean] = None,
+  detailedMatchStatus: Option[String] = None,
   debug: Boolean,
   dryRun: Option[Boolean]
 ) extends Notification

football/src/main/scala/com/gu/mobile/notifications/football/notificationbuilders/MatchStatusNotificationBuilder.scala

@@ -4,6 +4,7 @@ import java.net.URI
 import java.util.UUID
 import com.gu.mobile.notifications.client.models.Importance.{Importance, Major, Minor}
 import com.gu.mobile.notifications.client.models._
+import com.gu.mobile.notifications.client.models.liveActitivites.MatchStatus
 import com.gu.mobile.notifications.football.models.{Dismissal, FootballMatchEvent, FullTime, Goal, HalfTime, KickOff, PenaltyShootoutKick, PenaltyShootoutScore, RedCards, Score, SecondHalf}
 import pa.{MatchDay, MatchDayTeam}
 
@@ -70,13 +71,23 @@ class MatchStatusNotificationBuilder(mapiHost: String) {
       eventId = UUID.nameUUIDFromBytes(triggeringEvent.eventId.getBytes).toString,
       kickOffTimestamp = Some(matchInfo.date.toEpochSecond),
       lineupsAvailable = Some(matchInfo.lineupsAvailable),
+      detailedMatchStatus = Some(detailedMatchStatus(triggeringEvent, matchInfo.matchStatus)),
       debug = false,
       dryRun = None
     )
   }
 
   def transformTeamName(name: String): String = name.replace(" Ladies", "")
 
+  private def detailedMatchStatus(triggeringEvent: FootballMatchEvent, paStatus: String): String =
+    triggeringEvent match {
+      case _: KickOff    => "FIRST_HALF"
+      case _: HalfTime   => "HALF_TIME"
+      case _: SecondHalf => "SECOND_HALF"
+      case _: FullTime   => "FULL_TIME"
+      case _             => MatchStatus.fromString(paStatus).status
+    }
+
   private def goalDescription(goal: Goal) = {
     val extraInfo = {
       val goalTypeInfo = condOpt(goal.goalType) {

football/src/test/scala/com/gu/mobile/notifications/football/notificationbuilders/MatchStatusNotificationBuilderSpec.scala

@@ -7,7 +7,7 @@ import java.util.UUID
 import com.gu.mobile.notifications.client.models.Importance.{Major, Minor}
 import com.gu.mobile.notifications.client.models._
 import com.gu.mobile.notifications.football.lib.SyntheticMatchEventGenerator
-import com.gu.mobile.notifications.football.models.{Dismissal, FootballMatchEvent, Goal, GoalContext, Score}
+import com.gu.mobile.notifications.football.models.{Dismissal, FootballMatchEvent, Goal, GoalContext, KickOff, Score}
 import org.specs2.mutable.Specification
 import org.specs2.specification.Scope
 import pa.{Competition, MatchDay, MatchDayTeam, Parser, Round, Stage, Venue}
@@ -49,11 +49,30 @@ class MatchStatusNotificationBuilderSpec extends Specification {
         matchStatus = "1st",
         kickOffTimestamp = Some(ZonedDateTime.parse("2000-01-01T00:00:00Z").toEpochSecond),
         lineupsAvailable = Some(false),
+        detailedMatchStatus = Some("FIRST_HALF"),
         debug = false,
         dryRun = None
       )
     }
 
+    "Include detailedMatchStatus derived from triggering event type" in new MatchEventsContext {
+      val kickOff = KickOff("")
+      val notification = builder.build(kickOff, matchInfo.copy(matchStatus = "Fixture"), List.empty, None)
+      notification.detailedMatchStatus shouldEqual Some("FIRST_HALF")
+    }
+
+    "Include detailedMatchStatus from PA status when event type has no override" in new MatchEventsContext {
+      val matchInPenalties = matchInfo.copy(matchStatus = "PT")
+      val notification = builder.build(baseGoal, matchInPenalties, List.empty, None)
+      notification.detailedMatchStatus shouldEqual Some("PENALTIES")
+    }
+
+    "Include detailedMatchStatus for extra time half time" in new MatchEventsContext {
+      val matchInETHT = matchInfo.copy(matchStatus = "ETHT")
+      val notification = builder.build(baseGoal, matchInETHT, List.empty, None)
+      notification.detailedMatchStatus shouldEqual Some("EXTRA_TIME_HALF_TIME")
+    }
+
     "Include lineupsAvailable from matchInfo when false" in new MatchEventsContext {
       val notification = builder.build(baseGoal, matchInfo, List.empty, None)
       notification.lineupsAvailable shouldEqual Some(false)
@@ -110,7 +129,7 @@ class MatchStatusNotificationBuilderSpec extends Specification {
       previewAvailable = false,
       reportAvailable = false,
       lineupsAvailable = false,
-      matchStatus = "1st",
+      matchStatus = "KO",
       attendance = None,
       homeTeam = home,
       awayTeam = away,