feat: use typed ecto schemas in generated models

Author: efcasado

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java

@@ -61,6 +61,7 @@ public class ElixirClientCodegen extends DefaultCodegen {
     List<String> extraApplications = Arrays.asList(":logger");
     List<String> deps = Arrays.asList(
             "{:tesla, \"~> 1.7\"}",
+            "{:typed_ecto_schema, \"~> 0.4.1\"}",
             "{:ex_doc, \"~> 0.30\", only: :dev, runtime: false}",
             "{:dialyxir, \"~> 1.3\", only: [:dev, :test], runtime: false}");
 
@@ -302,6 +303,12 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio
                 writer.write(text.toUpperCase(Locale.ROOT));
             }
         });
+        additionalProperties.put("toEctoType", new Mustache.Lambda() {
+            @Override
+            public void execute(Template.Fragment fragment, Writer writer) throws IOException {
+                writer.write(toEctoType(fragment.execute()));
+            }
+        });
 
         if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
             setModuleName((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
@@ -336,10 +343,6 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
         supportingFiles.add(new SupportingFile("request_builder.ex.mustache",
                 sourceFolder(),
                 "request_builder.ex"));
-
-        supportingFiles.add(new SupportingFile("deserializer.ex.mustache",
-                sourceFolder(),
-                "deserializer.ex"));
     }
 
     @Override
@@ -439,6 +442,35 @@ private String atomized(String text) {
         return atom.toString();
     }
 
+    private String toEctoType(String baseType) {
+        switch (baseType) {
+            case "integer()":
+                return ":integer";
+            case "float()":
+                return ":float";
+            case "number()":
+                return ":float";
+            case "boolean()":
+                return ":boolean";
+            case "String.t":
+                return ":string";
+            case "Date.t":
+                return ":date";
+            case "DateTime.t":
+                return ":utc_datetime";
+            case "binary()":
+                return ":binary";
+            case "list()":
+                return "{:array, :any}";
+            case "map()":
+                return ":map";
+            case "nil":
+                return ":any, virtual: true";
+            default:
+                return ":any, virtual: true";
+        }
+    }
+
     /**
      * Escapes a reserved word as defined in the `reservedWords` array. Handle
      * escaping

modules/openapi-generator/src/main/resources/elixir/deserializer.ex.mustache

@@ -3,34 +3,29 @@
   @moduledoc """
   {{&description}}
   """
+  use TypedEctoSchema
 
-  @derive JSON.Encoder
-  defstruct [
-    {{#vars}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}},
-    {{/-last}}{{/vars}}
-  ]
-
-  @type t :: %__MODULE__{
-    {{#vars}}{{#atom}}{{&baseName}}{{/atom}} => {{{datatype}}}{{#isNullable}} | nil{{/isNullable}}{{^isNullable}}{{^required}} | nil{{/required}}{{/isNullable}}{{^-last}},
-    {{/-last}}{{/vars}}
-  }
-
-{{#hasComplexVars}}
-  alias {{&moduleName}}.Deserializer
-
-  def decode(value) do
-    value
-    {{#vars}}
+  @derive {JSON.Encoder, only: [{{#vars}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/vars}}]}
+  @primary_key false
+  typed_embedded_schema do
+  {{#vars}}
+    {{#isPrimitiveType}}
+    field {{#atom}}{{&baseName}}{{/atom}}, {{#toEctoType}}{{{baseType}}}{{/toEctoType}}{{#required}}, null: false{{/required}}
+    {{/isPrimitiveType}}
     {{^isPrimitiveType}}
-    {{#baseType}} |> Deserializer.deserialize({{#atom}}{{&baseName}}{{/atom}}, {{#isArray}}:list, {{&moduleName}}.Model.{{{items.baseType}}}{{/isArray}}{{#isMap}}:map, {{&moduleName}}.Model.{{{items.baseType}}}{{/isMap}}{{#isDate}}:date, nil{{/isDate}}{{#isDateTime}}:datetime, nil{{/isDateTime}}{{^isDate}}{{^isDateTime}}{{^isMap}}{{^isArray}}:struct, {{moduleName}}.Model.{{baseType}}{{/isArray}}{{/isMap}}{{/isDateTime}}{{/isDate}})
-    {{/baseType}}
+    {{^isArray}}embeds_one{{/isArray}}{{#isArray}}embeds_many{{/isArray}} {{#atom}}{{&baseName}}{{/atom}}, {{&moduleName}}.Model.{{^isArray}}{{{baseType}}}{{/isArray}}{{#isArray}}{{{items.baseType}}}{{/isArray}}{{#isNullable}}, null: true{{/isNullable}}
     {{/isPrimitiveType}}
-    {{/vars}}
-{{/hasComplexVars}}
-{{^hasComplexVars}}
-  def decode(value) do
-    value
-{{/hasComplexVars}}
+  {{/vars}}
+  end
+
+  @spec new(map()) :: t()
+  def new(params) do
+    %__MODULE__{}
+    |> Ecto.Changeset.cast(params, [{{#vars}}{{#isPrimitiveType}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/isPrimitiveType}}{{/vars}}])
+    |> Ecto.Changeset.validate_required([{{#vars}}{{#isPrimitiveType}}{{#required}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/required}}{{/isPrimitiveType}}{{/vars}}])
+{{#vars}}{{^isPrimitiveType}}
+    |> Ecto.Changeset.cast_embed({{#atom}}{{&baseName}}{{/atom}}{{#required}}, required: true{{/required}})
+{{/isPrimitiveType}}{{/vars}}    |> Ecto.Changeset.apply_action!(:insert)
   end
 end
 {{/model}}{{/models}}

modules/openapi-generator/src/main/resources/elixir/model.mustache

@@ -187,10 +187,12 @@ defmodule {{moduleName}}.RequestBuilder do
   defp decode(%Tesla.Env{} = env, false), do: {:ok, env}
 
   defp decode(%Tesla.Env{body: body}, %{}) do
-    {{moduleName}}.Deserializer.json_decode(body)
+    JSON.decode!(body)
   end
 
   defp decode(%Tesla.Env{body: body}, module) do
-    {{moduleName}}.Deserializer.json_decode(body, module)
+    body
+    |> JSON.decode!
+    |> module.new
   end
 end

modules/openapi-generator/src/main/resources/elixir/request_builder.ex.mustache

@@ -11,7 +11,6 @@ lib/openapi_petstore/api/pet.ex
 lib/openapi_petstore/api/store.ex
 lib/openapi_petstore/api/user.ex
 lib/openapi_petstore/connection.ex
-lib/openapi_petstore/deserializer.ex
 lib/openapi_petstore/model/_foo_get_default_response.ex
 lib/openapi_petstore/model/_special_model_name_.ex
 lib/openapi_petstore/model/additional_properties_class.ex