Fix to_dict method

Author: ottmar-zittlau

modules/openapi-generator/src/main/resources/python-pydantic-v1/model_generic.mustache

@@ -145,8 +145,9 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
         {{#allVars}}
         {{#isContainer}}
         {{#isArray}}
-        {{#items.isArray}}
+        {{#items.isContainer}}
         {{^items.items.isPrimitiveType}}
+        {{#items.isArray}}
         # override the default output from pydantic by calling `to_dict()` of each item in {{{name}}} (list of list)
         _items = []
         if self.{{{name}}}:
@@ -156,9 +157,21 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
                          [_inner_item.to_dict() for _inner_item in _item if _inner_item is not None]
                     )
             _dict['{{{baseName}}}'] = _items
-        {{/items.items.isPrimitiveType}}
         {{/items.isArray}}
-        {{^items.isArray}}
+        {{#items.isMap}}
+        # override the default output from pydantic by calling `to_dict()` of each item in {{{name}}} (list of map)
+        _items = []
+        if self.{{{name}}}:
+            for _item in self.{{{name}}}:
+                if _item:
+                    _items.append(
+                         {_inner_key: _inner_value.to_dict() for _inner_key, _inner_value in _item.items if _inner_value is not None}
+                    )
+            _dict['{{{baseName}}}'] = _items
+        {{/items.isMap}}
+        {{/items.items.isPrimitiveType}}
+        {{/items.isContainer}}
+        {{^items.isContainer}}
         {{^items.isPrimitiveType}}
         {{^items.isEnumOrRef}}
         # override the default output from pydantic by calling `to_dict()` of each item in {{{name}}} (list)
@@ -170,11 +183,12 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
             _dict['{{{baseName}}}'] = _items
         {{/items.isEnumOrRef}}
         {{/items.isPrimitiveType}}
-        {{/items.isArray}}
+        {{/items.isContainer}}
         {{/isArray}}
         {{#isMap}}
-        {{#items.isArray}}
+        {{#items.isContainer}}
         {{^items.items.isPrimitiveType}}
+        {{#items.isArray}}      
         # override the default output from pydantic by calling `to_dict()` of each value in {{{name}}} (dict of array)
         _field_dict_of_array = {}
         if self.{{{name}}}:
@@ -184,9 +198,21 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
                         _item.to_dict() for _item in self.{{{name}}}[_key]
                     ]
             _dict['{{{baseName}}}'] = _field_dict_of_array
-        {{/items.items.isPrimitiveType}}
         {{/items.isArray}}
-        {{^items.isArray}}
+        {{#items.isMap}}      
+        # override the default output from pydantic by calling `to_dict()` of each value in {{{name}}} (dict of dict)
+        _field_dict_of_dict = {}
+        if self.{{{name}}}:
+            for _key, _value in self.{{{name}}}.items():
+                if _value is not None:
+                    _field_dict_of_dict[_key] = {
+                        _inner_key: _inner_value.to_dict() for _inner_key, _inner_value in _value.items() if _inner_value is not None
+                    }
+            _dict['{{{baseName}}}'] = _field_dict_of_dict
+        {{/items.isMap}}
+        {{/items.items.isPrimitiveType}}
+        {{/items.isContainer}}
+        {{^items.isContainer}}
         {{^items.isPrimitiveType}}
         {{^items.isEnumOrRef}}
         # override the default output from pydantic by calling `to_dict()` of each value in {{{name}}} (dict)
@@ -198,7 +224,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
             _dict['{{{baseName}}}'] = _field_dict
         {{/items.isEnumOrRef}}
         {{/items.isPrimitiveType}}
-        {{/items.isArray}}
+        {{/items.isContainer}}
         {{/isMap}}
         {{/isContainer}}
         {{^isContainer}}