improve integration with ecto

Author: efcasado

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

@@ -408,6 +408,24 @@ public CodegenModel fromModel(String name, Schema model) {
         for (CodegenProperty var : optionalVars) {
             ecm.optionalVars.add(new ExtendedCodegenProperty(var));
         }
+
+        List<CodegenProperty> ectoFields = new ArrayList<>(ecm.ectoFields);
+        ecm.ectoFields.clear();
+        for (CodegenProperty field : ectoFields) {
+            ecm.ectoFields.add(new ExtendedCodegenProperty(field));
+        }
+        
+        List<CodegenProperty> ectoEmbeds = new ArrayList<>(ecm.ectoEmbeds);
+        ecm.ectoEmbeds.clear();
+        for (CodegenProperty embed : ectoEmbeds) {
+            ecm.ectoEmbeds.add(new ExtendedCodegenProperty(embed));
+        }
+
+        List<CodegenProperty> requiredEctoFields = new ArrayList<>(ecm.requiredEctoFields);
+        ecm.requiredEctoFields.clear();
+        for (CodegenProperty field : requiredEctoFields) {
+            ecm.requiredEctoFields.add(new ExtendedCodegenProperty(field));
+        }
 
         return ecm;
     }
@@ -890,9 +908,9 @@ private boolean getRequiresHttpcWorkaround() {
 
     class ExtendedCodegenModel extends CodegenModel {
         public boolean hasImports;
-        public List<CodegenProperty> primitiveVars = new ArrayList<>();
-        public List<CodegenProperty> complexVars = new ArrayList<>();
-        public List<CodegenProperty> requiredPrimitiveVars = new ArrayList<>();
+        public List<CodegenProperty> ectoFields = new ArrayList<>();
+        public List<CodegenProperty> ectoEmbeds = new ArrayList<>();
+        public List<CodegenProperty> requiredEctoFields = new ArrayList<>();
 
         public ExtendedCodegenModel(CodegenModel cm) {
             super();
@@ -948,13 +966,13 @@ public ExtendedCodegenModel(CodegenModel cm) {
             this.hasImports = !this.imports.isEmpty();
 
             for (CodegenProperty var : this.vars) {
-                if (var.isPrimitiveType) {
-                    this.primitiveVars.add(var);
+                if (var.isPrimitiveType || var.isMap) {
+                    this.ectoFields.add(var);
                     if (var.required) {
-                        this.requiredPrimitiveVars.add(var);
+                        this.requiredEctoFields.add(var);
                     }
                 } else {
-                    this.complexVars.add(var);
+                    this.ectoEmbeds.add(var);
                 }
             }
         }

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

@@ -13,24 +13,22 @@
   @derive {JSON.Encoder, only: [{{#vars}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/vars}}]}
   @primary_key false
   embedded_schema do
-  {{#vars}}
-    {{#isPrimitiveType}}
+  {{#ectoFields}}
     field {{#atom}}{{&baseName}}{{/atom}}, {{{ectoType}}}
-    {{/isPrimitiveType}}
-    {{^isPrimitiveType}}
+  {{/ectoFields}}
+  {{#ectoEmbeds}}
     {{^isArray}}embeds_one{{/isArray}}{{#isArray}}embeds_many{{/isArray}} {{#atom}}{{&baseName}}{{/atom}}, {{&moduleName}}.Model.{{^isArray}}{{{baseType}}}{{/isArray}}{{#isArray}}{{{items.baseType}}}{{/isArray}}
-    {{/isPrimitiveType}}
-  {{/vars}}
+  {{/ectoEmbeds}}
   end
 
   @spec changeset(t(), map()) :: Ecto.Changeset.t()
   def changeset(%__MODULE__{} = struct, params) do
     struct
-    |> Ecto.Changeset.cast(params, [{{#primitiveVars}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/primitiveVars}}])
-    |> Ecto.Changeset.validate_required([{{#requiredPrimitiveVars}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/requiredPrimitiveVars}}])
-    {{#complexVars}}
+    |> Ecto.Changeset.cast(params, [{{#ectoFields}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/ectoFields}}])
+    |> Ecto.Changeset.validate_required([{{#requiredEctoFields}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/requiredEctoFields}}])
+    {{#ectoEmbeds}}
     |> Ecto.Changeset.cast_embed({{#atom}}{{&baseName}}{{/atom}}{{#required}}, required: true{{/required}})
-    {{/complexVars}}
+    {{/ectoEmbeds}}
   end
 end
 {{/model}}{{/models}}

samples/client/petstore/elixir/lib/openapi_petstore/model/mixed_properties_and_additional_properties_class.ex

@@ -18,15 +18,14 @@ defmodule OpenapiPetstore.Model.MixedPropertiesAndAdditionalPropertiesClass do
   embedded_schema do
     field :uuid, :string
     field :dateTime, :utc_datetime
-    embeds_one :map, OpenapiPetstore.Model.map()
+    field :map, :map
   end
 
   @spec changeset(t(), map()) :: Ecto.Changeset.t()
   def changeset(%__MODULE__{} = struct, params) do
     struct
-    |> Ecto.Changeset.cast(params, [:uuid, :dateTime])
+    |> Ecto.Changeset.cast(params, [:uuid, :dateTime, :map])
     |> Ecto.Changeset.validate_required([])
-    |> Ecto.Changeset.cast_embed(:map)
   end
 end
 

samples/client/petstore/elixir/lib/openapi_petstore/model/object_with_deprecated_fields.ex

@@ -19,8 +19,8 @@ defmodule OpenapiPetstore.Model.ObjectWithDeprecatedFields do
   embedded_schema do
     field :uuid, :string
     field :id, :float
-    embeds_one :deprecatedRef, OpenapiPetstore.Model.DeprecatedModel
     field :bars, {:array, :string}
+    embeds_one :deprecatedRef, OpenapiPetstore.Model.DeprecatedModel
   end
 
   @spec changeset(t(), map()) :: Ecto.Changeset.t()

samples/client/petstore/elixir/lib/openapi_petstore/model/pet.ex

@@ -20,11 +20,11 @@ defmodule OpenapiPetstore.Model.Pet do
   @primary_key false
   embedded_schema do
     field :id, :integer
-    embeds_one :category, OpenapiPetstore.Model.Category
     field :name, :string
     field :photoUrls, {:array, :string}
-    embeds_many :tags, OpenapiPetstore.Model.Tag
     field :status, :string
+    embeds_one :category, OpenapiPetstore.Model.Category
+    embeds_many :tags, OpenapiPetstore.Model.Tag
   end
 
   @spec changeset(t(), map()) :: Ecto.Changeset.t()