Do not lookup pressed fronts in S3 if front does not exist

Co-authored-by: Jamie B <[email protected]>
guardian · May 15, 2024 · 691a020 · 691a020
1 parent c917e22
commit 691a020
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/common/app/services/ConfigAgentTrait.scala b/common/app/services/ConfigAgentTrait.scala
@@ -133,6 +133,9 @@ object ConfigAgent extends GuLogging {
  def shouldServeFront(id: String)(implicit context: ApplicationContext): Boolean =
  getPathIds.contains(id) && (context.isPreview || !isFrontHidden(id))
 
+ def frontExistsInConfig(id: String)(implicit context: ApplicationContext): Boolean =
+ getPathIds.contains(id)
+
  def shouldServeEditionalisedFront(edition: Edition, id: String)(implicit context: ApplicationContext): Boolean = {
  shouldServeFront(s"${edition.id.toLowerCase}/$id")
  }

diff --git a/facia/app/controllers/FaciaController.scala b/facia/app/controllers/FaciaController.scala
@@ -135,10 +135,15 @@ trait FaciaController
  FrontHeadline.headlineNotFound
  }
 
- frontJsonFapi
- .get(path, liteRequestType)
- .map(_.fold[CacheableResult](notFound())(FrontHeadline.renderEmailHeadline))
- .map(Cached(CacheTime.Facia))
+ if (!ConfigAgent.frontExistsInConfig(path)) {
+ successful(Cached(CacheTime.Facia)(notFound()))
+ } else {
+ frontJsonFapi
+ .get(path, liteRequestType)
+ .map(_.fold[CacheableResult](notFound())(FrontHeadline.renderEmailHeadline))
+ .map(Cached(CacheTime.Facia))
+ }
+
  }
 
  def renderFront(path: String): Action[AnyContent] =
@@ -170,11 +175,17 @@ trait FaciaController
  // see https://github.com/guardian/pressreader
  def renderFrontJsonMinimal(path: String): Action[AnyContent] =
  Action.async { implicit request =>
- frontJsonFapi.get(path, liteRequestType).map { resp =>
- Cached(CacheTime.Facia)(JsonComponent.fromWritable(resp match {
- case Some(pressedPage) => FapiFrontJsonMinimal.get(pressedPage)
- case None => JsObject(Nil)
- }))
+ if (!ConfigAgent.frontExistsInConfig(path)) {
+ successful(
+ Cached(CacheTime.Facia)(JsonComponent.fromWritable(JsObject(Nil))),
+ )
+ } else {
+ frontJsonFapi.get(path, liteRequestType).map { resp =>
+ Cached(CacheTime.Facia)(JsonComponent.fromWritable(resp match {
+ case Some(pressedPage) => FapiFrontJsonMinimal.get(pressedPage)
+ case None => JsObject(Nil)
+ }))
+ }
  }
  }