Page MenuHomePhorge
Files F116183

No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/lib/open_api_spex/operation2.ex b/lib/open_api_spex/cast_parameters.ex
similarity index 66%
copy from lib/open_api_spex/operation2.ex
copy to lib/open_api_spex/cast_parameters.ex
index 54bb058..90ceb9a 100644
--- a/lib/open_api_spex/operation2.ex
+++ b/lib/open_api_spex/cast_parameters.ex
@@ -1,83 +1,59 @@
-defmodule OpenApiSpex.Operation2 do
- @moduledoc """
- Defines the `OpenApiSpex.Operation.t` type.
- """
- alias OpenApiSpex.{
- Cast,
- Operation,
- Parameter,
- RequestBody,
- Schema
- }
-
+defmodule OpenApiSpex.CastParameters do
+ @moduledoc false
+ alias OpenApiSpex.{Cast, Operation, Parameter, Schema}
alias OpenApiSpex.Cast.Error
alias Plug.Conn
- @spec cast(Operation.t(), Conn.t(), String.t() | nil, Schema.schemas()) ::
+ @spec cast(Plug.Conn.t(), Operation.t(), Schema.schemas()) ::
{:error, [Error.t()]} | {:ok, Conn.t()}
- def cast(operation = %Operation{}, conn = %Conn{}, content_type, schemas) do
- with {:ok, conn} <- cast_parameters(conn, operation, schemas),
- {:ok, body} <-
- cast_request_body(operation.requestBody, conn.body_params, content_type, schemas) do
- {:ok, %{conn | body_params: body}}
- end
- end
-
- ## Private functions
-
- defp cast_parameters(conn, operation, schemas) do
+ def cast(conn, operation, schemas) do
parameters =
Enum.filter(operation.parameters || [], fn p ->
Map.has_key?(conn.params, Atom.to_string(p.name))
end)
with :ok <- check_query_params_defined(conn, operation.parameters),
{:ok, parameter_values} <- cast_known_parameters(parameters, conn.params, schemas) do
{:ok, %{conn | params: parameter_values}}
end
end
+ ## Private functions
+
defp check_query_params_defined(%Conn{}, nil = _defined_params) do
:ok
end
defp check_query_params_defined(%Conn{} = conn, defined_params)
when is_list(defined_params) do
defined_query_params =
for param <- defined_params,
param.in == :query,
into: MapSet.new(),
do: to_string(param.name)
case validate_parameter_keys(Map.keys(conn.query_params), defined_query_params) do
{:error, name} -> {:error, [%Error{reason: :unexpected_field, name: name}]}
:ok -> :ok
end
end
defp validate_parameter_keys([], _defined_params), do: :ok
defp validate_parameter_keys([name | params], defined_params) do
case MapSet.member?(defined_params, name) do
false -> {:error, name}
_ -> validate_parameter_keys(params, defined_params)
end
end
defp cast_known_parameters([], _params, _schemas), do: {:ok, %{}}
defp cast_known_parameters([p | rest], params = %{}, schemas) do
with {:ok, cast_val} <-
Cast.cast(Parameter.schema(p), params[Atom.to_string(p.name)], schemas),
{:ok, cast_tail} <- cast_known_parameters(rest, params, schemas) do
{:ok, Map.put_new(cast_tail, p.name, cast_val)}
end
end
-
- defp cast_request_body(nil, _, _, _), do: {:ok, %{}}
-
- defp cast_request_body(%RequestBody{content: content}, params, content_type, schemas) do
- schema = content[content_type].schema
- Cast.cast(schema, params, schemas)
- end
end
diff --git a/lib/open_api_spex/operation2.ex b/lib/open_api_spex/operation2.ex
index 54bb058..f8cdef6 100644
--- a/lib/open_api_spex/operation2.ex
+++ b/lib/open_api_spex/operation2.ex
@@ -1,83 +1,38 @@
defmodule OpenApiSpex.Operation2 do
@moduledoc """
Defines the `OpenApiSpex.Operation.t` type.
"""
alias OpenApiSpex.{
Cast,
+ CastParameters,
Operation,
- Parameter,
RequestBody,
Schema
}
alias OpenApiSpex.Cast.Error
alias Plug.Conn
@spec cast(Operation.t(), Conn.t(), String.t() | nil, Schema.schemas()) ::
{:error, [Error.t()]} | {:ok, Conn.t()}
def cast(operation = %Operation{}, conn = %Conn{}, content_type, schemas) do
with {:ok, conn} <- cast_parameters(conn, operation, schemas),
{:ok, body} <-
cast_request_body(operation.requestBody, conn.body_params, content_type, schemas) do
{:ok, %{conn | body_params: body}}
end
end
## Private functions
defp cast_parameters(conn, operation, schemas) do
- parameters =
- Enum.filter(operation.parameters || [], fn p ->
- Map.has_key?(conn.params, Atom.to_string(p.name))
- end)
-
- with :ok <- check_query_params_defined(conn, operation.parameters),
- {:ok, parameter_values} <- cast_known_parameters(parameters, conn.params, schemas) do
- {:ok, %{conn | params: parameter_values}}
- end
- end
-
- defp check_query_params_defined(%Conn{}, nil = _defined_params) do
- :ok
- end
-
- defp check_query_params_defined(%Conn{} = conn, defined_params)
- when is_list(defined_params) do
- defined_query_params =
- for param <- defined_params,
- param.in == :query,
- into: MapSet.new(),
- do: to_string(param.name)
-
- case validate_parameter_keys(Map.keys(conn.query_params), defined_query_params) do
- {:error, name} -> {:error, [%Error{reason: :unexpected_field, name: name}]}
- :ok -> :ok
- end
- end
-
- defp validate_parameter_keys([], _defined_params), do: :ok
-
- defp validate_parameter_keys([name | params], defined_params) do
- case MapSet.member?(defined_params, name) do
- false -> {:error, name}
- _ -> validate_parameter_keys(params, defined_params)
- end
- end
-
- defp cast_known_parameters([], _params, _schemas), do: {:ok, %{}}
-
- defp cast_known_parameters([p | rest], params = %{}, schemas) do
- with {:ok, cast_val} <-
- Cast.cast(Parameter.schema(p), params[Atom.to_string(p.name)], schemas),
- {:ok, cast_tail} <- cast_known_parameters(rest, params, schemas) do
- {:ok, Map.put_new(cast_tail, p.name, cast_val)}
- end
+ CastParameters.cast(conn, operation, schemas)
end
defp cast_request_body(nil, _, _, _), do: {:ok, %{}}
defp cast_request_body(%RequestBody{content: content}, params, content_type, schemas) do
schema = content[content_type].schema
Cast.cast(schema, params, schemas)
end
end

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 30, 2:52 PM (1 d, 17 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41483
Default Alt Text
(6 KB)

Event Timeline