add nation to competition summary model

guardian · Dec 20, 2024 · 6a7bd3b · 6a7bd3b
1 parent 7998a82
commit 6a7bd3b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/sport/app/football/controllers/MatchListController.scala b/sport/app/football/controllers/MatchListController.scala
@@ -36,17 +36,18 @@ trait MatchListController extends BaseController with Requests {
           pageType = matchesList.pageType,
           matchesList = DotcomRenderingFootballDataModel.getMatchesList(matchesList.matchesGroupedByDateAndCompetition),
           nextPage = matchesList.nextPage,
+          previousPage = matchesList.previousPage,
         )
 
         JsonComponent.fromWritable(model)
-      } else if (request.isJson) {
+      } else if (request.isJson)
         JsonComponent(
           "html" -> football.views.html.matchList.matchesComponent(matchesList),
           "next" -> Html(matchesList.nextPage.getOrElse("")),
           "previous" -> Html(matchesList.previousPage.getOrElse("")),
           "atom" -> atom.isDefined,
         )
-      } else
+      else
         RevalidatableResult.Ok(football.views.html.matchList.matchesPage(page, matchesList, filters, atom))
     }
   }

diff --git a/sport/app/football/model/DotcomRenderingFootballDataModel.scala b/sport/app/football/model/DotcomRenderingFootballDataModel.scala
@@ -31,6 +31,7 @@ case class DotcomRenderingFootballDataModel(
     pageType: String,
     matchesList: Seq[MatchesByDateAndCompetition],
     nextPage: Option[String],
+    previousPage: Option[String],
 )
 
 object DotcomRenderingFootballDataModel {
@@ -96,14 +97,14 @@ object DotcomRenderingFootballDataModelImplicits {
   implicit val leagueTeamWrites: Writes[LeagueTeam] = Json.writes[LeagueTeam]
   implicit val leagueTableEntryWrites: Writes[LeagueTableEntry] = Json.writes[LeagueTableEntry]
 
-  implicit val competitionFormat: Writes[CompetitionSummary] = new Writes[CompetitionSummary] {
-    def writes(competition: CompetitionSummary): JsValue = Json.obj(
+  implicit val competitionFormat: Writes[CompetitionSummary] = (competition: CompetitionSummary) =>
+    Json.obj(
       "id" -> competition.id,
       "url" -> competition.url,
       "fullName" -> competition.fullName,
       "shortName" -> competition.shortName,
+      "nation" -> competition.nation,
     )
-  }
   implicit val competitionMatchesFormat: Writes[CompetitionMatches] = Json.writes[CompetitionMatches]
   implicit val dateCompetitionMatchesFormat: Writes[MatchesByDateAndCompetition] =
     Json.writes[MatchesByDateAndCompetition]

diff --git a/sport/app/football/model/model.scala b/sport/app/football/model/model.scala
@@ -11,6 +11,7 @@ trait CompetitionSummary {
   def url: String
   def fullName: String
   def shortName: String
+  def nation: String
 }
 
 /** @param tableDividers