Improve behavior of JsonOptic.set (fixes #13)

Tinkoff · Mar 23, 2023 · a8c355e · a8c355e
1 parent f56df78
commit a8c355e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/backend/circe-utils/src/main/scala/ru/tinkoff/tcb/utils/circe/optics/package.scala b/backend/circe-utils/src/main/scala/ru/tinkoff/tcb/utils/circe/optics/package.scala
@@ -32,7 +32,9 @@ package object optics {
               }
             }
             .getOrElse(construct(part, mod(None)))
-      case Traverse => json => json.withArray(arr => Json.fromValues(arr.map(j => mod(Some(j)))))
+      case Traverse =>
+        json =>
+          json.asArray.map(arr => Json.fromValues(arr.map(j => mod(Some(j))))).getOrElse(construct(part, mod(None)))
     }
   }
 

diff --git a/backend/circe-utils/src/test/scala/ru/tinkoff/tcb/utils/circe/optics/OpticSpec.scala b/backend/circe-utils/src/test/scala/ru/tinkoff/tcb/utils/circe/optics/OpticSpec.scala
@@ -245,6 +245,13 @@ class OpticSpec extends RefSpec with Matchers {
 
         result shouldBe json"""{"a": [{"b": 4}, {"b": 4}, {"b": 4}]}"""
       }
+
+      def `should properly re-create complete structure`: Assertion = {
+        val target = Json.obj()
+        val result = optic.set(Json.fromInt(4))(target)
+
+        result shouldBe json"""{"a": [{"b": 4}]}"""
+      }
     }
 
     object `json getter` {

diff --git a/backend/project/Settings.scala b/backend/project/Settings.scala
@@ -26,7 +26,7 @@ object Settings {
 
   val common = Seq(
     organization := "ru.tinkoff",
-    version := "3.7.0",
+    version := "3.7.1",
     scalaVersion := "2.13.10",
     Compile / packageDoc / publishArtifact := false,
     Compile / packageSrc / publishArtifact := false,