feat(nomasystems#59): Pass ContType w/ schemas for validation

Issue nomasystems#59
LoisSotoLopez · Mar 3, 2024 · b3a6fbd · b3a6fbd
1 parent 3ef587b
commit b3a6fbd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/src/erf.erl b/src/erf.erl
@@ -255,9 +255,13 @@ init([Name, RawConf]) ->
     Reason :: term().
 build_dtos([]) ->
     ok;
+build_dtos([{Ref, [{_ContentType, Schema}]} | Schemas]) ->
+    build_dtos([{Ref, Schema} | Schemas]);
 build_dtos([{Ref, Schema} | Schemas]) ->
     Name = erlang:binary_to_atom(Ref),
     DTO = ndto:generate(Name, Schema),
+    io:format("Schema is ~p~n", [Schema]),
+    file:write_file(Name, erl_prettypr:format(DTO)),
     case ndto:load(DTO) of
         ok ->
             build_dtos(Schemas);

diff --git a/src/erf_parser.erl b/src/erf_parser.erl
@@ -31,6 +31,7 @@
     ref := ref(),
     required := boolean()
 }.
+-type content_type() :: binary().
 -type endpoint() :: #{
     path := path(),
     parameters := [parameter()],
@@ -57,18 +58,19 @@
 -type path() :: binary().
 -type ref() :: binary().
 -type request() :: #{
-    body := body()
+    body := #{content_type() => body()}
 }.
 -type response() :: #{
-    body := body()
+    body := #{content_type() => body()}
 }.
--type schema() :: ndto:schema().
+-type schema() :: ndto:schema() | {content_type(), ndto:schema()}.
 -type status_code() :: 100..599.
 
 %%% TYPE EXPORTS
 -export_type([
     api/0,
     body/0,
+    content_type/0,
     endpoint/0,
     method/0,
     operation/0,

diff --git a/src/erf_parser/erf_parser_oas_3_0.erl b/src/erf_parser/erf_parser_oas_3_0.erl
@@ -400,19 +400,19 @@ parse_parameter(#{<<"schema">> := RawSchema} = RawParameter, #{namespace := Name
     OAS :: spec(),
     CTX :: ctx(),
     Result :: {RequestBody, ExtraSchemas, NewCTX},
-    RequestBody :: #{schema := erf_parser:schema(), required := boolean()},
+    RequestBody :: #{schema := [{erf_parser:content_type(), erf_parser:schema()}], required := boolean()},
     ExtraSchemas :: [{erf_parser:ref(), erf_parser:schema()}],
     NewCTX :: ctx().
 parse_request_body(#{<<"$ref">> := Ref}, CTX) ->
     {_RefResolved, RefOAS, RefCTX} = resolve_ref(Ref, CTX),
     parse_request_body(RefOAS, RefCTX);
 parse_request_body(#{<<"content">> := Content} = ReqBody, CTX) ->
     Required = maps:get(<<"required">>, ReqBody, false),
-    {AnyOf, ExtraSchemas, NewCTX} = lists:foldl(
-        fun({_MediaType, #{<<"schema">> := RawSchema}}, {AnyOfAcc, ExtraSchemasAcc, CTXAcc}) ->
+    {PerContentTypeSchemas, ExtraSchemas, NewCTX} = lists:foldl(
+        fun({ContentType, #{<<"schema">> := RawSchema}}, {SchemaAcc, ExtraSchemasAcc, CTXAcc}) ->
             {Schema, NewExtraSchemas, SchemaCTX} = parse_schemas(RawSchema, CTXAcc),
             {
-                [Schema | AnyOfAcc],
+                [{ContentType, Schema} | SchemaAcc],
                 NewExtraSchemas ++ ExtraSchemasAcc,
                 CTXAcc#{
                     resolved => maps:get(resolved, SchemaCTX)
@@ -422,9 +422,8 @@ parse_request_body(#{<<"content">> := Content} = ReqBody, CTX) ->
         {[], [], CTX},
         maps:to_list(Content)
     ),
-    RequestBodySchema = #{any_of => AnyOf},
     RequestBody = #{
-        schema => RequestBodySchema,
+        schema => PerContentTypeSchemas,
         required => Required
     },
     {RequestBody, ExtraSchemas, NewCTX};

diff --git a/src/erf_util.erl b/src/erf_util.erl
@@ -65,7 +65,7 @@ binarize_atoms(Map) when is_map(Map) ->
     maps:fold(
         fun
             (K, V, Acc) when is_atom(K) ->
-                maps:put(atom_to_binary(K), RecursiveFun(V), Acc);
+                maps:put(erlang:atom_to_binary(K), RecursiveFun(V), Acc);
             (K, V, Acc) ->
                 maps:put(K, V, Acc)
         end,