Merge pull request #1195 from tdakkota/fix/use-json-schema-names

ernado · web-flow · commit 5e7d8f909b27 · 2024-03-11T10:28:04.000+03:00
fix(gen): use spec names instead of Go names to infer discriminator
diff --git a/gen/schema_gen_sum.go b/gen/schema_gen_sum.go
@@ -371,7 +371,7 @@ func (g *schemaGen) oneOf(name string, schema *jsonschema.Schema, side bool) (*i
 			)
 		}
 		for _, f := range s.JSON().Fields() {
-			uniq[s.Name][f.Name] = struct{}{}
+			uniq[s.Name][f.Tag.JSON] = struct{}{}
 		}
 	}
 	{
@@ -485,7 +485,7 @@ func (g *schemaGen) oneOf(name string, schema *jsonschema.Schema, side bool) (*i
 				continue
 			}
 			for _, f := range s.JSON().Fields() {
-				if !slices.Contains(v.Unique, f.Name) {
+				if !slices.Contains(v.Unique, f.Tag.JSON) {
 					continue
 				}
 				s.SumSpec.Unique = append(s.SumSpec.Unique, f)

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ func (g schemaGen) oneOf(name string, schema jsonschema.Schema, side bool) (*i`
`371`	`371`	`)`
`372`	`372`	`}`
`373`	`373`	`for _, f := range s.JSON().Fields() {`
`374`		`- uniq[s.Name][f.Name] = struct{}{}`
	`374`	`+ uniq[s.Name][f.Tag.JSON] = struct{}{}`
`375`	`375`	`}`
`376`	`376`	`}`
`377`	`377`	`{`
`@@ -485,7 +485,7 @@ func (g schemaGen) oneOf(name string, schema jsonschema.Schema, side bool) (*i`
`485`	`485`	`continue`
`486`	`486`	`}`
`487`	`487`	`for _, f := range s.JSON().Fields() {`
`488`		`- if !slices.Contains(v.Unique, f.Name) {`
	`488`	`+ if !slices.Contains(v.Unique, f.Tag.JSON) {`
`489`	`489`	`continue`
`490`	`490`	`}`
`491`	`491`	`s.SumSpec.Unique = append(s.SumSpec.Unique, f)`