Further improve error messages of #541

open-api-spex · May 30, 2023 · a332a06 · a332a06
1 parent 4805411
commit a332a06
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/lib/open_api_spex/schema_resolver.ex b/lib/open_api_spex/schema_resolver.ex
@@ -250,9 +250,11 @@ defmodule OpenApiSpex.SchemaResolver do
 
   defp resolve_schema_modules_from_schema(ref = %Reference{}, schemas), do: {ref, schemas}
 
-  defp resolve_schema_modules_from_schema(_, _) do
+  defp resolve_schema_modules_from_schema(schema, _schemas) do
     error_message = """
-    Cannot resolve schema, must be one of:
+    Cannot resolve schema #{inspect(schema)}.
+
+    Must be one of:
 
     - schema module, or schema struct
     - list of schema modules, or schema structs
@@ -286,6 +288,7 @@ defmodule OpenApiSpex.SchemaResolver do
       Enum.map_reduce(mapping, schemas, fn
         {key, module}, schemas when is_atom(module) ->
           {%Reference{"$ref": path}, schemas} = resolve_schema_modules_from_schema(module, schemas)
+
           {{key, path}, schemas}
 
         {key, path}, schemas ->
@@ -295,5 +298,6 @@ defmodule OpenApiSpex.SchemaResolver do
     {%{discriminator | mapping: Map.new(mapping)}, schemas}
   end
 
-  defp resolve_schema_modules_from_discriminator(disciminator, schemas), do: {disciminator, schemas}
+  defp resolve_schema_modules_from_discriminator(disciminator, schemas),
+    do: {disciminator, schemas}
 end
diff --git a/test/schema_resolver_test.exs b/test/schema_resolver_test.exs
@@ -169,10 +169,14 @@ defmodule OpenApiSpex.SchemaResolverTest do
              resolved.paths["/api/users"].post.requestBody.content["application/json"].schema
 
     assert "#/components/schemas/TrainingAppointment" =
-             resolved.components.schemas["PetAppointmentRequest"].discriminator.mapping["training"]
+             resolved.components.schemas["PetAppointmentRequest"].discriminator.mapping[
+               "training"
+             ]
 
     assert "#/components/schemas/GroomingAppointment" =
-             resolved.components.schemas["PetAppointmentRequest"].discriminator.mapping["grooming"]
+             resolved.components.schemas["PetAppointmentRequest"].discriminator.mapping[
+               "grooming"
+             ]
 
     assert %{
              "UserRequest" => %Schema{},
@@ -250,7 +254,9 @@ defmodule OpenApiSpex.SchemaResolverTest do
     }
 
     error_message = """
-    Cannot resolve schema, must be one of:
+    Cannot resolve schema %{}.
+
+    Must be one of:
 
     - schema module, or schema struct
     - list of schema modules, or schema structs