Skip to content

Commit 4131da3

Browse files
bahkauv70bahkauv70
committed
fix: beta apis compiling now
1 parent 59ebd0d commit 4131da3

File tree

2 files changed

+105
-7
lines changed

2 files changed

+105
-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: 103 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
@@ -90,8 +136,10 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
90136
}
91137
{{/isLong}}
92138
{{#isString}}
139+
{{^isArray}}
93140
{{#isNullable}}
94-
type {{classname}}{{name}}AttributeType = *{{dataType}}
141+
// isNullableString
142+
type {{classname}}{{name}}AttributeType = *NullableString
95143
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
96144
if arg == nil {
97145
{{#isNullable}}
@@ -113,6 +161,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
113161
}
114162
{{/isNullable}}
115163
{{^isNullable}}
164+
// isNotNullableString
116165
type {{classname}}{{name}}AttributeType = *string
117166
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
118167
if arg == nil {
@@ -132,10 +181,33 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
132181
{{/isNullable}}
133182
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}string
134183
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}string
184+
{{/isArray}}
135185
{{/isString}}
186+
{{#isAnyType}}
187+
// isAny
188+
type {{classname}}{{name}}AttributeType = any
189+
type {{classname}}{{name}}ArgType = any
190+
type {{classname}}{{name}}RetType = any
191+
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
192+
if arg == nil {
193+
{{#isNullable}}
194+
return nil,false
195+
{{/isNullable}}
196+
{{^isNullable}}
197+
return ret,false
198+
{{/isNullable}}
199+
}
200+
return {{^isNullable}}*{{/isNullable}}arg,true
201+
}
202+
203+
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
204+
*arg={{^isNullable}}&{{/isNullable}}val
205+
}
206+
{{/isAnyType}}
136207
{{/isEnum}}
137208

138209
{{#isDateTime}}
210+
// isDateTime
139211
type {{classname}}{{name}}AttributeType = *time.Time
140212
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}time.Time
141213
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}time.Time
@@ -155,7 +227,29 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
155227
*arg={{^isNullable}}&{{/isNullable}}val
156228
}
157229
{{/isDateTime}}
230+
{{#isDate}}
231+
// isDate
232+
type {{classname}}{{name}}AttributeType = *time.Time
233+
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}time.Time
234+
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}time.Time
235+
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
236+
if arg == nil {
237+
{{#isNullable}}
238+
return nil,false
239+
{{/isNullable}}
240+
{{^isNullable}}
241+
return ret,false
242+
{{/isNullable}}
243+
}
244+
return {{^isNullable}}*{{/isNullable}}arg,true
245+
}
246+
247+
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
248+
*arg={{^isNullable}}&{{/isNullable}}val
249+
}
250+
{{/isDate}}
158251
{{#isEnumRef}}
252+
// isEnumRef
159253
type {{classname}}{{name}}AttributeType = *{{^isNumeric}}{{dataType}}{{/isNumeric}}{{#isNumeric}}int64{{/isNumeric}}
160254
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{^isNumeric}}{{dataType}}{{/isNumeric}}{{#isNumeric}}int64{{/isNumeric}}
161255
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{^isNumeric}}{{dataType}}{{/isNumeric}}{{#isNumeric}}int64{{/isNumeric}}
@@ -176,6 +270,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
176270
}
177271
{{/isEnumRef}}
178272
{{#isModel}}
273+
// isModel
179274
type {{classname}}{{name}}AttributeType = *{{dataType}}
180275
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{dataType}}
181276
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{dataType}}
@@ -227,6 +322,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
227322
{{/isModel}}
228323
{{/isPrimitiveType}}
229324
{{#isArray}}
325+
// isArray
230326
type {{classname}}{{name}}AttributeType = *{{dataType}}
231327
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{dataType}}
232328
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{dataType}}
@@ -249,7 +345,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
249345

250346

251347
{{#isFreeFormObject}}
252-
// freeform
348+
// isFreeform
253349
type {{classname}}{{name}}AttributeType = *{{dataType}}
254350
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{dataType}}
255351
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{dataType}}
@@ -272,7 +368,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
272368
{{#isContainer}}
273369
{{^isFreeFormObject}}
274370
{{^isArray}}
275-
// container
371+
// isContainer
276372
type {{classname}}{{name}}AttributeType = *{{dataType}}
277373
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{dataType}}
278374
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{dataType}}
@@ -295,6 +391,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
295391
{{/isFreeFormObject}}
296392
{{/isContainer}}
297393
{{#isByteArray}}
394+
// isByteArray
298395
type {{classname}}{{name}}AttributeType = *[]byte
299396
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}[]byte
300397
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}[]byte
@@ -315,6 +412,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
315412
}
316413
{{/isByteArray}}
317414
{{#isBoolean}}
415+
// isBoolean
318416
type {{classname}}{{name}}AttributeType = *bool
319417
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}bool
320418
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}bool
@@ -551,8 +649,8 @@ func (o {{classname}}) ToMap() (map[string]interface{}, error) {
551649
{{#vars}}
552650
{{! if argument is nullable, only serialize it if it is set}}
553651
{{! 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}}
652+
if val,ok:=get{{classname}}{{name}}AttributeTypeOk(o.{{name}});ok {
653+
toSerialize["{{{name}}}"] = val
556654
}
557655
{{/vars}}
558656
{{#isAdditionalPropertiesTrue}}

0 commit comments

Comments
 (0)