Skip to content

Fix generate equals structs #1005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
l3xx wants to merge 2 commits into from
Closed

Fix generate equals structs #1005

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3841294
bugfix generate same struct
Mar 15, 2023
d211115
Merge branch 'master' of github.com:l3xx/oapi-codegen
Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions pkg/codegen/operations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,12 @@ func GenerateBodyDefinitions(operationID string, bodyOrRef *openapi3.RequestBody
}
body := bodyOrRef.Value

var bodyDefinitions []RequestBodyDefinition
var typeDefinitions []TypeDefinition
var (
bodyDefinitions []RequestBodyDefinition
bodyDefinitionsNamesMap map[string]struct{}
typeDefinitions []TypeDefinition
)
bodyDefinitionsNamesMap = make(map[string]struct{})

for _, contentType := range SortedContentKeys(body.Content) {
content := body.Content[contentType]
Expand All @@ -644,6 +648,11 @@ func GenerateBodyDefinitions(operationID string, bodyOrRef *openapi3.RequestBody
}

bodyTypeName := operationID + tag + "Body"
if _, ok := bodyDefinitionsNamesMap[bodyTypeName]; ok {
continue
}
bodyDefinitionsNamesMap[bodyTypeName] = struct{}{}

bodySchema, err := GenerateGoSchema(content.Schema, []string{bodyTypeName})
if err != nil {
return nil, nil, fmt.Errorf("error generating request body definition: %w", err)
Expand Down