Fix compilation errors with model generator (#442)

* Fix compilation errors with model generator

Fixes #440

* Fix missing default ID for model migration

genny/fizz/ctable/options.go

@@ -30,6 +30,8 @@ type Options struct {
 	Type string
 	// ForceDefaultTimestamps enables auto timestamping for the generated table.
 	ForceDefaultTimestamps bool `json:"force_default_timestamps"`
+	// ForceDefaultID enables auto UUID for the generated table.
+	ForceDefaultID bool `json:"force_default_id"`
 }
 
 // Validate that options are usuable
@@ -53,5 +55,22 @@ func (opts *Options) Validate() error {
 	if opts.Type == "sql" && opts.Translator == nil {
 		return errors.New("sql migrations require a fizz translator")
 	}
+	if opts.ForceDefaultID {
+		var idFound bool
+		for _, a := range opts.Attrs {
+			switch a.Name.Underscore().String() {
+			case "id":
+				idFound = true
+			}
+		}
+		if !idFound {
+			// Add a default UUID
+			id, err := attrs.Parse("id:uuid")
+			if err != nil {
+				return err
+			}
+			opts.Attrs = append([]attrs.Attr{id}, opts.Attrs...)
+		}
+	}
 	return nil
 }

genny/model/imports.go

@@ -9,6 +9,7 @@ import (
 func buildImports(opts *Options) []string {
 	imps := map[string]bool{
 		"github.com/gobuffalo/validate": true,
+		"github.com/gobuffalo/pop":      true,
 	}
 	if opts.Encoding == "jsonapi" {
 		imps["github.com/google/jsonapi"] = true
@@ -19,7 +20,7 @@ func buildImports(opts *Options) []string {
 	ats := opts.Attrs
 	for _, a := range ats {
 		switch a.GoType() {
-		case "uuid":
+		case "uuid", "uuid.UUID":
 			imps["github.com/gofrs/uuid"] = true
 		case "time.Time":
 			imps["time"] = true

genny/model/model.go

@@ -1,6 +1,8 @@
 package model
 
 import (
+	"strings"
+
 	"github.com/gobuffalo/flect"
 	"github.com/gobuffalo/flect/name"
 	"github.com/gobuffalo/genny"
@@ -33,6 +35,13 @@ func New(opts *Options) (*genny.Generator, error) {
 	}
 	help := map[string]interface{}{
 		"capitalize": flect.Capitalize,
+		"trim_package": func(t string) string {
+			i := strings.LastIndex(t, ".")
+			if i == -1 {
+				return t
+			}
+			return t[i+1:]
+		},
 	}
 
 	t := gogen.TemplateTransformer(ctx, help)

genny/model/options.go

@@ -63,7 +63,7 @@ func (opts *Options) forceDefaults() error {
 		if err != nil {
 			return err
 		}
-		opts.Attrs = append(opts.Attrs, id)
+		opts.Attrs = append([]attrs.Attr{id}, opts.Attrs...)
 	}
 
 	// Add default timestamp columns if they were not provided

genny/model/templates/-path-/-name-.go.tmpl

@@ -55,7 +55,7 @@ func ({{.model.Name.Char}} *{{.model.Name.Proper}}) Validate(tx *pop.Connection)
 {{- if .model.Validations }}
 	return validate.Validate(
 		{{- range $a := .model.Validations }}
-		&validators.{{capitalize $a.GoType}}IsPresent{Field: {{$.model.Name.Char}}.{{$a.Name.Pascalize}}, Name: "{{$a.Name.Pascalize}}"},
+		&validators.{{capitalize (trim_package $a.GoType)}}IsPresent{Field: {{$.model.Name.Char}}.{{$a.Name.Pascalize}}, Name: "{{$a.Name.Pascalize}}"},
 		{{- end}}
 	), nil
 {{- else }}

soda/cmd/generate/model_cmd.go

@@ -95,6 +95,7 @@ var ModelCmd = &cobra.Command{
 				Path:                   path,
 				Type:                   modelCmdConfig.MigrationType,
 				Translator:             translator,
+				ForceDefaultID:         true,
 				ForceDefaultTimestamps: true,
 			})
 			if err != nil {