Merge pull request #27060 from guardian/facia-add-canonical-link

Add canonical url to the DCR rendering model for Fronts and Tag Pages
guardian · Apr 18, 2024 · 8b4c991 · 8b4c991
2 parents 67dd46d + c370b68
commit 8b4c991
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/common/app/model/dotcomrendering/DotcomFrontsRenderingDataModel.scala b/common/app/model/dotcomrendering/DotcomFrontsRenderingDataModel.scala
@@ -1,6 +1,6 @@
 package model.dotcomrendering
 
-import common.Edition
+import common.{CanonicalLink, Edition}
 import common.Maps.RichMap
 import common.commercial.EditionCommercialProperties
 import conf.Configuration
@@ -32,6 +32,7 @@ case class DotcomFrontsRenderingDataModel(
     mostShared: Option[Trail],
     deeplyRead: Option[Seq[Trail]],
     contributionsServiceUrl: String,
+    canonicalUrl: String,
 )
 
 object DotcomFrontsRenderingDataModel {
@@ -93,6 +94,7 @@ object DotcomFrontsRenderingDataModel {
       mostShared = mostShared.flatMap(ContentCard.fromApiContent).flatMap(Trail.contentCardToTrail),
       deeplyRead = deeplyRead,
       contributionsServiceUrl = Configuration.contributionsService.url,
+      canonicalUrl = CanonicalLink(request, page.metadata.webUrl),
     )
   }
 

diff --git a/common/app/model/dotcomrendering/DotcomTagPagesRenderingDataModel.scala b/common/app/model/dotcomrendering/DotcomTagPagesRenderingDataModel.scala
@@ -1,11 +1,11 @@
 package model.dotcomrendering
 
-import common.Edition
+import common.{CanonicalLink, Edition}
 import common.Maps.RichMap
 import common.commercial.EditionCommercialProperties
 import conf.Configuration
 import experiments.ActiveExperiments
-import model.{MetaData, Tags}
+import model.Tags
 import model.pressed.PressedContent
 import navigation.{FooterLinks, Nav}
 import org.joda.time.{DateTime, DateTimeZone}
@@ -34,6 +34,7 @@ case class DotcomTagPagesRenderingDataModel(
     commercialProperties: Map[String, EditionCommercialProperties],
     pageFooter: PageFooter,
     isAdFreeUser: Boolean,
+    canonicalUrl: String,
 )
 
 object DotcomTagPagesRenderingDataModel {
@@ -60,6 +61,7 @@ object DotcomTagPagesRenderingDataModel {
         "commercialProperties" -> model.commercialProperties,
         "pageFooter" -> model.pageFooter,
         "isAdFreeUser" -> model.isAdFreeUser,
+        "canonicalUrl" -> model.canonicalUrl,
       )
     }
   }
@@ -123,6 +125,7 @@ object DotcomTagPagesRenderingDataModel {
       commercialProperties = commercialProperties,
       pageFooter = PageFooter(FooterLinks.getFooterByEdition(Edition(request))),
       isAdFreeUser = views.support.Commercial.isAdFree(request),
+      canonicalUrl = CanonicalLink(request, page.metadata.webUrl),
     )
   }