Pattern match on specialReportAlt campaign id in CardStylePicker

And remove unused parameter
guardian · Oct 31, 2022 · 9f8904f · 9f8904f
1 parent ec7b2ec
commit 9f8904f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/common/app/model/CardStylePicker.scala b/common/app/model/CardStylePicker.scala
@@ -13,7 +13,7 @@ object CardStylePicker {
     val tags = content.tags.map(_.id).toSeq
     extractCampaigns(tags) match {
       case Nil => CardStyle(content, TrailMetaData.empty)
-//      case campaign:: _ => if(campaign.id.toString == "campaign id") SpecialReportAlt else SpecialReport
+      case campaign:: _ => if(campaign.id.toString.toLowerCase() == "specialReportAlt") SpecialReportAlt else SpecialReport
       case _   => SpecialReport
     }
   }
@@ -22,7 +22,7 @@ object CardStylePicker {
     val tags = FaciaContentUtils.tags(content).map(_.id)
     extractCampaigns(tags) match {
       case Nil => FaciaContentUtils.cardStyle(content)
-//      case campaign:: _ => if(campaign.id.toString == "campaign id") SpecialReportAlt else SpecialReport
+      case campaign:: _ => if(campaign.id.toString.toLowerCase() == "specialReportAlt") SpecialReportAlt else SpecialReport
       case _   => SpecialReport
     }
   }

diff --git a/common/app/model/content.scala b/common/app/model/content.scala
@@ -416,7 +416,7 @@ object Content {
     val apifields = apiContent.fields
     val references: Map[String, String] =
       apiContent.references.map(ref => (ref.`type`, Reference.split(ref.id)._2)).toMap
-    val cardStyle: fapiutils.CardStyle = CardStylePicker(apiContent, TrailMetaData.empty)
+    val cardStyle: fapiutils.CardStyle = CardStylePicker(apiContent)
 
     Content(
       trail = trail,

diff --git a/common/app/services/FaciaContentConvert.scala b/common/app/services/FaciaContentConvert.scala
@@ -13,7 +13,7 @@ object FaciaContentConvert {
   def contentToFaciaContent(content: Content): PressedContent = {
     val frontendContent = model.Content(content)
     val trailMetaData = TrailMetaData.empty
-    val cardStyle = CardStylePicker(content, trailMetaData)
+    val cardStyle = CardStylePicker(content)
     val resolvedMetaData = ResolvedMetaData.fromContentAndTrailMetaData(content, trailMetaData, cardStyle)
 
     val curated = fapi.CuratedContent(