Skip to content

Commit c0b606c

Browse files
bahkauv70bahkauv70
committed
fix: generation working without compile issues, but broken tests
1 parent 35ba477 commit c0b606c

File tree

1 file changed

+90
-36
lines changed

1 file changed

+90
-36
lines changed

‎templates/go/model_simple.mustache‎

Lines changed: 90 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ var _ MappedNullable = &{{classname}}{}
66
/*
77
{{{.}}}
88
*/
9+
{{^isEnum}}
910
{{#isNumber}}
10-
type {{classname}}{{name}}AttributeType = float64
11+
type {{classname}}{{name}}AttributeType = *float64
1112
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}float64
1213
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}float64
1314
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
@@ -27,6 +28,7 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
2728
}
2829
{{/isNumber}}
2930
{{#isShort}}
31+
{{^isInteger}}
3032
type {{classname}}{{name}}AttributeType = *int64
3133
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}int64
3234
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}int64
@@ -45,6 +47,7 @@ func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeT
4547
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
4648
*arg={{^isNullable}}&{{/isNullable}}val
4749
}
50+
{{/isInteger}}
4851
{{/isShort}}
4952
{{#isInteger}}
5053
type {{classname}}{{name}}AttributeType = *int64
@@ -86,6 +89,52 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
8689
*arg={{^isNullable}}&{{/isNullable}}val
8790
}
8891
{{/isLong}}
92+
{{#isString}}
93+
{{#isNullable}}
94+
type {{classname}}{{name}}AttributeType = *{{dataType}}
95+
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
96+
if arg == nil {
97+
{{#isNullable}}
98+
return nil,false
99+
{{/isNullable}}
100+
{{^isNullable}}
101+
return ret,false
102+
{{/isNullable}}
103+
}
104+
return arg.Get(),true
105+
}
106+
107+
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
108+
if IsNil(*arg) {
109+
*arg = NewNullableString(val)
110+
} else {
111+
(*arg).Set(val)
112+
}
113+
}
114+
{{/isNullable}}
115+
{{^isNullable}}
116+
type {{classname}}{{name}}AttributeType = *string
117+
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
118+
if arg == nil {
119+
{{#isNullable}}
120+
return nil,false
121+
{{/isNullable}}
122+
{{^isNullable}}
123+
return ret,false
124+
{{/isNullable}}
125+
}
126+
return {{^isNullable}}*{{/isNullable}}arg,true
127+
}
128+
129+
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
130+
*arg={{^isNullable}}&{{/isNullable}}val
131+
}
132+
{{/isNullable}}
133+
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}string
134+
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}string
135+
{{/isString}}
136+
{{/isEnum}}
137+
89138
{{#isDateTime}}
90139
type {{classname}}{{name}}AttributeType = *time.Time
91140
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}time.Time
@@ -107,9 +156,9 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
107156
}
108157
{{/isDateTime}}
109158
{{#isEnumRef}}
110-
type {{classname}}{{name}}AttributeType = *string
111-
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}string
112-
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}string
159+
type {{classname}}{{name}}AttributeType = *{{^isNumeric}}{{dataType}}{{/isNumeric}}{{#isNumeric}}int64{{/isNumeric}}
160+
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{^isNumeric}}{{dataType}}{{/isNumeric}}{{#isNumeric}}int64{{/isNumeric}}
161+
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{^isNumeric}}{{dataType}}{{/isNumeric}}{{#isNumeric}}int64{{/isNumeric}}
113162
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
114163
if arg == nil {
115164
{{#isNullable}}
@@ -146,7 +195,13 @@ func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeTy
146195
*arg={{^isNullable}}&{{/isNullable}}val
147196
}
148197
{{/isModel}}
149-
{{#isArray}}
198+
{{^isPrimitiveType}}
199+
{{^isModel}}
200+
{{^isMap}}
201+
{{^isArray}}
202+
{{^isDateTime}}
203+
{{^isEnumRef}}
204+
// fallback
150205
type {{classname}}{{name}}AttributeType = *{{dataType}}
151206
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{dataType}}
152207
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{dataType}}
@@ -165,11 +220,16 @@ func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeT
165220
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
166221
*arg={{^isNullable}}&{{/isNullable}}val
167222
}
223+
{{/isEnumRef}}
224+
{{/isDateTime}}
168225
{{/isArray}}
169-
170-
{{#isString}}
171-
{{#isNullable}}
226+
{{/isMap}}
227+
{{/isModel}}
228+
{{/isPrimitiveType}}
229+
{{#isArray}}
172230
type {{classname}}{{name}}AttributeType = *{{dataType}}
231+
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{dataType}}
232+
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{dataType}}
173233
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
174234
if arg == nil {
175235
{{#isNullable}}
@@ -179,19 +239,20 @@ func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeT
179239
return ret,false
180240
{{/isNullable}}
181241
}
182-
return arg.Get(),true
242+
return {{^isNullable}}*{{/isNullable}}arg,true
183243
}
184244

185245
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
186-
if IsNil(*arg) {
187-
*arg = NewNullableString(val)
188-
} else {
189-
(*arg).Set(val)
190-
}
246+
*arg={{^isNullable}}&{{/isNullable}}val
191247
}
192-
{{/isNullable}}
193-
{{^isNullable}}
194-
type {{classname}}{{name}}AttributeType = *string
248+
{{/isArray}}
249+
250+
251+
{{#isFreeFormObject}}
252+
// freeform
253+
type {{classname}}{{name}}AttributeType = *{{dataType}}
254+
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{dataType}}
255+
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{dataType}}
195256
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
196257
if arg == nil {
197258
{{#isNullable}}
@@ -207,15 +268,14 @@ func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeT
207268
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
208269
*arg={{^isNullable}}&{{/isNullable}}val
209270
}
210-
{{/isNullable}}
211-
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}string
212-
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}string
213-
{{/isString}}
214-
215-
{{#isFreeFormObject}}
216-
type {{classname}}{{name}}AttributeType = *map[string]any
217-
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}map[string]any
218-
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}map[string]any
271+
{{/isFreeFormObject}}
272+
{{#isContainer}}
273+
{{^isFreeFormObject}}
274+
{{^isArray}}
275+
// container
276+
type {{classname}}{{name}}AttributeType = *{{dataType}}
277+
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}{{dataType}}
278+
type {{classname}}{{name}}RetType = {{#isNullable}}*{{/isNullable}}{{dataType}}
219279
func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeType) (ret {{classname}}{{name}}RetType, ok bool) {
220280
if arg == nil {
221281
{{#isNullable}}
@@ -231,7 +291,9 @@ func get{{classname}}{{name}}AttributeTypeOk(arg {{classname}}{{name}}AttributeT
231291
func set{{classname}}{{name}}AttributeType(arg *{{classname}}{{name}}AttributeType, val {{classname}}{{name}}RetType) {
232292
*arg={{^isNullable}}&{{/isNullable}}val
233293
}
294+
{{/isArray}}
234295
{{/isFreeFormObject}}
296+
{{/isContainer}}
235297
{{#isByteArray}}
236298
type {{classname}}{{name}}AttributeType = *[]byte
237299
type {{classname}}{{name}}ArgType = {{#isNullable}}*{{/isNullable}}[]byte
@@ -320,10 +382,7 @@ type {{classname}} struct {
320382

321383

322384
{{#isAdditionalPropertiesTrue}}
323-
' +9.
324-
+3+
325-
3.
326-
typ.0e _{{{classname}}} {{{classname}}}
385+
type _{{{classname}}} {{{classname}}}
327386

328387
{{/isAdditionalPropertiesTrue}}
329388
{{^isAdditionalPropertiesTrue}}
@@ -340,12 +399,7 @@ func New{{classname}}({{#requiredVars}}{{nameInCamelCase}} {{classname}}{{name}}
340399
this := {{classname}}{}
341400
{{#allVars}}
342401
{{#required}}
343-
{{#isNullable}}
344-
this.{{name}}.Set({{nameInCamelCase}})
345-
{{/isNullable}}
346-
{{^isNullable}}
347-
this.{{name}} = &{{nameInCamelCase}}
348-
{{/isNullable}}
402+
set{{classname}}{{name}}AttributeType(&this.{{name}}, {{nameInCamelCase}})
349403
{{/required}}
350404
{{/allVars}}
351405
return &this

0 commit comments

Comments
 (0)