fix: oas to use any schema for json ast node (#1372)

Signed-off-by: Pat Losoponkul <[email protected]>
hyperledger · Sep 23, 2024 · 95d328e · 95d328e
1 parent 803be11
commit 95d328e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 27 deletions.
diff --git a/...rvice/server/src/main/scala/org/hyperledger/identus/api/http/codec/CirceJsonInterop.scala b/...rvice/server/src/main/scala/org/hyperledger/identus/api/http/codec/CirceJsonInterop.scala
diff --git a/...ervice/server/src/main/scala/org/hyperledger/identus/castor/controller/http/Service.scala b/...ervice/server/src/main/scala/org/hyperledger/identus/castor/controller/http/Service.scala
@@ -1,15 +1,15 @@
 package org.hyperledger.identus.castor.controller.http
 
-import io.circe.Json
-import org.hyperledger.identus.api.http.codec.CirceJsonInterop
 import org.hyperledger.identus.api.http.Annotation
 import org.hyperledger.identus.castor.controller.http.Service.annotations
 import org.hyperledger.identus.castor.core.model.{did as castorDomain, ProtoModelHelper}
 import org.hyperledger.identus.castor.core.model.did.w3c
+import org.hyperledger.identus.shared.json.JsonInterop
 import org.hyperledger.identus.shared.utils.Traverse.*
 import sttp.tapir.Schema
 import sttp.tapir.Schema.annotations.{description, encodedExample}
-import zio.json.{DeriveJsonDecoder, DeriveJsonEncoder, JsonDecoder, JsonEncoder}
+import zio.json.{DeriveJsonDecoder, DeriveJsonEncoder, EncoderOps, JsonDecoder, JsonEncoder}
+import zio.json.ast.Json
 
 import scala.language.implicitConversions
 
@@ -48,7 +48,7 @@ object Service {
         extends Annotation[Json](
           description =
             "The service endpoint. Can contain multiple possible values as described in the [Create DID operation](https://github.com/input-output-hk/prism-did-method-spec/blob/main/w3c-spec/PRISM-method.md#create-did)",
-          example = Json.fromString("https://example.com")
+          example = Json.Str("https://example.com")
         )
   }
 
@@ -62,7 +62,7 @@ object Service {
     Service(
       id = service.id,
       `type` = service.`type`,
-      serviceEndpoint = ServiceEndpoint.fromJson(service.serviceEndpoint)
+      serviceEndpoint = ServiceEndpoint.fromJson(JsonInterop.toZioJsonAst(service.serviceEndpoint))
     )
 
   extension (service: Service) {
@@ -139,17 +139,17 @@ object ServiceType {
 opaque type ServiceEndpoint = Json
 
 object ServiceEndpoint {
-  given encoder: JsonEncoder[ServiceEndpoint] = CirceJsonInterop.encodeJson
-  given decoder: JsonDecoder[ServiceEndpoint] = CirceJsonInterop.decodeJson
-  given schema: Schema[ServiceEndpoint] = CirceJsonInterop.schemaJson
+  given encoder: JsonEncoder[ServiceEndpoint] = Json.encoder
+  given decoder: JsonDecoder[ServiceEndpoint] = Json.decoder
+  given schema: Schema[ServiceEndpoint] = Schema.any[ServiceEndpoint]
 
   def fromJson(json: Json): ServiceEndpoint = json
 
   extension (serviceEndpoint: ServiceEndpoint) {
     def toDomain: Either[String, castorDomain.ServiceEndpoint] = {
       val stringEncoded = serviceEndpoint.asString match {
         case Some(s) => s
-        case None    => serviceEndpoint.noSpaces
+        case None    => serviceEndpoint.toJson
       }
       ProtoModelHelper.parseServiceEndpoint(stringEncoded)
     }

diff --git a/...ain/scala/org/hyperledger/identus/pollux/prex/http/PresentationExchangeTapirSchemas.scala b/...ain/scala/org/hyperledger/identus/pollux/prex/http/PresentationExchangeTapirSchemas.scala
@@ -1,9 +1,7 @@
 package org.hyperledger.identus.pollux.prex.http
 
 import org.hyperledger.identus.pollux.prex.*
-import sttp.tapir.json.zio.*
 import sttp.tapir.Schema
-import zio.json.ast.Json
 
 import scala.language.implicitConversions
 
@@ -20,5 +18,5 @@ object PresentationExchangeTapirSchemas {
   given Schema[Ldp] = Schema.derived
   given Schema[Field] = Schema.derived
   given Schema[JsonPathValue] = Schema.schemaForString.map[JsonPathValue](Some(_))(_.value)
-  given Schema[FieldFilter] = Schema.derived[Json].map[FieldFilter](Some(_))(_.asJsonZio)
+  given Schema[FieldFilter] = Schema.any[FieldFilter]
 }