clean up penalty shoot related fields from normal football alerts

Author: aracho1

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

@@ -175,13 +175,11 @@ object FootballMatchStatusPayload {
     "awayTeamMessage" -> o.awayTeamMessage,
     "awayTeamId" -> o.awayTeamId,
     "awayTeamRedCards" -> o.awayTeamRedCards,
-    "awayTeamPenalties" -> o.awayTeamPenalties,
     "homeTeamName" -> o.homeTeamName,
     "homeTeamScore" -> o.homeTeamScore,
     "homeTeamMessage" -> o.homeTeamMessage,
     "homeTeamId" -> o.homeTeamId,
     "homeTeamRedCards" -> o.homeTeamRedCards,
-    "homeTeamPenalties" -> o.homeTeamPenalties,
     "competitionName" -> o.competitionName,
     "roundName" -> o.roundName,
     "venue" -> o.venue,
@@ -208,13 +206,11 @@ case class FootballMatchStatusPayload(
   awayTeamMessage: String,
   awayTeamId: String,
   awayTeamRedCards: Int = 0,
-  awayTeamPenalties: Option[PenaltyShootoutState] = None,
   homeTeamName: String,
   homeTeamScore: Int,
   homeTeamMessage: String,
   homeTeamId: String,
   homeTeamRedCards: Int = 0,
-  homeTeamPenalties: Option[PenaltyShootoutState] = None,
   competitionName: Option[String],
   roundName: Option[String] = None,
   venue: Option[String],

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

@@ -144,13 +144,11 @@ case class FootballMatchStatusNotification(
   awayTeamMessage: String,
   awayTeamId: String,
   awayTeamRedCards: Int = 0,
-  awayTeamPenalties: Option[PenaltyScore] = None,
   homeTeamName: String,
   homeTeamScore: Int,
   homeTeamMessage: String,
   homeTeamId: String,
   homeTeamRedCards: Int = 0,
-  homeTeamPenalties: Option[PenaltyScore] = None,
   competitionName: Option[String],
   roundName: Option[String] = None,
   venue: Option[String],

notificationworkerlambda/src/main/scala/com/gu/notifications/worker/FootballMatchNotificationWorkerLocalRun.scala

@@ -130,17 +130,7 @@ object FcmPayloadBuilder {
         ++ Some(Keys.AwayTeamRedCards -> matchStatusAlert.awayTeamRedCards.toString).toMap
         ++ matchStatusAlert.detailedMatchStatus.map(Keys.DetailedMatchStatus -> _).toMap
         ++ matchStatusAlert.lineupsAvailable.map(v => Keys.LineupsAvailable -> v.toString).toMap
-        ++ matchStatusAlert.kickOffTimestamp.map(Keys.KickOffTimestamp -> _.toString).toMap
-        ++ matchStatusAlert.homeTeamPenalties.map(p => Map(
-          Keys.HomeTeamPenaltiesScored -> p.scored.toString,
-          Keys.HomeTeamPenaltiesMissed -> p.missed.toString,
-          Keys.HomeTeamPenaltiesSaved -> p.saved.toString
-        )).getOrElse(Map.empty)
-        ++ matchStatusAlert.awayTeamPenalties.map(p => Map(
-          Keys.AwayTeamPenaltiesScored -> p.scored.toString,
-          Keys.AwayTeamPenaltiesMissed -> p.missed.toString,
-          Keys.AwayTeamPenaltiesSaved -> p.saved.toString
-        )).getOrElse(Map.empty),
+        ++ matchStatusAlert.kickOffTimestamp.map(Keys.KickOffTimestamp -> _.toString).toMap,
       ttl = FootballMatchStatusTtl
     )
 

notificationworkerlambda/src/main/scala/com/gu/notifications/worker/delivery/fcm/models/payload/FcmPayloadBuilder.scala

@@ -28,7 +28,7 @@ class FcmPayloadBuilderSpec extends Specification with Matchers {
     "generate correct data for Match Status notification" in new MatchStatusNotificationScope {
       check()
     }
-    "include kickOffTimestamp and penalty shootout scores in Match Status notification when present" in new MatchStatusNotificationWithOptionalFieldsScope {
+    "include kickOffTimestamp, lineupsAvailable and detailedMatchStatus in Match Status notification when present" in new MatchStatusNotificationWithOptionalFieldsScope {
       check()
     }
     "generate correct data for Editions notification" in new EditionsScope {
@@ -304,8 +304,6 @@ class FcmPayloadBuilderSpec extends Specification with Matchers {
       debug = true,
       dryRun = None,
       kickOffTimestamp = Some(1746619200L),
-      homeTeamPenalties = Some(models.PenaltyScore(scored = 3, missed = 1, saved = 0)),
-      awayTeamPenalties = Some(models.PenaltyScore(scored = 2, missed = 0, saved = 1))
     )
     override val expected = Some(FirebaseAndroidNotification(
       notificationId = UUID.fromString("4c261110-4672-4451-a5b8-3422c6839c42"),
@@ -331,13 +329,7 @@ class FcmPayloadBuilderSpec extends Specification with Matchers {
         "awayTeamRedCards" -> "0",
         Keys.KickOffTimestamp -> "1746619200",
         Keys.DetailedMatchStatus -> "PENALTIES",
-        Keys.LineupsAvailable -> "true",
-        Keys.HomeTeamPenaltiesScored -> "3",
-        Keys.HomeTeamPenaltiesMissed -> "1",
-        Keys.HomeTeamPenaltiesSaved -> "0",
-        Keys.AwayTeamPenaltiesScored -> "2",
-        Keys.AwayTeamPenaltiesMissed -> "0",
-        Keys.AwayTeamPenaltiesSaved -> "1"
+        Keys.LineupsAvailable -> "true"
       ),
       ttl = TimeToLive.FootballMatchStatusTtl
     ))