From be25a2598ba9a242117b214f67b8ba2f43c28377 Mon Sep 17 00:00:00 2001 From: Marjan Kalanaki <15894063+marjisound@users.noreply.github.com> Date: Fri, 3 Jul 2026 14:19:10 +0100 Subject: [PATCH 1/3] Upgrade content-atom-model version --- project/BuildVars.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/BuildVars.scala b/project/BuildVars.scala index f003701..703b6b9 100644 --- a/project/BuildVars.scala +++ b/project/BuildVars.scala @@ -2,7 +2,7 @@ import sbt._ object BuildVars { lazy val awsVersion = "1.12.680" - lazy val contentAtomVersion = "12.0.1" + lazy val contentAtomVersion = "12.1.0-PREVIEW.add-new-atom-for-match-day.2026-06-29T0857.762a6566" lazy val scroogeVersion = "22.1.0" lazy val playVersion = "3.0.10" lazy val mockitoVersion = "4.11.0" From a61ec7bf95b8dec96c51635e8c19aaafca850082 Mon Sep 17 00:00:00 2001 From: Marjan Kalanaki <15894063+marjisound@users.noreply.github.com> Date: Tue, 7 Jul 2026 18:01:26 +0100 Subject: [PATCH 2/3] Update json support --- .../src/main/scala/com/gu/atom/util/JsonSupport.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atom-publisher-lib/src/main/scala/com/gu/atom/util/JsonSupport.scala b/atom-publisher-lib/src/main/scala/com/gu/atom/util/JsonSupport.scala index d9132e9..b6b2d9e 100644 --- a/atom-publisher-lib/src/main/scala/com/gu/atom/util/JsonSupport.scala +++ b/atom-publisher-lib/src/main/scala/com/gu/atom/util/JsonSupport.scala @@ -67,7 +67,7 @@ object JsonSupport { val nestedDataFieldName = atomType.toLowerCase //Special case for commonsDivision because the scrooge enum value loses the casing - if (data(nestedDataFieldName).nonEmpty || nestedDataFieldName == "commonsdivision") c.value + if (data(nestedDataFieldName).nonEmpty || nestedDataFieldName == "commonsdivision" || nestedDataFieldName == "footballcompetition") c.value else { //Add the union type name under `data` val newData = JsonObject.fromIterable(Seq(nestedDataFieldName -> dataJson)) From 3d5b08576318afd504e2eeb58e8ebffaed779c07 Mon Sep 17 00:00:00 2001 From: Georges Lebreton Date: Thu, 16 Jul 2026 15:53:07 +0100 Subject: [PATCH 3/3] use latest preview with tempfootballcomp --- .../src/main/scala/com/gu/atom/util/JsonSupport.scala | 2 +- project/BuildVars.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atom-publisher-lib/src/main/scala/com/gu/atom/util/JsonSupport.scala b/atom-publisher-lib/src/main/scala/com/gu/atom/util/JsonSupport.scala index b6b2d9e..0834f8f 100644 --- a/atom-publisher-lib/src/main/scala/com/gu/atom/util/JsonSupport.scala +++ b/atom-publisher-lib/src/main/scala/com/gu/atom/util/JsonSupport.scala @@ -67,7 +67,7 @@ object JsonSupport { val nestedDataFieldName = atomType.toLowerCase //Special case for commonsDivision because the scrooge enum value loses the casing - if (data(nestedDataFieldName).nonEmpty || nestedDataFieldName == "commonsdivision" || nestedDataFieldName == "footballcompetition") c.value + if (data(nestedDataFieldName).nonEmpty || nestedDataFieldName == "commonsdivision" || nestedDataFieldName == "tempfootballcompetition") c.value else { //Add the union type name under `data` val newData = JsonObject.fromIterable(Seq(nestedDataFieldName -> dataJson)) diff --git a/project/BuildVars.scala b/project/BuildVars.scala index 703b6b9..4d88b2e 100644 --- a/project/BuildVars.scala +++ b/project/BuildVars.scala @@ -2,7 +2,7 @@ import sbt._ object BuildVars { lazy val awsVersion = "1.12.680" - lazy val contentAtomVersion = "12.1.0-PREVIEW.add-new-atom-for-match-day.2026-06-29T0857.762a6566" + lazy val contentAtomVersion = "12.1.0-PREVIEW.add-new-atom-for-match-day.2026-07-15T1141.302c1611" lazy val scroogeVersion = "22.1.0" lazy val playVersion = "3.0.10" lazy val mockitoVersion = "4.11.0"