clean up

Author: aracho1

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

@@ -236,6 +236,7 @@ object FootballPenaltyShootoutPayload {
     "type" -> FootballPenaltyShootout.toString,
     "title" -> o.title,
     "message" -> o.message,
+    "thumbnailUrl" -> o.thumbnailUrl,
     "sender" -> o.sender,
     "awayTeamName" -> o.awayTeamName,
     "awayTeamScore" -> o.awayTeamScore,
@@ -260,13 +261,15 @@ object FootballPenaltyShootoutPayload {
     "matchStatus" -> o.matchStatus,
     "eventId" -> o.eventId,
     "kickOffTimestamp" -> o.kickOffTimestamp,
+    "lineupsAvailable" -> o.lineupsAvailable,
     "detailedMatchStatus" -> o.detailedMatchStatus,
     "debug" -> o.debug
   )
 }
 case class FootballPenaltyShootoutPayload(
   title: Option[String],
   message: Option[String],
+  thumbnailUrl: Option[URI] = None,
   sender: String,
   awayTeamName: String,
   awayTeamScore: Int,
@@ -291,6 +294,7 @@ case class FootballPenaltyShootoutPayload(
   matchStatus: String,
   eventId: String,
   kickOffTimestamp: Option[Long] = None,
+  lineupsAvailable: Option[Boolean] = None,
   detailedMatchStatus: Option[String] = None,
   debug: Boolean,
   dryRun: Option[Boolean]

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

@@ -176,6 +176,7 @@ case class FootballPenaltyShootoutNotification(
   `type`: NotificationType = NotificationType.FootballPenaltyShootout,
   title: Option[String],
   message: Option[String],
+  thumbnailUrl: Option[URI] = None,
   sender: String,
   awayTeamName: String,
   awayTeamScore: Int,
@@ -200,6 +201,7 @@ case class FootballPenaltyShootoutNotification(
   matchStatus: String,
   eventId: String,
   kickOffTimestamp: Option[Long] = None,
+  lineupsAvailable: Option[Boolean] = None,
   detailedMatchStatus: Option[String] = None,
   debug: Boolean,
   dryRun: Option[Boolean]

football/src/main/scala/com/gu/mobile/notifications/football/lib/EventConsumer.scala

@@ -28,10 +28,6 @@ class EventConsumer(
     val liveActivityEventTypes =
       List(
 
-        // penalty shootout events
-        // "shootoutGoal",
-        // "shootoutMiss",
-        // "shootoutSave",
         // additional synthetic live activity life cycle events
         "create-channel",
         "start-live-activity",

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

@@ -4,7 +4,6 @@ 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}
 
@@ -17,7 +16,7 @@ class MatchStatusNotificationBuilder(mapiHost: String) {
     matchInfo: MatchDay,
     previousEvents: List[FootballMatchEvent],
     articleId: Option[String]
-  ): NotificationPayload = {
+  ): FootballMatchStatusPayload = {
     val liveActivityTopics =
       if (triggeringEvent.isInstanceOf[KickOff])
         List(
@@ -26,7 +25,7 @@ class MatchStatusNotificationBuilder(mapiHost: String) {
           Topic(TopicTypes.FootballMatchLiveActivity, matchInfo.id)
         )
       else Nil
-  
+
     val topics = List(
       Topic(TopicTypes.FootballTeam, matchInfo.homeTeam.id),
       Topic(TopicTypes.FootballTeam, matchInfo.awayTeam.id),
@@ -72,6 +71,7 @@ class MatchStatusNotificationBuilder(mapiHost: String) {
           matchStatus = status,
           eventId = UUID.nameUUIDFromBytes(triggeringEvent.eventId.getBytes).toString,
           kickOffTimestamp = Some(matchInfo.date.toEpochSecond),
+          lineupsAvailable = Some(matchInfo.lineupsAvailable),
           detailedMatchStatus = Some("PENALTIES"),
           debug = false,
           dryRun = None

football/src/test/scala/com/gu/mobile/notifications/football/lib/EventConsumerSpec.scala

@@ -352,6 +352,29 @@ class EventConsumerSpec(implicit ev: ExecutionEnv)
       result must not contain((payload: NotificationPayload) => payload.title.getOrElse("") == "Penalty Kick")
     }
 
+    "generate FootballPenaltyShootoutPayload for shootout events" in new MatchEventsContext {
+      override def matchDayLA: MatchDay =
+        super.matchDayLA.copy(date = ZonedDateTime.now().plusHours(1))
+
+      val result: List[NotificationPayload] =
+        eventConsumer.eventsToNotifications(matchDataLA)
+
+      result must contain(beAnInstanceOf[FootballPenaltyShootoutPayload])
+    }
+    }
+
+    "NOT generate notification payload for extra time match phase events" in new MatchEventsContext {
+      override def matchDayLA: MatchDay =
+        super.matchDayLA.copy(date = ZonedDateTime.now(), matchStatus = "ETS")
+
+      val result: List[NotificationPayload] =
+        eventConsumer.eventsToNotifications(matchDataLA)
+
+      result must forall((payload: NotificationPayload) =>
+        payload.title.getOrElse("") != "The Guardian"
+      ) // default string for unknown events
+    }
+
   }
 
   "A LiveActivity EventConsumer handles synthetic events and" should {
@@ -663,19 +686,4 @@ class EventConsumerSpec(implicit ev: ExecutionEnv)
       )
     )
   }
-
-  trait WorldCupContext extends Scope {
-    val matchStatusNotificationBuilder = new MatchStatusNotificationBuilder("https://mobile.guardianapis.com")
-    val eventConsumer = new EventConsumer(matchStatusNotificationBuilder)
-
-    def loadFile(file: String): String = {
-      val stream = this.getClass.getClassLoader.getResourceAsStream(file)
-      Source.fromInputStream(stream).mkString
-    }
-
-    def rawEvents: List[MatchEvent] = Parser.parseMatchEvents(loadFile("worldcup/match-event-feed.xml")).get.events
-    def matchDay: MatchDay = Parser.parseMatchDay(loadFile("worldcup/match-day.xml")).head
-    def matchEvents: List[MatchEvent] = new SyntheticMatchEventGenerator(() => ZonedDateTime.now()).generate(rawEvents, "4356015", matchDay)
-    def matchData = MatchDataWithArticle(matchDay, matchEvents, None)
-  }
 }

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

@@ -95,26 +95,25 @@ class MatchStatusNotificationBuilderSpec extends Specification {
       val notification = builder.build(secondDismissal, matchInfo, List(firstDismissal), None).asInstanceOf[FootballMatchStatusPayload]
       notification.homeTeamRedCards shouldEqual 2
       notification.awayTeamRedCards shouldEqual 0
-      notification must not(beAnInstanceOf[FootballPenaltyShootoutPayload])
     }
 
-
     "Return FootballPenaltyShootoutPayload for a penalty shootout kick" in new MatchEventsContext {
       val shootoutKick = PenaltyShootoutKick(ScoredShootoutResult, "Player", home, away, 1, "event-1")
       val notification = builder.build(shootoutKick, matchInfo.copy(matchStatus = "PT"), List.empty, None)
       notification must beAnInstanceOf[FootballPenaltyShootoutPayload]
-    }
-
-    "Not return FootballMatchStatusPayload for a penalty shootout kick" in new MatchEventsContext {
-      val shootoutKick = PenaltyShootoutKick(ScoredShootoutResult, "Player", home, away, 1, "event-1")
-      val notification = builder.build(shootoutKick, matchInfo.copy(matchStatus = "PT"), List.empty, None)
       notification must not(beAnInstanceOf[FootballMatchStatusPayload])
     }
 
     "Not return FootballPenaltyShootoutPayload for a goal" in new MatchEventsContext {
       val notification = builder.build(baseGoal, matchInfo, List.empty, None)
       notification must not(beAnInstanceOf[FootballPenaltyShootoutPayload])
     }
+
+    "Not return FootballPenaltyShootoutPayload for dismissal" in new MatchEventsContext {
+      val dismissal = Dismissal("e2", "Player B", home, 80, None)
+      val notification = builder.build(baseGoal, matchInfo, List(dismissal), None)
+      notification must not(beAnInstanceOf[FootballPenaltyShootoutPayload])
+    }
   }
 
   trait MatchEventsContext extends Scope {
@@ -145,21 +144,4 @@ class MatchStatusNotificationBuilderSpec extends Specification {
       comments = None
     )
   }
-
-  trait WorldCupContext extends Scope {
-    val builder = new MatchStatusNotificationBuilder("http://localhost")
-
-    def loadFile(file: String): String = {
-      val stream = this.getClass.getClassLoader.getResourceAsStream(file)
-      Source.fromInputStream(stream).mkString
-    }
-
-    def matchInfo: MatchDay = Parser.parseMatchDay(loadFile("worldcup/match-day.xml")).head
-    def rawEvents = Parser.parseMatchEvents(loadFile("worldcup/match-event-feed.xml")).get.events
-    def allEvents: List[FootballMatchEvent] =
-      new SyntheticMatchEventGenerator(() => ZonedDateTime.now())
-        .generate(rawEvents, matchInfo.id, matchInfo)
-        .flatMap(FootballMatchEvent.fromPaMatchEvent(matchInfo.homeTeam, matchInfo.awayTeam)(_))
-    def dismissals = allEvents.collect { case d: Dismissal => d }
-  }
 }

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

@@ -150,14 +150,15 @@ object FcmPayloadBuilder {
         Keys.Importance -> n.importance.toString,
         Keys.MatchStatus -> n.matchStatus,
         Keys.MatchId -> n.matchId,
-        Keys.MatchInfoUri -> n.matchInfoUri.toString,
-        Keys.HomeTeamRedCards -> n.homeTeamRedCards.toString,
-        Keys.AwayTeamRedCards -> n.awayTeamRedCards.toString
+        Keys.MatchInfoUri -> n.matchInfoUri.toString
       ) ++ n.articleUri.map(Keys.ArticleUri -> _.toString).toMap
         ++ n.competitionName.map(Keys.CompetitionName -> _).toMap
         ++ n.venue.map(Keys.Venue -> _).toMap
         ++ n.roundName.map(Keys.RoundName -> _).toMap
+        ++ Some(Keys.HomeTeamRedCards -> n.homeTeamRedCards.toString).toMap
+        ++ Some(Keys.AwayTeamRedCards -> n.awayTeamRedCards.toString).toMap
         ++ n.detailedMatchStatus.map(Keys.DetailedMatchStatus -> _).toMap
+        ++ n.lineupsAvailable.map(v => Keys.LineupsAvailable -> v.toString).toMap
         ++ n.kickOffTimestamp.map(Keys.KickOffTimestamp -> _.toString).toMap
         ++ n.homeTeamPenalties.map(p => Map(
           Keys.HomeTeamPenaltiesScored -> p.scored.toString,

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

@@ -37,6 +37,9 @@ class FcmPayloadBuilderSpec extends Specification with Matchers {
     "generate correct data for US Elections notification" in new UsElectionNotificationScope {
       check()
     }
+    "generate correct data for Penalty Shootout notification" in new PenaltyShootoutNotificationScope {
+      check()
+    }
   }
 
   trait NotificationScope extends Scope {
@@ -335,6 +338,77 @@ class FcmPayloadBuilderSpec extends Specification with Matchers {
     ))
   }
 
+  trait PenaltyShootoutNotificationScope extends NotificationScope {
+    val notification = models.FootballPenaltyShootoutNotification(
+      id = UUID.fromString("4c261110-4672-4451-a5b8-3422c6839c42"),
+      title = Some("Penalty Kick"),
+      message = Some("Netherlands 2-2 Argentina (PT)"),
+      sender = "UnitTests",
+      importance = Major,
+      topic = List(Topic(`type` = Breaking, name = "uk")),
+      awayTeamName = "Argentina",
+      awayTeamScore = 2,
+      awayTeamMessage = "Messi 73'",
+      awayTeamId = "965",
+      awayTeamRedCards = 0,
+      awayTeamPenalties = Some(models.PenaltyScore(scored = 2, missed = 0, saved = 1)),
+      homeTeamName = "Netherlands",
+      homeTeamScore = 2,
+      homeTeamMessage = "Weghorst 83'",
+      homeTeamId = "631",
+      homeTeamRedCards = 1,
+      homeTeamPenalties = Some(models.PenaltyScore(scored = 3, missed = 1, saved = 0)),
+      competitionName = Some("World Cup"),
+      venue = Some("Lusail"),
+      matchId = "4356015",
+      matchInfoUri = new URI("https://some.invalid.url/detail"),
+      articleUri = Some(new URI("https://some.other.invalid.url/detail")),
+      matchStatus = "PT",
+      eventId = "2",
+      kickOffTimestamp = Some(1746619200L),
+      lineupsAvailable = Some(true),
+      detailedMatchStatus = Some("PENALTIES"),
+      debug = true,
+      dryRun = None
+    )
+
+    val expected = Some(
+      FirebaseAndroidNotification(
+        notificationId = UUID.fromString("4c261110-4672-4451-a5b8-3422c6839c42"),
+        data = Map(
+          Keys.Type -> MessageTypes.FootballPenaltyShootout,
+          "homeTeamName" -> "Netherlands",
+          "homeTeamId" -> "631",
+          "homeTeamScore" -> "2",
+          "homeTeamText" -> "Weghorst 83'",
+          "awayTeamName" -> "Argentina",
+          "awayTeamId" -> "965",
+          "awayTeamScore" -> "2",
+          "awayTeamText" -> "Messi 73'",
+          "importance" -> "Major",
+          "matchStatus" -> "PT",
+          "matchId" -> "4356015",
+          "matchInfoUri" -> "https://some.invalid.url/detail",
+          "articleUri" -> "https://some.other.invalid.url/detail",
+          "competitionName" -> "World Cup",
+          "venue" -> "Lusail",
+          "homeTeamRedCards" -> "1",
+          "awayTeamRedCards" -> "0",
+          Keys.KickOffTimestamp -> "1746619200",
+          Keys.LineupsAvailable -> "true",
+          Keys.DetailedMatchStatus -> "PENALTIES",
+          Keys.HomeTeamPenaltiesScored -> "3",
+          Keys.HomeTeamPenaltiesMissed -> "1",
+          Keys.HomeTeamPenaltiesSaved -> "0",
+          Keys.AwayTeamPenaltiesScored -> "2",
+          Keys.AwayTeamPenaltiesMissed -> "0",
+          Keys.AwayTeamPenaltiesSaved -> "1"
+        ),
+        ttl = TimeToLive.FootballMatchStatusTtl
+      )
+    )
+  }
+
   trait UsElectionNotificationScope extends NotificationScope {
     val notification = models.Us2020ResultsNotification(
       id = UUID.fromString("3e0bc788-a27c-4864-bb71-77a80aadcce4"),