Add edition targeting to liveblog top sponsorship

admin/app/dfp/DfpDataExtractor.scala

@@ -41,6 +41,7 @@ case class DfpDataExtractor(lineItems: Seq[GuLineItem], invalidLineItems: Seq[Gu
           lineItemName = lineItem.name,
           lineItemId = lineItem.id,
           adTest = lineItem.targeting.adTestValue,
+          editions = editionsTargeted(lineItem),
           sections = lineItem.liveBlogTopTargetedSections,
           targetsAdTest = lineItem.targeting.hasAdTestTargetting,
         )

admin/app/views/commercial/liveBlogTopSponsorships.scala.html

@@ -27,6 +27,7 @@ <h1>LiveBlog Top Sponsorships</h1>
         <li>Targets the <pre>culture</pre>,<pre>sport</pre> or <pre>football</pre> section</li>
         <li>Targets the <pre>liveblog</pre> content type</li>
         <li>Targets the <pre>mobile</pre> breakpoint</li>
+        <li>Targets an edition</li>
     </ol>
 
     <h2>Sponsorships</h2>
@@ -42,6 +43,7 @@ <h2>Sponsorships</h2>
                 <pre>@section</pre>@if(section != sponsorship.sections.last) {, }
             }
             @if(sponsorship.targetsAdTest) {<br /><small>Adtest:</small> <pre>@sponsorship.adTest</pre>}
+            @if(!sponsorship.editions.isEmpty) {<br /><small>Editions:</small> @for(edition <- sponsorship.editions.map(_.id)) {<pre>@edition</pre>@if(edition != sponsorship.editions.last.id) {, }}}
   </li>
         }
     }

common/app/common/configuration.scala

@@ -500,7 +500,7 @@ class GuardianConfiguration extends GuLogging {
     lazy val dfpInlineMerchandisingTagsDataKey = s"$dfpRoot/inline-merchandising-tags-v3.json"
     lazy val dfpHighMerchandisingTagsDataKey = s"$dfpRoot/high-merchandising-tags.json"
     lazy val dfpPageSkinnedAdUnitsKey = s"$dfpRoot/pageskinned-adunits-v9.json"
-    lazy val dfpLiveBlogTopSponsorshipDataKey = s"$dfpRoot/liveblog-top-sponsorships.json"
+    lazy val dfpLiveBlogTopSponsorshipDataKey = s"$dfpRoot/liveblog-top-sponsorships-v2.json"
     lazy val dfpNonRefreshableLineItemIdsKey = s"$dfpRoot/non-refreshable-lineitem-ids-v1.json"
     lazy val dfpLineItemsKey = s"$dfpRoot/lineitems-v7.json"
     lazy val dfpActiveAdUnitListKey = s"$dfpRoot/active-ad-units.csv"

common/app/common/dfp/DfpData.scala

@@ -308,7 +308,9 @@ case class GuLineItem(
 
     val isSponsorship = lineItemType == Sponsorship
 
-    isLiveblogTopSlot && isLiveblogContentType && targetsOnlyAllowedSections && isMobileBreakpoint && isSponsorship
+    val hasEditionTargeting = targeting.editions.nonEmpty
+
+    isLiveblogTopSlot && isLiveblogContentType && targetsOnlyAllowedSections && isMobileBreakpoint && isSponsorship && hasEditionTargeting
   }
 
   lazy val targetsNetworkOrSectionFrontDirectly: Boolean = {

common/app/common/dfp/LiveBlogTopSponsorshipAgent.scala

@@ -3,6 +3,7 @@ package common.dfp
 import model.Tag
 import model.ContentType
 import model.Section
+import common.Edition
 import play.api.mvc.RequestHeader
 import model.{MetaData}
 import model.DotcomContentType
@@ -12,20 +13,27 @@ trait LiveBlogTopSponsorshipAgent {
 
   protected def liveBlogTopSponsorships: Seq[LiveBlogTopSponsorship]
 
+  private[dfp] def findSponsorships(
+      edition: Edition,
+      sectionId: String,
+      adTest: Option[String],
+  ): Seq[LiveBlogTopSponsorship] = {
+    liveBlogTopSponsorships.filter { sponsorship =>
+      sponsorship.editions.contains(edition) && sponsorship.sections.contains(sectionId) && sponsorship
+        .matchesTargetedAdTest(adTest)
+    }
+  }
+
   def hasLiveBlogTopAd(metadata: MetaData, request: RequestHeader): Boolean = {
     if (
       metadata.contentType == Some(DotcomContentType.LiveBlog) && ActiveExperiments.isParticipating(
         LiveBlogTopSponsorship,
       )(request)
     ) {
       val adTest = request.getQueryString("adtest")
-      liveBlogTopSponsorships.exists { sponsorship =>
-        if (sponsorship.targetsAdTest) {
-          sponsorship.hasTargetedSection(metadata.sectionId) && sponsorship.adTest == adTest
-        } else {
-          sponsorship.hasTargetedSection(metadata.sectionId)
-        }
-      }
+      val edition = Edition(request)
+
+      findSponsorships(edition, metadata.sectionId, adTest).nonEmpty
     } else {
       false
     }

common/app/common/dfp/LiveblogTopSponsorship.scala

@@ -7,14 +7,13 @@ case class LiveBlogTopSponsorship(
     lineItemName: String,
     lineItemId: Long,
     sections: Seq[String],
+    editions: Seq[Edition],
     adTest: Option[String],
     targetsAdTest: Boolean,
 ) {
-  def hasTargetedSection(section: String): Boolean = section.isEmpty || this.sections.contains(section)
-
-  def hasTargetedAdTest(adTest: String): Boolean = this.adTest == Some(adTest)
-
-  def nonEmpty: Boolean = sections.nonEmpty
+  def matchesTargetedAdTest(adTest: Option[String]): Boolean =
+    if (this.targetsAdTest) { adTest == this.adTest }
+    else { true }
 }
 
 object LiveBlogTopSponsorship {