remove commentary field

Author: aracho1

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

@@ -192,7 +192,6 @@ object FootballMatchStatusPayload {
     "matchStatus" -> o.matchStatus,
     "eventId" -> o.eventId,
     "kickOffTimestamp" -> o.kickOffTimestamp,
-    "matchCommentary" -> o.matchCommentary,
     "debug" -> o.debug
   )
 }
@@ -224,7 +223,6 @@ case class FootballMatchStatusPayload(
   matchStatus: String,
   eventId: String,
   kickOffTimestamp: Option[Long] = None,
-  matchCommentary: Option[String] = None,
   debug: Boolean,
   dryRun: Option[Boolean]
 ) extends NotificationPayload with derivedId {

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

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

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

@@ -68,7 +68,6 @@ class MatchStatusNotificationBuilder(mapiHost: String) {
       topic = topics,
       matchStatus = status,
       eventId = UUID.nameUUIDFromBytes(triggeringEvent.eventId.getBytes).toString,
-      matchCommentary = matchInfo.comments,
       kickOffTimestamp = Some(matchInfo.date.toEpochSecond),
       debug = false,
       dryRun = None

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

@@ -127,7 +127,6 @@ object FcmPayloadBuilder {
         ++ matchStatusAlert.roundName.map(Keys.RoundName -> _).toMap
         ++ Some(Keys.HomeTeamRedCards -> matchStatusAlert.homeTeamRedCards.toString).toMap
         ++ Some(Keys.AwayTeamRedCards -> matchStatusAlert.awayTeamRedCards.toString).toMap
-        ++ matchStatusAlert.matchCommentary.map(Keys.MatchCommentary -> _).toMap
         ++ matchStatusAlert.kickOffTimestamp.map(Keys.KickOffTimestamp -> _.toString).toMap
         ++ matchStatusAlert.homeTeamPenalties.map(p => Map(
           Keys.HomeTeamPenaltiesScored -> p.scored.toString,

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

@@ -46,7 +46,6 @@ object Keys {
   final val AwayTeamPenaltiesMissed = "awayTeamPenaltiesMissed"
   final val AwayTeamPenaltiesSaved = "awayTeamPenaltiesSaved"
   final val RoundName = "roundName"
-  final val MatchCommentary = "matchCommentary"
   final val KickOffTimestamp = "kickOffTimestamp"
 
   final val EditionsDate = "date"

notificationworkerlambda/src/test/scala/com/gu/notifications/worker/delivery/fcm/models/payload/FcmPayloadBuilderSpec.scala

@@ -28,7 +28,7 @@ class FcmPayloadBuilderSpec extends Specification with Matchers {
     "generate correct data for Match Status notification" in new MatchStatusNotificationScope {
       check()
     }
-    "include matchCommentary, kickOffTimestamp and penalty shootout scores in Match Status notification when present" in new MatchStatusNotificationWithOptionalFieldsScope {
+    "include kickOffTimestamp and penalty shootout scores in Match Status notification when present" in new MatchStatusNotificationWithOptionalFieldsScope {
       check()
     }
     "generate correct data for Editions notification" in new EditionsScope {
@@ -299,7 +299,6 @@ class FcmPayloadBuilderSpec extends Specification with Matchers {
       eventId = "2",
       debug = true,
       dryRun = None,
-      matchCommentary = Some("Argentina win 4-3 on penalties."),
       kickOffTimestamp = Some(1746619200L),
       homeTeamPenalties = Some(models.PenaltyScore(scored = 3, missed = 1, saved = 0)),
       awayTeamPenalties = Some(models.PenaltyScore(scored = 2, missed = 0, saved = 1))
@@ -326,7 +325,6 @@ class FcmPayloadBuilderSpec extends Specification with Matchers {
         "venue" -> "Venue",
         "homeTeamRedCards" -> "0",
         "awayTeamRedCards" -> "0",
-        Keys.MatchCommentary -> "Argentina win 4-3 on penalties.",
         Keys.KickOffTimestamp -> "1746619200",
         Keys.HomeTeamPenaltiesScored -> "3",
         Keys.HomeTeamPenaltiesMissed -> "1",