Moving breaking-news to onward

I made a lot of mistakes when creating the breaking-news feature, from the
internal design choices (using AkkaActor for instance) to the location of
the endpoint (in admin-jobs)
Ideally we would need to refactor the breaking-news feature but this
patch is only addressing the location issue.
Breaking-news has nothing to do in admin-jobs. This patch is moving it
in onward, even though it might not be the best place for the POST /news-alers/alert endpoint, at least it is logical to have the GET /news-alert endpoint in onward (and because of the bad design choice we cannot simply break the 2 endpoints into 2 different apps)

dev-build/app/AppLoader.scala

@@ -36,7 +36,6 @@ class AppLoader extends FrontendApplicationLoader {
 
 trait Controllers
   extends AdminControllers
-  with AdminJobsControllers
   with ApplicationsControllers
   with ArticleControllers
   with CommercialControllers
@@ -65,7 +64,6 @@ trait AppComponents
   with SportServices
   with CommercialServices
   with DiscussionServices
-  with AdminJobsServices
   with OnwardServices
   with FapiServices
   with ApplicationsServices {

docs/02-architecture/01-applications-architecture.md

@@ -122,14 +122,11 @@ Admin app hosts a set of dashboards and tools used by Guardian developers to mon
 
 [All supported routes](https://github.com/guardian/frontend/blob/master/admin/conf/routes)
 
-# Admin-jobs
-Admin-jobs app has currently two endpoints to:
-
 - Create breaking-news alerts
 
 - [Get all breaking-news alert](http://api.nextgen.guardianapps.co.uk/news-alert/alerts)
 
-[All supported routes](https://github.com/guardian/frontend/blob/master/admin-jobs/conf/routes)
+[All supported routes](https://github.com/guardian/frontend/blob/master/sport/conf/routes)
 
 # Archive
 In case none of the other apps can serve a given request, it is finally passed to the Archive app which checks if there is any redirect setup for this url or any old static content attached to it.

onward/app/AppLoader.scala

@@ -19,6 +19,7 @@ import play.api.routing.Router
 import play.api.libs.ws.WSClient
 import router.Routes
 import services.OphanApi
+import services.breakingnews.{BreakingNewsApi, S3BreakingNews}
 import weather.WeatherApi
 
 class AppLoader extends FrontendApplicationLoader {
@@ -43,6 +44,8 @@ trait OnwardServices {
   lazy val mostViewedAudioAgent = wire[MostViewedAudioAgent]
   lazy val mostViewedGalleryAgent = wire[MostViewedGalleryAgent]
   lazy val mostViewedVideoAgent = wire[MostViewedVideoAgent]
+  lazy val s3BreakingNews = wire[S3BreakingNews]
+  lazy val breakingNewsApi = wire[BreakingNewsApi]
 }
 
 trait AppComponents extends FrontendComponents with OnwardControllers with OnwardServices {

admin-jobs/app/authentication/AuthenticationSupport.scala → onward/app/authentication/AuthenticationSupport.scala

@@ -1,6 +1,6 @@
 package authentication
 
-import play.api.mvc.{Result, Results, Request, ActionBuilder}
+import play.api.mvc.{ActionBuilder, Request, Result, Results}
 
 import scala.concurrent.Future
 

admin-jobs/app/controllers/NewsAlertController.scala → onward/app/controllers/NewsAlertController.scala

@@ -6,13 +6,13 @@ import akka.util.Timeout
 import authentication.AuthenticationSupport
 import common.ExecutionContexts
 import conf.Configuration
-import controllers.BreakingNews.{BreakingNewsApi, BreakingNewsUpdater, GetAlertsRequest, NewNotificationRequest}
 import model.Cached.RevalidatableResult
-import model.{Cors, Cached}
+import model.{Cached, Cors}
 import models.NewsAlertNotification
 import play.api.libs.json.{JsValue, Json}
 import play.api.mvc.BodyParsers.parse.{json => BodyJson}
 import play.api.mvc._
+import services.breakingnews._
 
 import scala.concurrent.duration._
 

onward/app/controllers/OnwardControllers.scala

@@ -1,12 +1,14 @@
 package controllers
 
+import akka.actor.ActorSystem
 import com.softwaremill.macwire._
 import weather.controllers.{LocationsController, WeatherController}
 import business.StocksData
 import contentapi.ContentApiClient
 import feed._
 import model.ApplicationContext
 import play.api.libs.ws.WSClient
+import services.breakingnews.BreakingNewsApi
 import weather.WeatherApi
 
 trait OnwardControllers {
@@ -24,6 +26,8 @@ trait OnwardControllers {
   def mostViewedVideoAgent: MostViewedVideoAgent
   def mostViewedGalleryAgent: MostViewedGalleryAgent
   def mostViewedAudioAgent: MostViewedAudioAgent
+  def breakingNewsApi: BreakingNewsApi
+  def actorSystem: ActorSystem
 
   lazy val navigationController = wire[NavigationController]
   lazy val weatherController = wire[WeatherController]
@@ -47,4 +51,6 @@ trait OnwardControllers {
   lazy val seriesController = wire[SeriesController]
   lazy val stocksController = wire[StocksController]
   lazy val techFeedbackController = wire[TechFeedbackController]
+  lazy val newsAlertController = wire[NewsAlertController]
+
 }

admin-jobs/app/models/BreakingNews.scala → onward/app/models/BreakingNews.scala

@@ -2,6 +2,7 @@ package models
 
 import java.net.URI
 import java.util.UUID
+
 import org.joda.time.DateTime
 import play.api.libs.functional.syntax._
 import play.api.libs.json._

admin-jobs/app/models/NewsAlertNotification.scala → onward/app/models/NewsAlertNotification.scala

@@ -2,11 +2,9 @@ package models
 
 import java.net.URI
 import java.util.UUID
-
 import org.joda.time.DateTime
 import org.joda.time.format.ISODateTimeFormat
 import play.api.libs.json._
-
 import scala.util.{Failure, Success, Try}
 
 case class NewsAlertNotification(uid: UUID,

admin-jobs/app/models/NewsAlertType.scala → onward/app/models/NewsAlertType.scala

@@ -2,8 +2,6 @@ package models
 
 import play.api.libs.json._
 
-import scala.util.{Failure, Success, Try}
-
 
 sealed trait NewsAlertType
 object NewsAlertTypes {

admin-jobs/app/controllers/BreakingNews/BreakingNewsApi.scala → onward/app/services/breakingnews/BreakingNewsApi.scala

@@ -1,10 +1,10 @@
-package controllers.BreakingNews
+package services.breakingnews
 
 import common.{ExecutionContexts, Logging}
 import conf.Configuration
 import play.api.libs.json._
-import services.S3
 import play.api.{Environment, Mode}
+import services.S3
 
 class S3BreakingNews(environment: Environment) extends S3 {
   override lazy val bucket = Configuration.aws.bucket

admin-jobs/app/controllers/BreakingNews/BreakingNewsUpdater.scala → onward/app/services/breakingnews/BreakingNewsUpdater.scala

@@ -1,4 +1,4 @@
-package controllers.BreakingNews
+package services.breakingnews
 
 import akka.actor.Status.{Failure => ActorFailure}
 import akka.actor.{Actor, Props}

onward/conf/routes

@@ -78,3 +78,7 @@ GET        /most-read-mf2.json                        controllers.MostPopularCon
 GET        /related-mf2/*path.json                    controllers.RelatedController.renderMf2(path)
 GET        /series-mf2/*path.json                     controllers.SeriesController.renderMf2SeriesStories(path)
 GET        /editionalised-nav.json                    controllers.NavigationController.renderAmpNav()
+
+## Breaking-news
+GET     /news-alert/alerts                            controllers.NewsAlertController.alerts()
+POST    /news-alert/alert                             controllers.NewsAlertController.create()

admin-jobs/test/controllers/NewsAlertControllerTest.scala → onward/test/controllers/NewsAlertControllerTest.scala

@@ -6,13 +6,13 @@ import java.util.UUID
 import akka.actor.Status.{Failure => ActorFailure}
 import akka.actor.{Actor, ActorSystem, Props}
 import akka.stream.Materializer
-import controllers.BreakingNews.{BreakingNewsApi, S3BreakingNews}
 import models.{NewsAlertNotification, NewsAlertTypes}
 import org.joda.time.DateTime
 import org.scalatest.{DoNotDiscover, Matchers, WordSpec}
 import play.api.libs.json.Json
 import play.api.test.FakeRequest
 import play.api.test.Helpers._
+import services.breakingnews.{BreakingNewsApi, S3BreakingNews}
 import test.{ConfiguredTestSuite, WithTestContext}
 
 @DoNotDiscover class NewsAlertControllerTest

admin-jobs/test/models/NewsAlertNotificationTest.scala → onward/test/models/NewsAlertNotificationTest.scala

@@ -1,6 +1,8 @@
 package models
+
 import java.net.URI
 import java.util.UUID
+
 import org.joda.time.DateTime
 import org.scalatest.{FlatSpec, Matchers}
 import play.api.libs.json.Json

onward/test/package.scala

@@ -1,6 +1,8 @@
 package test
 
+import controllers._
 import org.scalatest.Suites
+import services.breakingnews.{BreakingNewsApiTest, BreakingNewsUpdaterTest}
 
 class OnwardTestSuite extends Suites (
   new controllers.ChangeEditionControllerTest,
@@ -14,7 +16,10 @@ class OnwardTestSuite extends Suites (
   new TopStoriesControllerTest,
   new VideoInSectionTest,
   new RichLinkControllerTest,
-  new NavigationControllerTest
+  new NavigationControllerTest,
+  new BreakingNewsApiTest,
+  new BreakingNewsUpdaterTest,
+  new NewsAlertControllerTest
 ) with SingleServerSuite {
   override lazy val port: Int = 19011
 }

admin-jobs/test/controllers/BreakingNews/BreakingNewsApiTest.scala → onward/test/services/breakingnews/BreakingNewsApiTest.scala

@@ -1,4 +1,4 @@
-package controllers.BreakingNews
+package services.breakingnews
 
 import common.ExecutionContexts
 import org.joda.time.DateTime

admin-jobs/test/controllers/BreakingNews/BreakingNewsUpdaterTest.scala → onward/test/services/breakingnews/BreakingNewsUpdaterTest.scala

@@ -1,4 +1,4 @@
-package controllers.BreakingNews
+package services.breakingnews
 
 import java.net.URI
 import java.util.UUID