better handling of enums

Author: efcasado

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

@@ -14,7 +14,12 @@
   @primary_key false
   embedded_schema do
   {{#ectoFields}}
+    {{#isEnum}}
+    field {{#atom}}{{&baseName}}{{/atom}}, Ecto.Enum, values: [{{#allowableValues}}{{#values}}{{#atom}}{{.}}{{/atom}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}]
+    {{/isEnum}}
+    {{^isEnum}}
     field {{#atom}}{{&baseName}}{{/atom}}, {{{ectoType}}}
+    {{/isEnum}}
   {{/ectoFields}}
   {{#ectoEmbeds}}
     {{^isArray}}embeds_one{{/isArray}}{{#isArray}}embeds_many{{/isArray}} {{#atom}}{{&baseName}}{{/atom}}, {{&moduleName}}.Model.{{^isArray}}{{{baseType}}}{{/isArray}}{{#isArray}}{{{items.baseType}}}{{/isArray}}

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

@@ -16,7 +16,7 @@ defmodule OpenapiPetstore.Model.ChildWithNullable do
   @derive {JSON.Encoder, only: [:type, :nullableProperty, :otherProperty]}
   @primary_key false
   embedded_schema do
-    field :type, :string
+    field :type, Ecto.Enum, values: [:ChildWithNullable]
     field :nullableProperty, :string
     field :otherProperty, :string
   end

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

@@ -15,8 +15,8 @@ defmodule OpenapiPetstore.Model.EnumArrays do
   @derive {JSON.Encoder, only: [:just_symbol, :array_enum]}
   @primary_key false
   embedded_schema do
-    field :just_symbol, :string
-    field :array_enum, {:array, :string}
+    field :just_symbol, Ecto.Enum, values: [:">=", :"$"]
+    field :array_enum, Ecto.Enum, values: [:fish, :crab]
   end
 
   @spec changeset(t(), map()) :: Ecto.Changeset.t()

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

@@ -21,10 +21,10 @@ defmodule OpenapiPetstore.Model.EnumTest do
   @derive {JSON.Encoder, only: [:enum_string, :enum_string_required, :enum_integer, :enum_number, :outerEnum, :outerEnumInteger, :outerEnumDefaultValue, :outerEnumIntegerDefaultValue]}
   @primary_key false
   embedded_schema do
-    field :enum_string, :string
-    field :enum_string_required, :string
-    field :enum_integer, :integer
-    field :enum_number, :float
+    field :enum_string, Ecto.Enum, values: [:UPPER, :lower, :""]
+    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

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

@@ -18,7 +18,7 @@ defmodule OpenapiPetstore.Model.MapTest do
   @primary_key false
   embedded_schema do
     field :map_map_of_string, :map
-    field :map_of_enum_string, :map
+    field :map_of_enum_string, Ecto.Enum, values: [:UPPER, :lower]
     field :direct_map, :map
     field :indirect_map, :map
   end

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

@@ -23,7 +23,7 @@ defmodule OpenapiPetstore.Model.Order do
     field :petId, :integer
     field :quantity, :integer
     field :shipDate, :utc_datetime
-    field :status, :string
+    field :status, Ecto.Enum, values: [:placed, :approved, :delivered]
     field :complete, :boolean
   end
 

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

@@ -15,7 +15,7 @@ defmodule OpenapiPetstore.Model.ParentWithNullable do
   @derive {JSON.Encoder, only: [:type, :nullableProperty]}
   @primary_key false
   embedded_schema do
-    field :type, :string
+    field :type, Ecto.Enum, values: [:ChildWithNullable]
     field :nullableProperty, :string
   end
 

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

@@ -22,7 +22,7 @@ defmodule OpenapiPetstore.Model.Pet do
     field :id, :integer
     field :name, :string
     field :photoUrls, {:array, :string}
-    field :status, :string
+    field :status, Ecto.Enum, values: [:available, :pending, :sold]
     embeds_one :category, OpenapiPetstore.Model.Category
     embeds_many :tags, OpenapiPetstore.Model.Tag
   end

samples/client/petstore/elixir/test/deserializer_test.exs

@@ -24,7 +24,7 @@ defmodule DeserializerTest do
         "name": "sea"
       }
     ],
-    "status": "foo"
+    "status": "available"
   }
   """
 
@@ -41,7 +41,7 @@ defmodule DeserializerTest do
         name: "Nagga",
         photoUrls: ["https://example.com/nagga1.jpg", "https://example.com/nagga2.jpg"],
         tags: [%Tag{id: 99, name: "dragon"}, %Tag{id: 23, name: "sea"}],
-        status: "foo"
+        status: :available
       }
   end