Merge pull request #27686 from guardian/ravi/fix-podcast-media-id

Add `id` to `AudioBlockElement` to fix missing media-id for audio assets on DCR rendered podcast pages
guardian · Jan 9, 2025 · 274d330 · 274d330
2 parents 181163a + 40cde4d
commit 274d330
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/common/app/model/dotcomrendering/DotcomRenderingDataModel.scala b/common/app/model/dotcomrendering/DotcomRenderingDataModel.scala
@@ -10,7 +10,7 @@ import conf.Configuration
 import crosswords.CrosswordPageWithContent
 import experiments.ActiveExperiments
 import model.dotcomrendering.DotcomRenderingUtils._
-import model.dotcomrendering.pageElements.{ImageBlockElement, PageElement, Role, TextCleaner}
+import model.dotcomrendering.pageElements.{AudioBlockElement, ImageBlockElement, PageElement, Role, TextCleaner}
 import model.liveblog.BlockAttributes
 import model.{
   ArticleDateTimes,
@@ -544,12 +544,24 @@ object DotcomRenderingDataModel {
       )
     }
 
-    val mainMediaElements =
-      mainBlock
+    val mainMediaElements = {
+      val pageElements = mainBlock
         .map(toDCRBlock(isMainBlock = true))
         .toList
         .flatMap(_.elements)
 
+      page.metadata.contentType match {
+        case Some(DotcomContentType.Audio) =>
+          pageElements
+            .map {
+              case AudioBlockElement(assets, _) =>
+                AudioBlockElement(assets, Option(content.elements.mainAudio.head.properties.id))
+              case pageElement => pageElement
+            }
+        case _ => pageElements
+      }
+    }
+
     val bodyBlocksDCR =
       bodyBlocks
         .filter(_.published || pageType.isPreview) // TODO lift?

diff --git a/common/app/model/dotcomrendering/pageElements/PageElement.scala b/common/app/model/dotcomrendering/pageElements/PageElement.scala
@@ -120,7 +120,7 @@ object AudioAtomBlockElement {
 
 // We are currently using AudioBlockElement as a catch all for audio errors, skipping the first definition
 // See comment: 2e5ac4fd-e7f1-4c04-bdcd-ceadd2dc5d4c
-case class AudioBlockElement(assets: Seq[AudioAsset]) extends PageElement
+case class AudioBlockElement(assets: Seq[AudioAsset], id: Option[String] = None) extends PageElement
 object AudioBlockElement {
   implicit val AudioBlockElementWrites: Writes[AudioBlockElement] = Json.writes[AudioBlockElement]
 }