Improve football match-header and match info cache time

common/app/renderers/DotcomRenderingService.scala

@@ -490,15 +490,17 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
   def getFootballMatchSummaryPage(
       ws: WSClient,
       json: JsValue,
+      cacheTime: CacheTime,
   )(implicit request: RequestHeader): Future[Result] = {
-    post(ws, json, Configuration.rendering.articleBaseURL + "/FootballMatchSummaryPage", CacheTime.FootballMatch)
+    post(ws, json, Configuration.rendering.articleBaseURL + "/FootballMatchSummaryPage", cacheTime)
   }
 
   def getAppsFootballMatchSummaryPage(
       ws: WSClient,
       json: JsValue,
+      cacheTime: CacheTime,
   )(implicit request: RequestHeader): Future[Result] = {
-    post(ws, json, Configuration.rendering.articleBaseURL + "/AppsFootballMatchSummaryPage", CacheTime.FootballMatch)
+    post(ws, json, Configuration.rendering.articleBaseURL + "/AppsFootballMatchSummaryPage", cacheTime)
   }
 
   def getCricketPage(

sport/app/football/controllers/MatchController.scala

@@ -94,6 +94,9 @@ class MatchController(
           val page: Future[MatchPage] = lineup.map(MatchPage(theMatch, _))
           val tier = FootballSummaryPagePicker.getTier()
 
+          val cacheTime =
+            if (theMatch.isAboutToStart || theMatch.isLive) CacheTime(10) else CacheTime(300)
+
           page.flatMap { page =>
             val matchStats = MatchStats.statsFromFootballMatch(theMatch, page.lineUp, theMatch.matchStatus)
 
@@ -121,9 +124,11 @@ class MatchController(
                   group = group,
                   competitionName = competitionSummary.fullName,
                 )
+
                 remoteRenderer.getFootballMatchSummaryPage(
                   wsClient,
                   DotcomRenderingFootballMatchSummaryDataModel.toJson(model),
+                  cacheTime,
                 )
 
               case AppsFormat if tier == RemoteRender =>
@@ -137,6 +142,7 @@ class MatchController(
                 remoteRenderer.getAppsFootballMatchSummaryPage(
                   wsClient,
                   DotcomRenderingFootballMatchSummaryDataModel.toJson(model),
+                  cacheTime,
                 )
 
               case _ =>

sport/app/football/controllers/MoreOnMatchController.scala

@@ -253,7 +253,7 @@ class MoreOnMatchController(
                 competitionSummary,
                 filtered,
               )
-              Cached(if (theMatch.isLive) 10 else 300)(JsonComponent.fromWritable(model))
+              Cached(if (theMatch.isAboutToStart || theMatch.isLive) 10 else 300)(JsonComponent.fromWritable(model))
             }
         }
       maybeResponse.getOrElse(Future.successful(Cached(30) { JsonNotFound() }))

sport/app/football/implicits/Football.scala

@@ -46,6 +46,13 @@ trait Football {
 
     def isOn(date: LocalDate): Boolean = m.date.toLocalDate == date
 
+    def isAboutToStart: Boolean = {
+      val now = ZonedDateTime.now()
+      val upperBound = now.plusMinutes(5)
+
+      m.date.isAfter(now) && m.date.isBefore(upperBound)
+    }
+
     // results and fixtures do not actually have a status field in the API
     lazy val matchStatus = m match {
       case f: Fixture   => "Fixture"

sport/test/football/implicits/FootballTest.scala

@@ -44,5 +44,27 @@ class FootballTest extends AnyFeatureSpec with GivenWhenThen with Matchers with
       val isMatchOnToday = todayMatch.isOn(today.toLocalDate)
       isMatchOnToday shouldBe (true)
     }
+
+    Scenario("isAboutToStart returns true if match start time is within the next 5 minutes") {
+
+      Given("a match which happens in 5 minutes")
+      val fiveMinutesFromNow = ZonedDateTime.now().plusMinutes(5)
+      val theMatch =
+        liveMatch("Aston Villa", "Cardiff", 1, 0, fiveMinutesFromNow, isLive = true)
+
+      Then("calling isAboutToStart should return true")
+      theMatch.isAboutToStart shouldBe (true)
+    }
+
+    Scenario("isAboutToStart returns false if match start time is more than 5 minutes from now") {
+
+      Given("a match starting in more than 5 minutes")
+      val fiveMinutesFromNow = ZonedDateTime.now().plusMinutes(5).plusSeconds(1)
+      val theMatch =
+        liveMatch("Aston Villa", "Cardiff", 1, 0, fiveMinutesFromNow, isLive = true)
+
+      Then("calling isAboutToStart should return fals")
+      theMatch.isAboutToStart shouldBe (false)
+    }
   }
 }