FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Remove top below nav slot · devhttps/frontend@144d0e6 · GitHub

/ frontend Public
forked from guardian/frontend

Commit 144d0e6

Browse files
Regis Kuckaertz
committed
Remove top below nav slot
1 parent 6478569 commit 144d0e6

16 files changed

Lines changed: 5 additions & 122 deletions

File tree

‎admin/app/controllers/admin/commercial/SlotController.scala‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ class SlotController extends Controller {
1818
Ok(views.html.commercial.slotTop(environment.stage, report))
1919
case "top-above-nav" =>
2020
Ok(views.html.commercial.slotTopAboveNav(environment.stage, report))
21-
case "top-below-nav" =>
22-
Ok(views.html.commercial.slotTopBelowNav(environment.stage, report))
2321
case _ => InternalServerError("Missing template")
2422
}
2523
maybeResult getOrElse Ok("No data available.")

‎admin/app/dfp/DfpDataCacheJob.scala‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,6 @@ object DfpDataCacheJob extends ExecutionContexts with Logging {
177177

178178
Store.putTopAboveNavSlotTakeovers(stringify(toJson(LineItemReport(now,
179179
data.topAboveNavSlotTakeovers))))
180-
Store.putTopBelowNavSlotTakeovers(stringify(toJson(LineItemReport(now,
181-
data.topBelowNavSlotTakeovers))))
182180
Store.putTopSlotTakeovers(stringify(toJson(LineItemReport(now, data.topSlotTakeovers))))
183181
}
184182
}

‎admin/app/dfp/DfpDataExtractor.scala‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ case class DfpDataExtractor(lineItems: Seq[GuLineItem]) {
5757
lineItems filter (_.isSuitableForTopAboveNavSlot)
5858
}
5959

60-
val topBelowNavSlotTakeovers: Seq[GuLineItem] = dateSort {
61-
lineItems filter (_.isSuitableForTopBelowNavSlot)
62-
}
63-
6460
val topSlotTakeovers = dateSort {
6561
lineItems filter (_.isSuitableForTopSlot)
6662
}

‎admin/app/tools/Store.scala‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ trait Store extends Logging with Dates {
4646
def putTopAboveNavSlotTakeovers(takeovers: String) {
4747
S3.putPublic(topAboveNavSlotTakeoversKey, takeovers, defaultJsonEncoding)
4848
}
49-
def putTopBelowNavSlotTakeovers(takeovers: String) {
50-
S3.putPublic(topBelowNavSlotTakeoversKey, takeovers, defaultJsonEncoding)
51-
}
5249
def putTopSlotTakeovers(takeovers: String) {
5350
S3.putPublic(topSlotTakeoversKey, takeovers, defaultJsonEncoding)
5451
}
@@ -81,7 +78,6 @@ trait Store extends Logging with Dates {
8178

8279
def getSlotTakeoversReport(slotName: String): Option[String] = slotName match {
8380
case "top-above-nav" => S3.get(topAboveNavSlotTakeoversKey)
84-
case "top-below-nav" => S3.get(topBelowNavSlotTakeoversKey)
8581
case "top" => S3.get(topSlotTakeoversKey)
8682
case _ => None
8783
}

‎admin/app/views/commercial/commercialMenu.scala.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ <h3>Layout</h3>
8282
<ul>
8383
<li><a href="@controllers.admin.commercial.routes.SlotController.viewSlot("top")">Mobile Top Slot</a></li>
8484
<li><a href="@controllers.admin.commercial.routes.SlotController.viewSlot("top-above-nav")">Desktop Top Above Nav Slot</a></li>
85-
<li><a href="@controllers.admin.commercial.routes.SlotController.viewSlot("top-below-nav")">Desktop Top Below Nav Slot</a></li>
8685
</ul>
8786
</div>
8887
</div>

‎admin/app/views/commercial/slotTopBelowNav.scala.html‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎common/app/common/configuration.scala‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ class GuardianConfiguration extends Logging {
306306
lazy val dfpTemplateCreativesKey = s"$dfpRoot/template-creatives.json"
307307
lazy val dfpCustomTargetingKey = s"$dfpRoot/custom-targeting-key-values.json"
308308
lazy val topAboveNavSlotTakeoversKey = s"$dfpRoot/top-above-nav-slot-takeovers-v1.json"
309-
lazy val topBelowNavSlotTakeoversKey = s"$dfpRoot/top-below-nav-slot-takeovers-v1.json"
310309
lazy val topSlotTakeoversKey = s"$dfpRoot/top-slot-takeovers-v1.json"
311310

312311
lazy val takeoversWithEmptyMPUsKey = s"$commercialRoot/takeovers-with-empty-mpus.json"

‎common/app/common/dfp/AdSlotAgent.scala‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -62,30 +62,6 @@ trait AdSlotAgent {
6262
lineItems flatMap (_.creativeSizes)
6363
}
6464

65-
def hasAdInTopBelowNavSlot(adUnitWithoutRoot: String, edition: Edition): Boolean = {
66-
67-
def targetsTopBelowNavSlot(lineItem: GuLineItem) = {
68-
lineItem.targeting.customTargetSets exists { targetSet =>
69-
targetSet.targets exists (_.isSlot("top-below-nav"))
70-
}
71-
}
72-
73-
def targetsEdition(lineItem: GuLineItem, edition: Edition) = {
74-
val editions = lineItem.targeting.editions
75-
editions.isEmpty || editions.contains(edition)
76-
}
77-
78-
val isFront = adUnitWithoutRoot.endsWith("/front") || adUnitWithoutRoot.endsWith("/front/ng")
79-
80-
isFront && lineItemsBySlot.getOrElse(TopBelowNavSlot, Nil).exists { lineItem =>
81-
isCurrent(lineItem) &&
82-
targetsTopBelowNavSlot(lineItem) &&
83-
targetsEdition(lineItem, edition) &&
84-
targetsAdUnit(lineItem, adUnitWithoutRoot) &&
85-
!(environmentIsProd && targetsAdTest(lineItem))
86-
}
87-
}
88-
8965
def omitMPUsFromContainers(pageId: String, edition: Edition): Boolean = {
9066

9167
def toPageId(url: String): String = new URI(url).getPath.tail
@@ -105,6 +81,4 @@ sealed abstract class AdSlot(val name: String)
10581

10682
case object TopAboveNavSlot extends AdSlot("top-above-nav")
10783

108-
case object TopBelowNavSlot extends AdSlot("top-below-nav")
109-
11084
case object TopSlot extends AdSlot("top")

‎common/app/common/dfp/DfpAgent.scala‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ object DfpAgent
155155
}
156156

157157
updateLineItems(TopAboveNavSlot, topAboveNavSlotTakeoversKey)
158-
updateLineItems(TopBelowNavSlot, topBelowNavSlotTakeoversKey)
159158
updateLineItems(TopSlot, topSlotTakeoversKey)
160159

161160
update(takeoverWithEmptyMPUsAgent)(TakeoverWithEmptyMPUs.fetch())

‎common/app/common/dfp/DfpData.scala‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,6 @@ case class GuLineItem(id: Long,
286286
(endTime.isEmpty || endTime.exists(_.isAfterNow))
287287
}
288288

289-
lazy val isSuitableForTopBelowNavSlot: Boolean = targeting.customTargetSets
290-
.exists(_.targets.exists(_.isSlot("top-below-nav")))
291-
292289
lazy val isSuitableForTopSlot: Boolean = {
293290
costType == "CPD" &&
294291
targetsNetworkOrSectionFrontDirectly &&

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL