Use Circe's deepDropNullValues instead of withoutNull (#27673)

`DotcomRenderingUtils.withoutNull` is not recursive, therefore nested `null` fields make it through to DCAR, causing validation errors.
guardian · Dec 13, 2024 · 95dea82 · 95dea82
1 parent 9c8a254
commit 95dea82
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala b/common/app/model/dotcomrendering/pageElements/EditionsCrosswordRenderingDataModel.scala
@@ -27,9 +27,7 @@ object EditionsCrosswordRenderingDataModel {
     }))
 
   def toJson(model: EditionsCrosswordRenderingDataModel): JsValue =
-    DotcomRenderingUtils.withoutNull(
-      Json.obj(
-        "crosswords" -> Json.parse(model.crosswords.asJson.toString()),
-      ),
+    Json.obj(
+      "crosswords" -> Json.parse(model.crosswords.asJson.deepDropNullValues.toString()),
     )
 }