fix tests

jakubwro · Jan 29, 2024 · a5c02f8 · a5c02f8
1 parent 9b327f6
commit a5c02f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/jetstream/api/convert.jl b/src/jetstream/api/convert.jl
@@ -19,6 +19,9 @@ function convert(::Type{Union{T, ApiError}}, msg::NATS.Msg) where { T <: ApiResp
     pl = NATS.payload(msg)
     pl = replace(pl, "0001-01-01T00:00:00Z" => "0001-01-01T00:00:00.000Z")
     response  = JSON3.read(pl)
-    throw_on_api_error(response)
-    StructTypes.constructfrom(T, response)
+    if haskey(response, :error)
+        StructTypes.constructfrom(ApiError, response.error)
+    else
+        StructTypes.constructfrom(T, response)
+    end
 end
diff --git a/src/jetstream/stream/manage.jl b/src/jetstream/stream/manage.jl
@@ -7,7 +7,7 @@ Create a stream.
 function stream_create(connection::NATS.Connection, config::StreamConfiguration; no_throw = false)
     validate(config)
     response = NATS.request(Union{StreamInfo, ApiError}, connection, "\$JS.API.STREAM.CREATE.$(config.name)", JSON3.write(config))
-    no_throw || response isa ApiError && throw(response)
+    no_throw || throw_on_api_error(response)
     response
 end
 
@@ -19,7 +19,7 @@ Update a stream.
 function stream_update(connection::NATS.Connection, config::StreamConfiguration; no_throw = false)
     validate(config)
     response = NATS.request(Union{StreamInfo, ApiError}, connection, "\$JS.API.STREAM.UPDATE.$(config.name)", JSON3.write(config))
-    no_throw || response isa ApiError && throw(response)
+    no_throw || throw_on_api_error(response)
     response
 end