diff --git a/common/app/common/Edition.scala b/common/app/common/Edition.scala index 5d83c82aa57c..d6af407c3745 100644 --- a/common/app/common/Edition.scala +++ b/common/app/common/Edition.scala @@ -38,7 +38,6 @@ abstract class Edition( val homePagePath: String = s"/$networkFrontId" def isEditionalised(sectionId: String): Boolean = editionalisedSections.contains(sectionId) - def matchesCookie(cookieValue: String): Boolean = id.equalsIgnoreCase(cookieValue) def timezoneId = ZoneId.of(timezone.getID) } @@ -82,8 +81,8 @@ object Edition { } def apply(request: RequestHeader): Edition = { - val cookieValue = editionFromRequest(request) - allEditions.find(_.matchesCookie(cookieValue)).getOrElse(defaultEdition) + val edition = editionFromRequest(request) + allEditions.find(_.id.equalsIgnoreCase(edition)).getOrElse(defaultEdition) } def others(implicit request: RequestHeader): Seq[Edition] = { diff --git a/common/app/contentapi/ContentApiClient.scala b/common/app/contentapi/ContentApiClient.scala index 227d0baebe6a..4233d2aac84f 100644 --- a/common/app/contentapi/ContentApiClient.scala +++ b/common/app/contentapi/ContentApiClient.scala @@ -76,7 +76,7 @@ trait ApiQueryDefaults extends GuLogging { def item(id: String): ItemQuery = CapiContentApiClient.item(id) - def item(id: String, edition: Edition): ItemQuery = item(id, edition.id) + def item(id: String, edition: Edition): ItemQuery = item(id, EditionIdCAPIMapper.mapEditionId(edition)) //Strip unnecessary leading slash in path, as this affects signing of IAM requests def item(id: String, edition: String): ItemQuery = @@ -194,3 +194,15 @@ class PreviewContentApi(httpClient: HttpClient)(implicit executionContext: Execu apiKey = contentApi.key.getOrElse(""), ) } + +object EditionIdCAPIMapper { + def mapEditionId(edition: Edition): String = { + edition match { + case editions.Uk => "UK" + case editions.Us => "US" + case editions.Au => "AU" + case editions.International => "INTERNATIONAL" + case editions.Europe => "EUROPE" + } + } +} diff --git a/data/database/7177dff2011f02f1a411feeed50467e712588ceec08d5a8a333236050ee5f2e1 b/data/database/7177dff2011f02f1a411feeed50467e712588ceec08d5a8a333236050ee5f2e1 new file mode 100644 index 000000000000..895ca1b6dbaa Binary files /dev/null and b/data/database/7177dff2011f02f1a411feeed50467e712588ceec08d5a8a333236050ee5f2e1 differ