simplify model template

Author: efcasado

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

@@ -894,6 +894,8 @@ private boolean getRequiresHttpcWorkaround() {
 
     class ExtendedCodegenModel extends CodegenModel {
         public boolean hasImports;
+        public List<CodegenProperty> primitiveVars = new ArrayList<>();
+        public List<CodegenProperty> complexVars = new ArrayList<>();
 
         public ExtendedCodegenModel(CodegenModel cm) {
             super();
@@ -947,6 +949,14 @@ public ExtendedCodegenModel(CodegenModel cm) {
             this.additionalPropertiesType = cm.additionalPropertiesType;
 
             this.hasImports = !this.imports.isEmpty();
+
+            for (CodegenProperty var : this.vars) {
+                if (var.isPrimitiveType) {
+                    this.primitiveVars.add(var);
+                } else {
+                    this.complexVars.add(var);
+                }
+            }
         }
 
         public boolean hasComplexVars() {

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

@@ -21,11 +21,12 @@
   @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(params, [{{#primitiveVars}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/primitiveVars}}])
+    |> Ecto.Changeset.validate_required([{{#primitiveVars}}{{#required}}{{#atom}}{{&baseName}}{{/atom}}{{^-last}}, {{/-last}}{{/required}}{{/primitiveVars}}])
+    {{#complexVars}}
     |> Ecto.Changeset.cast_embed({{#atom}}{{&baseName}}{{/atom}}{{#required}}, required: true{{/required}})
-{{/isPrimitiveType}}{{/vars}}    |> Ecto.Changeset.apply_action!(:insert)
+    {{/complexVars}}
+    |> Ecto.Changeset.apply_action!(:insert)
   end
 end
 {{/model}}{{/models}}

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

@@ -18,7 +18,6 @@ defmodule OpenapiPetstore.Model.FooGetDefaultResponse do
     %__MODULE__{}
     |> Ecto.Changeset.cast(params, [])
     |> Ecto.Changeset.validate_required([])
-
     |> Ecto.Changeset.cast_embed(:string)
     |> Ecto.Changeset.apply_action!(:insert)
   end

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

@@ -17,9 +17,8 @@ defmodule OpenapiPetstore.Model.AllOfWithSingleRef do
   @spec new(map()) :: t()
   def new(params) do
     %__MODULE__{}
-    |> Ecto.Changeset.cast(params, [:username, ])
+    |> Ecto.Changeset.cast(params, [:username])
     |> Ecto.Changeset.validate_required([])
-
     |> Ecto.Changeset.cast_embed(:SingleRefType)
     |> Ecto.Changeset.apply_action!(:insert)
   end

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

@@ -23,15 +23,11 @@ defmodule OpenapiPetstore.Model.EnumTest do
   @spec new(map()) :: t()
   def new(params) do
     %__MODULE__{}
-    |> Ecto.Changeset.cast(params, [:enum_string, :enum_string_required, :enum_integer, :enum_number, ])
+    |> Ecto.Changeset.cast(params, [:enum_string, :enum_string_required, :enum_integer, :enum_number])
     |> Ecto.Changeset.validate_required([:enum_string_required, ])
-
     |> Ecto.Changeset.cast_embed(:outerEnum)
-
     |> Ecto.Changeset.cast_embed(:outerEnumInteger)
-
     |> Ecto.Changeset.cast_embed(:outerEnumDefaultValue)
-
     |> Ecto.Changeset.cast_embed(:outerEnumIntegerDefaultValue)
     |> Ecto.Changeset.apply_action!(:insert)
   end

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

@@ -19,9 +19,7 @@ defmodule OpenapiPetstore.Model.FileSchemaTestClass do
     %__MODULE__{}
     |> Ecto.Changeset.cast(params, [])
     |> Ecto.Changeset.validate_required([])
-
     |> Ecto.Changeset.cast_embed(:file)
-
     |> Ecto.Changeset.cast_embed(:files)
     |> Ecto.Changeset.apply_action!(:insert)
   end

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

@@ -18,9 +18,8 @@ defmodule OpenapiPetstore.Model.MixedPropertiesAndAdditionalPropertiesClass do
   @spec new(map()) :: t()
   def new(params) do
     %__MODULE__{}
-    |> Ecto.Changeset.cast(params, [:uuid, :dateTime, ])
+    |> Ecto.Changeset.cast(params, [:uuid, :dateTime])
     |> Ecto.Changeset.validate_required([])
-
     |> Ecto.Changeset.cast_embed(:map)
     |> Ecto.Changeset.apply_action!(:insert)
   end

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

@@ -21,7 +21,6 @@ defmodule OpenapiPetstore.Model.ObjectWithDeprecatedFields do
     %__MODULE__{}
     |> Ecto.Changeset.cast(params, [:uuid, :id, :bars])
     |> Ecto.Changeset.validate_required([])
-
     |> Ecto.Changeset.cast_embed(:deprecatedRef)
     |> Ecto.Changeset.apply_action!(:insert)
   end

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

@@ -18,7 +18,6 @@ defmodule OpenapiPetstore.Model.OuterObjectWithEnumProperty do
     %__MODULE__{}
     |> Ecto.Changeset.cast(params, [])
     |> Ecto.Changeset.validate_required([])
-
     |> Ecto.Changeset.cast_embed(:value, required: true)
     |> Ecto.Changeset.apply_action!(:insert)
   end

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

@@ -23,9 +23,7 @@ defmodule OpenapiPetstore.Model.Pet do
     %__MODULE__{}
     |> Ecto.Changeset.cast(params, [:id, :name, :photoUrls, :status])
     |> Ecto.Changeset.validate_required([:name, :photoUrls, ])
-
     |> Ecto.Changeset.cast_embed(:category)
-
     |> Ecto.Changeset.cast_embed(:tags)
     |> Ecto.Changeset.apply_action!(:insert)
   end