fixes broken model template (gobuffalo#261)

* fixes broken model template * fixes an issue with the ID field not having a proper tag
alnr · Oct 2, 2018 · c290a6b · c290a6b
1 parent 740070c
commit c290a6b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/soda/cmd/generate/attribute.go b/soda/cmd/generate/attribute.go
@@ -20,6 +20,9 @@ type attribute struct {
 }
 
 func (a attribute) String() string {
+	if len(a.StructTag) == 0 {
+		a.StructTag = "json"
+	}
 	return fmt.Sprintf("\t%s %s `%s:\"%s\" db:\"%s\"`", a.Name.Pascalize(), a.GoType, a.StructTag, a.Name.Underscore(), a.Name.Underscore())
 }
 

diff --git a/soda/cmd/generate/attribute_test.go b/soda/cmd/generate/attribute_test.go
@@ -14,6 +14,10 @@ func Test_Attribute_String(t *testing.T) {
 		exp  string
 		name string
 	}{
+		{
+			name: "id",
+			exp:  "\tID string `json:\"id\" db:\"id\"`",
+		},
 		{
 			name: "user_id",
 			exp:  "\tUserID string `json:\"user_id\" db:\"user_id\"`",

diff --git a/soda/cmd/generate/model_templates.go b/soda/cmd/generate/model_templates.go
@@ -38,7 +38,7 @@ func ({{.char}} *{{.model_name}}) Validate(tx *pop.Connection) (*validate.Errors
 	{{ if .model.ValidatableAttributes -}}
 	return validate.Validate(
 		{{ range $a := .model.ValidatableAttributes -}}
-		&validators.{{capitalize $a.GoType}}IsPresent{Field: {{$.char}}.{{$a.Name.Camelize}}, Name: "{{$a.Name.Camelize}}"},
+		&validators.{{capitalize $a.GoType}}IsPresent{Field: {{$.char}}.{{$a.Name.Pascalize}}, Name: "{{$a.Name.Pascalize}}"},
 		{{end -}}
 	), nil
 	{{ else -}}