Skip to content

Commit e1ee727

Browse files
bahkauv70bahkauv70
committed
fix: beta apis compiling now
1 parent c0b606c commit e1ee727

File tree

2 files changed

+103
-7
lines changed

2 files changed

+103
-7
lines changed

‎templates/go/api_test.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func Test_{{packageName}}_{{classname}}Service(t *testing.T) {
2828
{{#operation}}
2929
t.Run("Test {{classname}}Service {{{nickname}}}", func(t *testing.T) {
3030
_apiUrlPath := "{{{path}}}"{{#pathParams}}
31-
{{paramName}}Value := {{#isAnyType}}"unspecified type"{{/isAnyType}}{{#isString}}"{{paramName}}"{{/isString}}{{#isNumber}}123{{/isNumber}}{{#isFloat}}float32(123){{/isFloat}}{{#isDouble}}float64(123){{/isDouble}}{{#isInteger}}int32(123){{/isInteger}}{{#isLong}}int64(123){{/isLong}}{{^isString}}{{^isInteger}}{{defaultValue}}{{/isInteger}}{{/isString}}
31+
{{paramName}}Value := {{#isAnyType}}"unspecified type"{{/isAnyType}}{{#isString}}{{#isUuid}}uuid.NewString(){{/isUuid}}{{^isUuid}}"{{paramName}}"{{/isUuid}}{{/isString}}{{#isNumber}}123{{/isNumber}}{{#isFloat}}float32(123){{/isFloat}}{{#isDouble}}float64(123){{/isDouble}}{{#isInteger}}int32(123){{/isInteger}}{{#isLong}}int64(123){{/isLong}}{{^isString}}{{^isInteger}}{{defaultValue}}{{/isInteger}}{{/isString}}
3232
_apiUrlPath = strings.Replace(_apiUrlPath, "{"+"{{baseName}}"+"}", url.PathEscape(ParameterValueToString({{paramName}}Value, "{{paramName}}")), -1){{/pathParams}}
3333

3434
test{{classname}}ServeMux := http.NewServeMux()
@@ -79,7 +79,7 @@ func Test_{{packageName}}_{{classname}}Service(t *testing.T) {
7979
{{#allParams}}
8080
{{#required}}
8181
{{#isPathParam}}
82-
{{paramName}} := {{#isAnyType}}"unspecified type"{{/isAnyType}}{{#isString}}"{{paramName}}"{{/isString}}{{#isNumber}}123{{/isNumber}}{{#isFloat}}float32(123){{/isFloat}}{{#isDouble}}float64(123){{/isDouble}}{{#isInteger}}int32(123){{/isInteger}}{{#isLong}}int64(123){{/isLong}}{{^isString}}{{^isInteger}}{{defaultValue}}{{/isInteger}}{{/isString}}
82+
{{paramName}} := {{paramName}}Value
8383
{{/isPathParam}}
8484
{{^isPathParam}}
8585
{{#isPrimitiveType}}

‎templates/go/model_simple.mustache‎

Lines changed: 101 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ var _ MappedNullable = &{{classname}}{}
88
*/
99
{{^isEnum}}
1010
{{#isNumber}}
11+
// isNumber
1112
type {{classname}}{{name}}AttributeType = *float64
1213
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}float64
1314
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}float64
@@ -27,8 +28,51 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
2728
*arg={{^isNullable}}&{{/isNullable}}val
2829
}
2930
{{/isNumber}}
31+
{{#isFloat}}
32+
// isFloat
33+
type {{classname}}{{name}}AttributeType = *float64
34+
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}float64
35+
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}float64
36+
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
37+
if arg == nil {
38+
{{#isNullable}}
39+
return nil,false
40+
{{/isNullable}}
41+
{{^isNullable}}
42+
return ret,false
43+
{{/isNullable}}
44+
}
45+
return {{^isNullable}}*{{/isNullable}}arg,true
46+
}
47+
48+
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
49+
*arg={{^isNullable}}&{{/isNullable}}val
50+
}
51+
{{/isFloat}}
52+
{{#isDouble}}
53+
// isDouble
54+
type {{classname}}{{name}}AttributeType = *float64
55+
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}float64
56+
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}float64
57+
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
58+
if arg == nil {
59+
{{#isNullable}}
60+
return nil,false
61+
{{/isNullable}}
62+
{{^isNullable}}
63+
return ret,false
64+
{{/isNullable}}
65+
}
66+
return {{^isNullable}}*{{/isNullable}}arg,true
67+
}
68+
69+
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
70+
*arg={{^isNullable}}&{{/isNullable}}val
71+
}
72+
{{/isDouble}}
3073
{{#isShort}}
3174
{{^isInteger}}
75+
// isShort
3276
type {{classname}}{{name}}AttributeType = *int64
3377
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}int64
3478
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}int64
@@ -50,6 +94,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
5094
{{/isInteger}}
5195
{{/isShort}}
5296
{{#isInteger}}
97+
// isInteger
5398
type {{classname}}{{name}}AttributeType = *int64
5499
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}int64
55100
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}int64
@@ -70,6 +115,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
70115
}
71116
{{/isInteger}}
72117
{{#isLong}}
118+
// isLong
73119
type {{classname}}{{name}}AttributeType = *int64
74120
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}int64
75121
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}int64
@@ -91,7 +137,8 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
91137
{{/isLong}}
92138
{{#isString}}
93139
{{#isNullable}}
94-
type {{classname}}{{name}}AttributeType = *{{dataType}}
140+
// isNullableString
141+
type {{classname}}{{name}}AttributeType = *NullableString
95142
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
96143
if arg == nil {
97144
{{#isNullable}}
@@ -113,6 +160,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
113160
}
114161
{{/isNullable}}
115162
{{^isNullable}}
163+
// isNotNullableString
116164
type {{classname}}{{name}}AttributeType = *string
117165
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
118166
if arg == nil {
@@ -133,9 +181,31 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
133181
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}string
134182
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}string
135183
{{/isString}}
184+
{{#isAnyType}}
185+
// isAny
186+
type {{classname}}{{name}}AttributeType = any
187+
type {{classname}}{{name}}ArgType = any
188+
type {{classname}}{{name}}RetType = any
189+
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
190+
if arg == nil {
191+
{{#isNullable}}
192+
return nil,false
193+
{{/isNullable}}
194+
{{^isNullable}}
195+
return ret,false
196+
{{/isNullable}}
197+
}
198+
return {{^isNullable}}*{{/isNullable}}arg,true
199+
}
200+
201+
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
202+
*arg={{^isNullable}}&{{/isNullable}}val
203+
}
204+
{{/isAnyType}}
136205
{{/isEnum}}
137206

138207
{{#isDateTime}}
208+
// isDateTime
139209
type {{classname}}{{name}}AttributeType = *time.Time
140210
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}time.Time
141211
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}time.Time
@@ -155,7 +225,29 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
155225
*arg={{^isNullable}}&{{/isNullable}}val
156226
}
157227
{{/isDateTime}}
228+
{{#isDate}}
229+
// isDate
230+
type {{classname}}{{name}}AttributeType = *time.Time
231+
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}time.Time
232+
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}time.Time
233+
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
234+
if arg == nil {
235+
{{#isNullable}}
236+
return nil,false
237+
{{/isNullable}}
238+
{{^isNullable}}
239+
return ret,false
240+
{{/isNullable}}
241+
}
242+
return {{^isNullable}}*{{/isNullable}}arg,true
243+
}
244+
245+
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
246+
*arg={{^isNullable}}&{{/isNullable}}val
247+
}
248+
{{/isDate}}
158249
{{#isEnumRef}}
250+
// isEnumRef
159251
type {{classname}}{{name}}AttributeType = *{{^isNumeric}}{{dataType}}{{/isNumeric}}{{#isNumeric}}int64{{/isNumeric}}
160252
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{^isNumeric}}{{dataType}}{{/isNumeric}}{{#isNumeric}}int64{{/isNumeric}}
161253
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{^isNumeric}}{{dataType}}{{/isNumeric}}{{#isNumeric}}int64{{/isNumeric}}
@@ -176,6 +268,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
176268
}
177269
{{/isEnumRef}}
178270
{{#isModel}}
271+
// isModel
179272
type {{classname}}{{name}}AttributeType = *{{dataType}}
180273
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{dataType}}
181274
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{dataType}}
@@ -227,6 +320,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
227320
{{/isModel}}
228321
{{/isPrimitiveType}}
229322
{{#isArray}}
323+
// isArray
230324
type {{classname}}{{name}}AttributeType = *{{dataType}}
231325
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{dataType}}
232326
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{dataType}}
@@ -249,7 +343,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
249343

250344

251345
{{#isFreeFormObject}}
252-
// freeform
346+
// isFreeform
253347
type {{classname}}{{name}}AttributeType = *{{dataType}}
254348
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{dataType}}
255349
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{dataType}}
@@ -272,7 +366,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
272366
{{#isContainer}}
273367
{{^isFreeFormObject}}
274368
{{^isArray}}
275-
// container
369+
// isContainer
276370
type {{classname}}{{name}}AttributeType = *{{dataType}}
277371
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{dataType}}
278372
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{dataType}}
@@ -295,6 +389,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
295389
{{/isFreeFormObject}}
296390
{{/isContainer}}
297391
{{#isByteArray}}
392+
// isByteArray
298393
type {{classname}}{{name}}AttributeType = *[]byte
299394
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}[]byte
300395
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}[]byte
@@ -315,6 +410,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
315410
}
316411
{{/isByteArray}}
317412
{{#isBoolean}}
413+
// isBoolean
318414
type {{classname}}{{name}}AttributeType = *bool
319415
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}bool
320416
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}bool
@@ -551,8 +647,8 @@ func (o {{classname}}) ToMap() (map[string]interface{}, error) {
551647
{{#vars}}
552648
{{! if argument is nullable, only serialize it if it is set}}
553649
{{! if argument is not nullable, don't set it if it is nil}}
554-
if !IsNil(o.{{name}}) {
555-
toSerialize["{{{name}}}"] = {{#isNullable}}*{{/isNullable}}o.{{name}}
650+
if val,ok:=get{{classname}}{{name}}AttributeTypeOk(o.{{name}});ok {
651+
toSerialize["{{{name}}}"] = val
556652
}
557653
{{/vars}}
558654
{{#isAdditionalPropertiesTrue}}

0 commit comments

Comments
 (0)