-
Notifications
You must be signed in to change notification settings - Fork 555
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #27546 from guardian/ei/fix-prebid-tables
Try adding prebid graph back in
- Loading branch information
Showing
6 changed files
with
159 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
admin/app/controllers/admin/commercial/TeamKPIController.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| package controllers.admin.commercial | ||
|
|
||
| import java.time.LocalDate | ||
|
|
||
| import common.GuLogging | ||
| import jobs.CommercialDfpReporting | ||
| import model.{ApplicationContext, NoCache} | ||
| import play.api.i18n.I18nSupport | ||
| import play.api.mvc._ | ||
| import play.twirl.api.Html | ||
| import tools.{Chart, ChartFormat, ChartRow} | ||
|
|
||
| class TeamKPIController(val controllerComponents: ControllerComponents)(implicit context: ApplicationContext) | ||
| extends BaseController | ||
| with I18nSupport | ||
| with GuLogging { | ||
|
|
||
| def renderPrebidDashboard(): Action[AnyContent] = | ||
| Action { implicit request => | ||
| case class DataPoint(date: LocalDate, bidderName: String, impressionCount: Int, eCpm: Double) | ||
|
|
||
| val (dataPoints, lastUpdated) = ( | ||
| for { | ||
| report <- CommercialDfpReporting.getCustomReport(CommercialDfpReporting.prebidBidderPerformance) | ||
| } yield { | ||
| ( | ||
| report.rows.flatMap { row => | ||
| val fields = row.fields | ||
| for { | ||
| date <- fields.lift(0).map(LocalDate.parse(_)) | ||
| customCriteria <- fields.lift(1) | ||
| impressionCount <- fields.lift(3).map(_.toInt) | ||
| eCpm <- fields.lift(4).map(_.toDouble / 1000000.0d) // convert DFP micropounds to pounds | ||
| } yield DataPoint( | ||
| date = date, | ||
| bidderName = customCriteria.stripPrefix("hb_bidder="), | ||
| impressionCount = impressionCount, | ||
| eCpm = eCpm, | ||
| ) | ||
| }, | ||
| Some(report.lastUpdated), | ||
| ) | ||
| } | ||
| ).getOrElse((Nil, None)) | ||
|
|
||
| trait BidPerformanceChart extends Chart[LocalDate] { | ||
| def formatRowKey(key: LocalDate): String = | ||
| s"new Date(${key.getYear}, ${key.getMonthValue - 1}, ${key.getDayOfMonth})" | ||
| val bidderNames = dataPoints.map(_.bidderName).distinct.sorted | ||
| def labels = "Date" +: bidderNames | ||
| def format = ChartFormat.MultiLine | ||
| } | ||
|
|
||
| val impressionChart = new BidPerformanceChart { | ||
| val name = "Number of winning bids per day" | ||
| val dataset = dataPoints | ||
| .groupBy(_.date) | ||
| .foldLeft(Seq.empty[ChartRow[LocalDate]]) { case (acc, (date, points)) => | ||
| val impressionCounts = bidderNames.foldLeft(Seq.empty[Double]) { (soFar, label) => | ||
| soFar :+ points.find(_.bidderName == label).map(_.impressionCount.toDouble).getOrElse(0d) | ||
| } | ||
| acc :+ ChartRow(date, impressionCounts) | ||
| } | ||
| .sortBy(_.rowKey.toEpochDay) | ||
| } | ||
|
|
||
| val cpmChart = new BidPerformanceChart { | ||
| val name = "Average CPM per day" | ||
| override val vAxisTitle = Some("GBP") | ||
| val dataset = dataPoints | ||
| .groupBy(_.date) | ||
| .foldLeft(Seq.empty[ChartRow[LocalDate]]) { case (acc, (date, points)) => | ||
| val cpms = bidderNames.foldLeft(Seq.empty[Double]) { (soFar, label) => | ||
| soFar :+ points.find(_.bidderName == label).map(_.eCpm).getOrElse(0d) | ||
| } | ||
| acc :+ ChartRow(date, cpms) | ||
| } | ||
| .sortBy(_.rowKey.toEpochDay) | ||
| } | ||
|
|
||
| val revenueChart = new BidPerformanceChart { | ||
| val name = "Indicative revenue per day" | ||
| override val vAxisTitle = Some("GBP") | ||
| val dataset = dataPoints | ||
| .groupBy(_.date) | ||
| .foldLeft(Seq.empty[ChartRow[LocalDate]]) { case (acc, (date, points)) => | ||
| val revenues = bidderNames.foldLeft(Seq.empty[Double]) { (soFar, label) => | ||
| soFar :+ points | ||
| .find(_.bidderName == label) | ||
| .map { point => | ||
| point.impressionCount * point.eCpm / 1000 | ||
| } | ||
| .getOrElse(0d) | ||
| } | ||
| acc :+ ChartRow(date, revenues) | ||
| } | ||
| .sortBy(_.rowKey.toEpochDay) | ||
| } | ||
|
|
||
| NoCache( | ||
| Ok( | ||
| views.html.dateLineCharts( | ||
| charts = Seq(impressionChart, cpmChart, revenueChart), | ||
| title = Some("Prebid Bidder Performance"), | ||
| description = Some( | ||
| Html( | ||
| """NB: Today's figures update every 30 minutes.<br \> | ||
| So <b>the cumulative figures for today</b> may initially appear to be falling off a cliff, but they <b>will increase</b> as the day goes on.""", | ||
| ), | ||
| ), | ||
| lastUpdated = lastUpdated, | ||
| ), | ||
| ), | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| @import java.time.LocalDateTime | ||
| @import java.time.format.DateTimeFormatter.ofPattern | ||
| @(charts: Seq[tools.Chart[java.time.LocalDate]], title: Option[String] = None, description: Option[Html] = None, lastUpdated: Option[LocalDateTime])(implicit request: RequestHeader, context: model.ApplicationContext) | ||
|
|
||
| @admin_main(title.getOrElse("Dashboard"), isAuthed = true, hasCharts = true) { | ||
|
|
||
| @title.map{ t => | ||
| <h3>@t</h3> | ||
| } | ||
|
|
||
| @lastUpdated.map{ updated => | ||
| <p>Last updated @updated.format(ofPattern("d MMMM HH:mm"))</p> | ||
| } | ||
|
|
||
| @description.map { d => | ||
| <div class="alert alert-info">@d</div> | ||
| } | ||
|
|
||
| @* some servers have no data *@ | ||
| @defining(charts.filterNot(_.hasData).map(_.name).mkString(", ")){ noData => | ||
| @if(noData.nonEmpty){ | ||
| <p>No data for: <strong>@noData</strong></p> | ||
| } | ||
| } | ||
|
|
||
| @charts.filter(_.hasData).map{ chart => @fragments.dateLineChart(chart) } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters