Make it the same way with AnyOf and OneOf

hiddenmarten · Dec 1, 2024 · f19f08e · f19f08e
1 parent 261bbbf
commit f19f08e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/internal/test/issues/issue-1476/issue1476.gen.go b/internal/test/issues/issue-1476/issue1476.gen.go
diff --git a/pkg/codegen/schema.go b/pkg/codegen/schema.go
@@ -392,15 +392,6 @@ func GenerateGoSchema(sref *openapi3.SchemaRef, path []string) (Schema, error) {
 			for _, pName := range SortedSchemaKeys(schema.Properties) {
 				p := schema.Properties[pName]
 
-				// Merge allOf in property
-				if p.Value.AllOf != nil {
-					val, err := mergeAllOf(p.Value.AllOf)
-					if err != nil {
-						return Schema{}, fmt.Errorf("error generating Go schema from allOf for property '%s': %w", pName, err)
-					}
-					p.Value = &val
-				}
-
 				propertyPath := append(path, pName)
 				pSchema, err := GenerateGoSchema(p, propertyPath)
 				if err != nil {
@@ -446,6 +437,11 @@ func GenerateGoSchema(sref *openapi3.SchemaRef, path []string) (Schema, error) {
 				}
 			}
 
+			if schema.AllOf != nil {
+				if err := generateUnion(&outSchema, schema.AllOf, schema.Discriminator, path); err != nil {
+					return Schema{}, fmt.Errorf("error generating type for allOf: %w", err)
+				}
+			}
 			if schema.AnyOf != nil {
 				if err := generateUnion(&outSchema, schema.AnyOf, schema.Discriminator, path); err != nil {
 					return Schema{}, fmt.Errorf("error generating type for anyOf: %w", err)