Update dcar endpoint for assets

Author: marjisound

applications/app/controllers/ApplicationsControllers.scala

@@ -18,6 +18,7 @@ trait ApplicationsControllers {
 
   lazy val remoteRender = wire[renderers.DotcomRenderingService]
   lazy val siteMapController = wire[SiteMapController]
+  lazy val dCARAssetsController = wire[DCARAssetsController]
   lazy val crosswordPageController = wire[CrosswordPageController]
   lazy val crosswordSearchController = wire[CrosswordSearchController]
   lazy val crosswordEditionsController = wire[CrosswordEditionsController]

applications/app/controllers/DCARAssetsController.scala

@@ -0,0 +1,17 @@
+package controllers
+
+import play.api.libs.ws.WSClient
+import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
+import renderers.DotcomRenderingService
+
+class DCARAssetsController(
+    wsClient: WSClient,
+    val controllerComponents: ControllerComponents,
+    remoteRenderer: renderers.DotcomRenderingService = DotcomRenderingService(),
+) extends BaseController {
+  def renderAsset(): Action[AnyContent] = {
+    Action.async { implicit request =>
+      remoteRenderer.getDCARAssets(wsClient, "/assets/rendered-items-assets")
+    }
+  }
+}

applications/app/controllers/InteractiveController.scala

@@ -34,12 +34,6 @@ class InteractiveController(
 
   val capiLookup: CAPILookup = new CAPILookup(contentApiClient)
 
-  def renderAsset(): Action[AnyContent] = {
-    Action.async { implicit request =>
-      remoteRenderer.getRenderedItemsAsset(wsClient, "/assets/rendered-items-assets.html")
-    }
-  }
-
   def renderInteractiveJson(path: String): Action[AnyContent] = renderInteractive(path)
   def renderInteractive(path: String): Action[AnyContent] = Action.async { implicit request => renderItem(path) }
 

applications/conf/routes

@@ -1,12 +1,14 @@
 # Routes
 # This file defines all application routes (Higher priority routes first)
 # ~~~~
-GET /app-assets/rendered-items-assets  controllers.InteractiveController.renderAsset()
+
 # For dev machines
 GET         /assets/*path                                                       dev.DevAssetsController.at(path)
 
 GET        /_healthcheck                                                        controllers.HealthCheck.healthCheck()
 
+GET        /dcar-assets/rendered-items-assets                                   controllers.DCARAssetsController.renderAsset()
+
 GET        /sitemaps/news.xml                                                   controllers.SiteMapController.renderNewsSiteMap()
 GET        /sitemaps/video.xml                                                  controllers.SiteMapController.renderVideoSiteMap()
 

common/app/model/Cached.scala

@@ -32,6 +32,7 @@ object CacheTime {
   object FootballMatch extends CacheTime(30)
   object Cricket extends CacheTime(60)
   object FootballTables extends CacheTime(60)
+  object DCARAssets extends CacheTime(10)
   private def oldArticleCacheTime = if (ShorterSurrogateCacheForOlderArticles.isSwitchedOn) 60 else longCacheTime
   def LastDayUpdated = CacheTime(60, Some(oldArticleCacheTime))
   def NotRecentlyUpdated = CacheTime(60, Some(oldArticleCacheTime))

common/app/renderers/DotcomRenderingService.scala

@@ -157,31 +157,26 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
   )(implicit request: RequestHeader): Future[Result] =
     baseArticleRequest("/AMPArticle", ws, page, blocks, pageType, filterKeyEvents, false, newsletter)
 
-  def getRenderedItemsAsset(ws: WSClient, path: String)(implicit request: RequestHeader): Future[Result] = {
-    val dcrRequest = ws
+  def getDCARAssets(ws: WSClient, path: String)(implicit request: RequestHeader): Future[Result] = {
+    ws
       .url(Configuration.rendering.articleBaseURL + path)
       .withRequestTimeout(Configuration.rendering.timeout)
-      .addHttpHeaders("Content-Type" -> "application/json")
-
-    def handler(response: WSResponse): Result = {
-      response.status match {
-        case 200 =>
-          Cached(CacheTime.Default)(RevalidatableResult.Ok(Html(response.body)))
-            .withHeaders("X-GU-Dotcomponents" -> "true")
-        case _ =>
-          log.error(
-            s"Request to DCR asset failed: status ${response.status}, path: ${request.path}, body: ${response.body}",
-          )
-          NoCache(
-            InternalServerError("Remote renderer error (500)")
-              .withHeaders("X-GU-Dotcomponents" -> "true"),
-          )
+      .get()
+      .map { response =>
+        response.status match {
+          case 200 =>
+            Cached(CacheTime.DCARAssets)(RevalidatableResult.Ok(Html(response.body)))
+              .withHeaders("X-GU-Dotcomponents" -> "true")
+          case _ =>
+            log.error(
+              s"Request to DCR assets failed: status ${response.status}, path: ${request.path}",
+            )
+            NoCache(
+              InternalServerError("Remote renderer error (500)")
+                .withHeaders("X-GU-Dotcomponents" -> "true"),
+            )
+        }
       }
-    }
-
-    val response = dcrRequest.get()
-
-    response.map(handler)
   }
 
   def getAppsArticle(