Skip to content

feat: add force decode as string #1036

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
vyegres wants to merge 2 commits into from
Closed

feat: add force decode as string #1036

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c2f204
feat: add force decode as string
Apr 26, 2023
bcbb71a
Merge branch 'master' into master
vyegres May 11, 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
34 changes: 28 additions & 6 deletions pkg/codegen/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ type Schema struct {

SkipOptionalPointer bool // Some types don't need a * in front when they're optional

ForceCodeAsString bool //Some non string types need to encode/decode as string

Description string // The description of the element

UnionElements []UnionElement // Possible elements of oneOf/anyOf union
Expand Down Expand Up @@ -559,6 +561,18 @@ func oapiSchemaToGoType(schema *openapi3.Schema, path []string, outSchema *Schem
case "string":
// Special case string formats here.
switch f {
case "int64":
outSchema.GoType = "int64"
outSchema.ForceCodeAsString = true
case "uint64":
outSchema.GoType = "uint64"
outSchema.ForceCodeAsString = true
case "double":
outSchema.GoType = "float64"
outSchema.ForceCodeAsString = true
case "float":
outSchema.GoType = "float32"
outSchema.ForceCodeAsString = true
case "byte":
outSchema.GoType = "[]byte"
case "email":
Expand Down Expand Up @@ -651,15 +665,23 @@ func GenFieldsFromProperties(props []Property) []string {

fieldTags := make(map[string]string)

if !omitEmpty {
fieldTags["json"] = p.JsonFieldName

fieldTags["json"] = p.JsonFieldName
if p.NeedsFormTag {
fieldTags["form"] = p.JsonFieldName
}

if omitEmpty {
fieldTags["json"] = fieldTags["json"] + ",omitempty"
if p.NeedsFormTag {
fieldTags["form"] = p.JsonFieldName
fieldTags["form"] = fieldTags["form"] + ",omitempty"
}
} else {
fieldTags["json"] = p.JsonFieldName + ",omitempty"
}

if p.Schema.ForceCodeAsString {
fieldTags["json"] = fieldTags["json"] + ",string"
if p.NeedsFormTag {
fieldTags["form"] = p.JsonFieldName + ",omitempty"
fieldTags["form"] = fieldTags["form"] + ",string"
}
}

Expand Down