better handling of referenced enums

Author: efcasado

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

@@ -972,7 +972,7 @@ public ExtendedCodegenModel(CodegenModel cm) {
             this.hasImports = !this.imports.isEmpty();
 
             for (CodegenProperty var : this.vars) {
-                if (var.isPrimitiveType || var.isMap) {
+                if (var.isPrimitiveType || var.isMap || var.isEnum || var.isEnumRef) {
                     this.ectoFields.add(var);
                     if (var.required) {
                         this.requiredEctoFields.add(var);
@@ -1042,6 +1042,7 @@ public ExtendedCodegenProperty(CodegenProperty cp) {
             this.isArray = cp.isArray;
             this.isMap = cp.isMap;
             this.isEnum = cp.isEnum;
+            this.isEnumRef = cp.isEnumRef;
             this.isReadOnly = cp.isReadOnly;
             this.isWriteOnly = cp.isWriteOnly;
             this.isNullable = cp.isNullable;
@@ -1056,11 +1057,9 @@ public ExtendedCodegenProperty(CodegenProperty cp) {
 
         public String ectoType() {
             String ectoType = ectoType(this);
-
             if (":any".equals(ectoType)) {
                 return ectoType + ", virtual: true";
             }
-
             return ectoType;
         }
 

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

@@ -1,5 +1,5 @@
 {{>licenseInfo}}
-{{#models}}{{#model}}defmodule {{moduleName}}.Model.{{classname}} do
+{{#models}}{{#model}}{{^isEnum}}defmodule {{moduleName}}.Model.{{classname}} do
   @moduledoc """
   {{&description}}
   """
@@ -18,7 +18,12 @@
     field {{#atom}}{{&baseName}}{{/atom}}, Ecto.Enum, values: [{{#allowableValues}}{{#values}}{{#atom}}{{.}}{{/atom}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
     {{/isEnum}}
     {{^isEnum}}
+    {{#isEnumRef}}
+    field {{#atom}}{{&baseName}}{{/atom}}, Ecto.Enum, values: [{{#allowableValues}}{{#values}}{{#atom}}{{.}}{{/atom}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
+    {{/isEnumRef}}
+    {{^isEnumRef}}
     field {{#atom}}{{&baseName}}{{/atom}}, {{{ectoType}}}
+    {{/isEnumRef}}
     {{/isEnum}}
   {{/ectoFields}}
   {{#ectoEmbeds}}
@@ -36,4 +41,4 @@
     {{/ectoEmbeds}}
   end
 end
-{{/model}}{{/models}}
+{{/isEnum}}{{/model}}{{/models}}

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

@@ -16,15 +16,14 @@ defmodule OpenapiPetstore.Model.AllOfWithSingleRef do
   @primary_key false
   embedded_schema do
     field :username, :string
-    embeds_one :SingleRefType, OpenapiPetstore.Model.SingleRefType
+    field :SingleRefType, Ecto.Enum, values: [:admin, :user]
   end
 
   @spec changeset(t(), map()) :: Ecto.Changeset.t()
   def changeset(%__MODULE__{} = struct, params) do
     struct
-    |> Ecto.Changeset.cast(params, [:username])
+    |> Ecto.Changeset.cast(params, [:username, :SingleRefType])
     |> Ecto.Changeset.validate_required([])
-    |> Ecto.Changeset.cast_embed(:SingleRefType)
   end
 end
 

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

@@ -1,26 +1,4 @@
 # NOTE: This file is auto generated by OpenAPI Generator 7.14.0-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.
 
-defmodule OpenapiPetstore.Model.EnumClass do
-  @moduledoc """
-  
-  """
-  use Ecto.Schema
-
-  @type t :: %__MODULE__{
-    
-  }
-
-  @derive {JSON.Encoder, only: []}
-  @primary_key false
-  embedded_schema do
-  end
-
-  @spec changeset(t(), map()) :: Ecto.Changeset.t()
-  def changeset(%__MODULE__{} = struct, params) do
-    struct
-    |> Ecto.Changeset.cast(params, [])
-    |> Ecto.Changeset.validate_required([])
-  end
-end
 

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

@@ -25,21 +25,17 @@ defmodule OpenapiPetstore.Model.EnumTest do
     field :enum_string_required, Ecto.Enum, values: [:UPPER, :lower, :""]
     field :enum_integer, Ecto.Enum, values: [:"1", :"-1"]
     field :enum_number, Ecto.Enum, values: [:"1.1", :"-1.2"]
-    embeds_one :outerEnum, OpenapiPetstore.Model.OuterEnum
-    embeds_one :outerEnumInteger, OpenapiPetstore.Model.OuterEnumInteger
-    embeds_one :outerEnumDefaultValue, OpenapiPetstore.Model.OuterEnumDefaultValue
-    embeds_one :outerEnumIntegerDefaultValue, OpenapiPetstore.Model.OuterEnumIntegerDefaultValue
+    field :outerEnum, Ecto.Enum, values: [:placed, :approved, :delivered]
+    field :outerEnumInteger, Ecto.Enum, values: [:"0", :"1", :"2"]
+    field :outerEnumDefaultValue, Ecto.Enum, values: [:placed, :approved, :delivered]
+    field :outerEnumIntegerDefaultValue, Ecto.Enum, values: [:"0", :"1", :"2"]
   end
 
   @spec changeset(t(), map()) :: Ecto.Changeset.t()
   def changeset(%__MODULE__{} = struct, params) do
     struct
-    |> 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, :outerEnum, :outerEnumInteger, :outerEnumDefaultValue, :outerEnumIntegerDefaultValue])
     |> 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)
   end
 end
 

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

@@ -1,26 +1,4 @@
 # NOTE: This file is auto generated by OpenAPI Generator 7.14.0-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.
 
-defmodule OpenapiPetstore.Model.OuterEnum do
-  @moduledoc """
-  
-  """
-  use Ecto.Schema
-
-  @type t :: %__MODULE__{
-    
-  }
-
-  @derive {JSON.Encoder, only: []}
-  @primary_key false
-  embedded_schema do
-  end
-
-  @spec changeset(t(), map()) :: Ecto.Changeset.t()
-  def changeset(%__MODULE__{} = struct, params) do
-    struct
-    |> Ecto.Changeset.cast(params, [])
-    |> Ecto.Changeset.validate_required([])
-  end
-end
 

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

@@ -1,26 +1,4 @@
 # NOTE: This file is auto generated by OpenAPI Generator 7.14.0-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.
 
-defmodule OpenapiPetstore.Model.OuterEnumDefaultValue do
-  @moduledoc """
-  
-  """
-  use Ecto.Schema
-
-  @type t :: %__MODULE__{
-    
-  }
-
-  @derive {JSON.Encoder, only: []}
-  @primary_key false
-  embedded_schema do
-  end
-
-  @spec changeset(t(), map()) :: Ecto.Changeset.t()
-  def changeset(%__MODULE__{} = struct, params) do
-    struct
-    |> Ecto.Changeset.cast(params, [])
-    |> Ecto.Changeset.validate_required([])
-  end
-end
 

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

@@ -1,26 +1,4 @@
 # NOTE: This file is auto generated by OpenAPI Generator 7.14.0-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.
 
-defmodule OpenapiPetstore.Model.OuterEnumInteger do
-  @moduledoc """
-  
-  """
-  use Ecto.Schema
-
-  @type t :: %__MODULE__{
-    
-  }
-
-  @derive {JSON.Encoder, only: []}
-  @primary_key false
-  embedded_schema do
-  end
-
-  @spec changeset(t(), map()) :: Ecto.Changeset.t()
-  def changeset(%__MODULE__{} = struct, params) do
-    struct
-    |> Ecto.Changeset.cast(params, [])
-    |> Ecto.Changeset.validate_required([])
-  end
-end
 

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

@@ -1,26 +1,4 @@
 # NOTE: This file is auto generated by OpenAPI Generator 7.14.0-SNAPSHOT (https://openapi-generator.tech).
 # Do not edit this file manually.
 
-defmodule OpenapiPetstore.Model.OuterEnumIntegerDefaultValue do
-  @moduledoc """
-  
-  """
-  use Ecto.Schema
-
-  @type t :: %__MODULE__{
-    
-  }
-
-  @derive {JSON.Encoder, only: []}
-  @primary_key false
-  embedded_schema do
-  end
-
-  @spec changeset(t(), map()) :: Ecto.Changeset.t()
-  def changeset(%__MODULE__{} = struct, params) do
-    struct
-    |> Ecto.Changeset.cast(params, [])
-    |> Ecto.Changeset.validate_required([])
-  end
-end
 

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

@@ -14,15 +14,14 @@ defmodule OpenapiPetstore.Model.OuterObjectWithEnumProperty do
   @derive {JSON.Encoder, only: [:value]}
   @primary_key false
   embedded_schema do
-    embeds_one :value, OpenapiPetstore.Model.OuterEnumInteger
+    field :value, Ecto.Enum, values: [:"0", :"1", :"2"]
   end
 
   @spec changeset(t(), map()) :: Ecto.Changeset.t()
   def changeset(%__MODULE__{} = struct, params) do
     struct
-    |> Ecto.Changeset.cast(params, [])
-    |> Ecto.Changeset.validate_required([])
-    |> Ecto.Changeset.cast_embed(:value, required: true)
+    |> Ecto.Changeset.cast(params, [:value])
+    |> Ecto.Changeset.validate_required([:value])
   end
 end