feat: maps with nested models

Author: efcasado

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

@@ -360,6 +360,10 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
         supportingFiles.add(new SupportingFile("request_builder.ex.mustache",
                 sourceFolder(),
                 "request_builder.ex"));
+
+        supportingFiles.add(new SupportingFile("ecto_utils.ex.mustache",
+                sourceFolder(),
+                "ecto_utils.ex"));
     }
 
     @Override
@@ -454,6 +458,13 @@ public CodegenModel fromModel(String name, Schema model) {
         for (CodegenProperty field : ectoEnums) {
             ecm.ectoEnums.add(new ExtendedCodegenProperty(field));
         }
+
+
+        List<CodegenProperty> ectoMaps = new ArrayList<>(ecm.ectoMaps);
+        ecm.ectoMaps.clear();
+        for (CodegenProperty field : ectoMaps) {
+            ecm.ectoMaps.add(new ExtendedCodegenProperty(field));
+        }
 
         return ecm;
     }
@@ -939,6 +950,7 @@ class ExtendedCodegenModel extends CodegenModel {
         public List<CodegenProperty> ectoFields = new ArrayList<>();
         public List<CodegenProperty> ectoEmbeds = new ArrayList<>();
         public List<CodegenProperty> ectoEnums = new ArrayList<>();
+        public List<CodegenProperty> ectoMaps = new ArrayList<>();
         public List<CodegenProperty> requiredEctoFields = new ArrayList<>();
 
         public ExtendedCodegenModel(CodegenModel cm) {
@@ -1003,6 +1015,9 @@ public ExtendedCodegenModel(CodegenModel cm) {
                     if (var.isEnum || var.isEnumRef) {
                         this.ectoEnums.add(var);
                     }
+                    if (var.isMap && !var.isFreeFormObject && var.additionalProperties != null && var.additionalProperties.isModel) {
+                        this.ectoMaps.add(var);
+                    }
                 } else {
                     this.ectoEmbeds.add(var);
                 }
@@ -1012,6 +1027,8 @@ public ExtendedCodegenModel(CodegenModel cm) {
 
     class ExtendedCodegenProperty extends CodegenProperty {
         public String enumBaseType;
+        public String mapValueType;
+        public boolean isMapWithSchema;
 
         public ExtendedCodegenProperty(CodegenProperty cp) {
             super();
@@ -1103,6 +1120,17 @@ public ExtendedCodegenProperty(CodegenProperty cp) {
                     this.enumBaseType = "String.t";
                 }
             }
+            // For map properties, extract the model name from additionalProperties
+            if (cp.isMap && cp.additionalProperties != null) {
+                // Check if the map has a schema (model) or is a free-form map
+                if (cp.additionalProperties.isModel) {
+                    // Extract just the model name without the full type declaration
+                    this.mapValueType = cp.additionalProperties.complexType;
+                    this.isMapWithSchema = true;
+                } else {
+                    this.isMapWithSchema = false;
+                }
+            }
         }
 
         public String ectoType() {

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

@@ -0,0 +1,33 @@
+{{>licenseInfo}}
+defmodule {{moduleName}}.EctoUtils do
+  def cast_nested_map(changeset, field, schema) do
+    case Map.get(changeset.changes, field) do
+      nil ->
+        changeset
+
+      values ->
+        {result_map, errors} =
+          Enum.reduce(values, {%{}, []}, fn {key, params}, {acc, errs} ->
+            changeset = schema.changeset(struct(schema), params)
+
+            case Ecto.Changeset.apply_action(changeset, changeset.action || :insert) do
+              {:ok, struct} ->
+                {Map.put(acc, key, struct), errs}
+
+              {:error, nested_cs} ->
+                {Map.put(acc, key, nested_cs), [{key, nested_cs} | errs]}
+            end
+          end)
+
+        changeset =
+          Ecto.Changeset.put_change(changeset, field, result_map)
+
+        if errors == [] do
+          changeset
+        else
+          Ecto.Changeset.add_error(changeset, field, "contains invalid nested entries")
+          |> Map.put(:valid?, false)
+        end
+    end
+  end
+end

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

@@ -29,6 +29,9 @@
     {{#ectoEnums}}
     |> Ecto.Changeset.validate_inclusion({{#atom}}{{&baseName}}{{/atom}}, [{{#allowableValues}}{{#values}}{{#quoteIfString}}{{.}}{{/quoteIfString}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}])
     {{/ectoEnums}}
+    {{#ectoMaps}}
+    |> {{moduleName}}.EctoUtils.cast_nested_map({{#atom}}{{&baseName}}{{/atom}}, {{&moduleName}}.Model.{{{mapValueType}}})
+    {{/ectoMaps}}
     {{#ectoEmbeds}}
     |> Ecto.Changeset.cast_embed({{#atom}}{{&baseName}}{{/atom}}{{#required}}, required: true{{/required}})
     {{/ectoEmbeds}}

samples/client/petstore/elixir/.openapi-generator/FILES

@@ -11,6 +11,7 @@ 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/ecto_utils.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

samples/client/petstore/elixir/lib/openapi_petstore/ecto_utils.ex

@@ -0,0 +1,35 @@
+# 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.EctoUtils do
+  def cast_nested_map(changeset, field, schema) do
+    case Map.get(changeset.changes, field) do
+      nil ->
+        changeset
+
+      values ->
+        {result_map, errors} =
+          Enum.reduce(values, {%{}, []}, fn {key, params}, {acc, errs} ->
+            changeset = schema.changeset(struct(schema), params)
+
+            case Ecto.Changeset.apply_action(changeset, changeset.action || :insert) do
+              {:ok, struct} ->
+                {Map.put(acc, key, struct), errs}
+
+              {:error, nested_cs} ->
+                {Map.put(acc, key, nested_cs), [{key, nested_cs} | errs]}
+            end
+          end)
+
+        changeset =
+          Ecto.Changeset.put_change(changeset, field, result_map)
+
+        if errors == [] do
+          changeset
+        else
+          Ecto.Changeset.add_error(changeset, field, "contains invalid nested entries")
+          |> Map.put(:valid?, false)
+        end
+    end
+  end
+end

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

@@ -26,6 +26,7 @@ defmodule OpenapiPetstore.Model.MixedPropertiesAndAdditionalPropertiesClass do
     struct
     |> Ecto.Changeset.cast(params, [:uuid, :dateTime, :map])
     |> Ecto.Changeset.validate_required([])
+    |> OpenapiPetstore.EctoUtils.cast_nested_map(:map, OpenapiPetstore.Model.Animal)
   end
 end