From 4a769764836a14ca3afa4d6a6f7f09943e290ec2 Mon Sep 17 00:00:00 2001 From: Kseniya Tomskikh Date: Thu, 12 Apr 2018 13:59:43 +0700 Subject: Fixed merge JsValues when field is absent in old value (#153) --- src/main/scala/xyz/driver/core/rest/PatchDirectives.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main') diff --git a/src/main/scala/xyz/driver/core/rest/PatchDirectives.scala b/src/main/scala/xyz/driver/core/rest/PatchDirectives.scala index 256358c..f33bf9d 100644 --- a/src/main/scala/xyz/driver/core/rest/PatchDirectives.scala +++ b/src/main/scala/xyz/driver/core/rest/PatchDirectives.scala @@ -53,10 +53,10 @@ trait PatchDirectives extends Directives with SprayJsonSupport { } protected def mergeObjects(oldObj: JsObject, newObj: JsObject, maxLevels: Option[Int] = None): JsObject = { - JsObject(oldObj.fields.map({ - case (key, oldValue) => - val newValue = newObj.fields.get(key).fold(oldValue)(mergeJsValues(oldValue, _, maxLevels.map(_ - 1))) - key -> newValue + JsObject((oldObj.fields.keys ++ newObj.fields.keys).map({ key => + val oldValue = oldObj.fields.getOrElse(key, JsNull) + val newValue = newObj.fields.get(key).fold(oldValue)(mergeJsValues(oldValue, _, maxLevels.map(_ - 1))) + key -> newValue })(collection.breakOut): _*) } -- cgit v1.2.3