update detailedMatchStatus

Author: aracho1

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

@@ -104,7 +104,7 @@ 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)),
+          detailedMatchStatus = Some(MatchStatus.fromString(matchInfo.matchStatus).status),
           debug = false,
           dryRun = None
         )
@@ -113,15 +113,6 @@ class MatchStatusNotificationBuilder(mapiHost: String) {
 
   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, KickOff, PenaltyShootoutKick, Score}
+import com.gu.mobile.notifications.football.models.{Dismissal, FootballMatchEvent, FullTime, Goal, GoalContext, KickOff, PenaltyShootoutKick, Score}
 import org.specs2.mutable.Specification
 import org.specs2.specification.Scope
 import pa.{Competition, MatchDay, MatchDayTeam, Parser, Round, Stage, Venue}
@@ -57,7 +57,7 @@ class MatchStatusNotificationBuilderSpec extends Specification {
 
     "Include detailedMatchStatus for kick off" in new MatchEventsContext {
       val kickOff = KickOff("")
-      val notification = builder.build(kickOff, matchInfo.copy(matchStatus = "Fixture"), List.empty, None).asInstanceOf[FootballMatchStatusPayload]
+      val notification = builder.build(kickOff, matchInfo.copy(matchStatus = "KO"), List.empty, None).asInstanceOf[FootballMatchStatusPayload]
       notification.detailedMatchStatus shouldEqual Some("FIRST_HALF")
     }
 
@@ -73,6 +73,21 @@ class MatchStatusNotificationBuilderSpec extends Specification {
       notification.detailedMatchStatus shouldEqual Some("EXTRA_TIME_HALF_TIME")
     }
 
+    "Include detailedMatchStatus EXTRA_TIME_TO_BE_PLAYED for a full time event when match status is FTET" in new MatchEventsContext {
+      val notification = builder.build(fullTime, matchInfo.copy(matchStatus = "FTET"), List.empty, None).asInstanceOf[FootballMatchStatusPayload]
+      notification.detailedMatchStatus shouldEqual Some("EXTRA_TIME_TO_BE_PLAYED")
+    }
+
+    "Include detailedMatchStatus EXTRA_TIME_FIRST_HALF for a goal during extra time" in new MatchEventsContext {
+      val notification = builder.build(baseGoal, matchInfo.copy(matchStatus = "ETS"), List.empty, None).asInstanceOf[FootballMatchStatusPayload]
+      notification.detailedMatchStatus shouldEqual Some("EXTRA_TIME_FIRST_HALF")
+    }
+
+    "Include detailedMatchStatus EXTRA_TIME_SECOND_HALF for a goal during extra time second half" in new MatchEventsContext {
+      val notification = builder.build(baseGoal, matchInfo.copy(matchStatus = "ETSHS"), List.empty, None).asInstanceOf[FootballMatchStatusPayload]
+      notification.detailedMatchStatus shouldEqual Some("EXTRA_TIME_SECOND_HALF")
+    }
+
     "Include lineupsAvailable true from matchInfo" in new MatchEventsContext {
       val matchInfoWithLineups = matchInfo.copy(lineupsAvailable = true)
       val notification = builder.build(baseGoal, matchInfoWithLineups, List.empty, None).asInstanceOf[FootballMatchStatusPayload]