Fixed generation of allOf models

epam-cross-platform-lab · Jan 24, 2024 · b61b613 · b61b613
1 parent 77f17cb
commit b61b613
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/lib/src/code_generators/swagger_models_generator.dart b/lib/src/code_generators/swagger_models_generator.dart
@@ -145,6 +145,31 @@ abstract class SwaggerModelsGenerator extends SwaggerGeneratorBase {
  );
  }
 
+ Map<String, SwaggerSchema> getAllOfProperties(
+ SwaggerSchema schema,
+ Map<String, SwaggerSchema> classes,
+ ) {
+ final properties = schema.properties;
+ for (var element in schema.allOf) {
+ properties.addAll(element.properties);
+
+ if (element.ref.isNotEmpty) {
+ final neededClass = classes[element.ref.getUnformattedRef()];
+ properties.addAll(neededClass?.properties ?? {});
+
+ if (neededClass != null) {
+ properties.addAll(getAllOfProperties(neededClass, classes));
+ }
+ } else {
+ for (var allOf in element.allOf) {
+ properties.addAll(getAllOfProperties(allOf, classes));
+ }
+ }
+ }
+
+ return properties;
+ }
+
  Map<String, SwaggerSchema> getClassesFromInnerClasses(
  Map<String, SwaggerSchema> classes,
  ) {
@@ -156,6 +181,10 @@ abstract class SwaggerModelsGenerator extends SwaggerGeneratorBase {
  ...schema.items?.properties ?? {},
  };
 
+ final allOfProperties = getAllOfProperties(schema, classes);
+
+ properties.addAll(allOfProperties);
+
  for (var element in schema.allOf) {
  properties.addAll(element.properties);
 

diff --git a/lib/src/swagger_models/responses/swagger_schema.g.dart b/lib/src/swagger_models/responses/swagger_schema.g.dart