fix: #1530 use discriminator with several mappings for one schema

deepmap · Apr 8, 2024 · 605d9e3 · 605d9e3
1 parent 80f0b97
commit 605d9e3
Show file tree

Hide file tree

Showing 5 changed files with 189 additions and 2 deletions.
diff --git a/internal/test/issues/issue-1530/config.yaml b/internal/test/issues/issue-1530/config.yaml
@@ -0,0 +1,4 @@
+package: param
+generate:
+  models: true
+output: issue1530.gen.go
diff --git a/internal/test/issues/issue-1530/doc.go b/internal/test/issues/issue-1530/doc.go
@@ -0,0 +1,3 @@
+package param
+
+//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1530.yaml
diff --git a/internal/test/issues/issue-1530/issue1530.gen.go b/internal/test/issues/issue-1530/issue1530.gen.go
diff --git a/internal/test/issues/issue-1530/issue1530.yaml b/internal/test/issues/issue-1530/issue1530.yaml
@@ -0,0 +1,40 @@
+openapi: 3.0.0
+paths:
+  /test:
+    get:
+      operationId: Test
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/pet'
+components:
+  schemas:
+    dog:
+      type: object
+      required:
+        - breed
+      properties:
+        breed:
+          type: string
+          enum: [ poodle, beagle ]
+    cat:
+      type: object
+      required:
+        - breed
+      properties:
+        breed:
+          type: string
+          enum: [ maine_coon, ragdoll ]
+    pet:
+      oneOf:
+        - $ref: "#/components/schemas/dog"
+        - $ref: "#/components/schemas/cat"
+      discriminator:
+        propertyName: breed
+        mapping:
+          beagle: "#/components/schemas/dog"
+          maine_coon: "#/components/schemas/cat"
+          poodle: "#/components/schemas/dog"
+          ragdoll: "#/components/schemas/cat"
diff --git a/pkg/codegen/schema.go b/pkg/codegen/schema.go
@@ -863,7 +863,6 @@ func generateUnion(outSchema *Schema, elements openapi3.SchemaRefs, discriminato
 				if v == element.Ref {
 					outSchema.Discriminator.Mapping[k] = elementSchema.GoType
 					mapped = true
-					break
 				}
 			}
 			// Implicit mapping.
@@ -874,7 +873,7 @@ func generateUnion(outSchema *Schema, elements openapi3.SchemaRefs, discriminato
 		outSchema.UnionElements = append(outSchema.UnionElements, UnionElement(elementSchema.GoType))
 	}
 
-	if (outSchema.Discriminator != nil) && len(outSchema.Discriminator.Mapping) != len(elements) {
+	if (outSchema.Discriminator != nil) && len(outSchema.Discriminator.Mapping) < len(elements) {
 		return errors.New("discriminator: not all schemas were mapped")
 	}