Adding new tables

main.go

@@ -64,6 +64,11 @@ func main() {
 	}
 	db.SetLogger(log.New(f, "\n", 0))
 
+	err = mygorm.Init2(db)
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	// Initalize QOR Admin
 	adm, err := myqor.Init(db, assetFS, workDir)
 	if err != nil {

mygorm/breedingbook.go

@@ -2,85 +2,175 @@ package mygorm
 
 import (
 	"github.com/jinzhu/gorm"
+	"time"
 )
 
-type TypeEnum struct {
-	slug string
-}
+type TypeEnum string
+
+const (
+	TypeUnknown    = TypeEnum("")
+	TypeString     = TypeEnum("string")
+	TypeText       = TypeEnum("text")
+	TypeCheckbox   = TypeEnum("checkbox")
+	TypeInt        = TypeEnum("integer")
+	TypeFloat      = TypeEnum("floating point")
+	TypeDate       = TypeEnum("date")
+	TypeDateTime   = TypeEnum("timestamp")
+	TypeSelectOne  = TypeEnum("select one")
+	TypeSelectMany = TypeEnum("select many") // []string
+)
 
-func (te TypeEnum) String() string {
-	return te.slug
+var AllTypeEnums = []TypeEnum{
+	TypeUnknown,
+	TypeString,
+	TypeText,
+	TypeCheckbox,
+	TypeInt,
+	TypeFloat,
+	TypeDate,
+	TypeDateTime,
+	TypeSelectOne,
+	TypeSelectMany,
 }
 
-var (
-	TypeUnknown    = TypeEnum{""}
-	TypeString     = TypeEnum{"string"}
-	TypeText       = TypeEnum{"text"}
-	TypeCheckbox   = TypeEnum{"checkbox"}
-	TypeInt        = TypeEnum{"integer"}
-	TypeFloat      = TypeEnum{"floating point"}
-	TypeDate       = TypeEnum{"date"}
-	TypeDateTime   = TypeEnum{"timestamp"}
-	TypeSelectOne  = TypeEnum{"select one"}
-	TypeSelectMany = TypeEnum{"select many"}
+type QualityEnum string
+
+const (
+	QualityNeutral = QualityEnum("neutral")
+	QualityBad     = QualityEnum("bad")
+	QualityPerfect = QualityEnum("perfect")
 )
 
-var AllTypeEnums = []string{
-	TypeUnknown.slug,
-	TypeString.slug,
-	TypeText.slug,
-	TypeCheckbox.slug,
-	TypeInt.slug,
-	TypeFloat.slug,
-	TypeDate.slug,
-	TypeDateTime.slug,
-	TypeSelectOne.slug,
-	TypeSelectMany.slug,
-}
-
-func NewTypeEnum(s string) TypeEnum {
-	switch s {
-	case TypeString.slug:
-		return TypeString
-	case TypeText.slug:
-		return TypeText
-	case TypeCheckbox.slug:
-		return TypeCheckbox
-	case TypeInt.slug:
-		return TypeInt
-	case TypeFloat.slug:
-		return TypeFloat
-	case TypeDate.slug:
-		return TypeDate
-	case TypeDateTime.slug:
-		return TypeDateTime
-	case TypeSelectOne.slug:
-		return TypeSelectOne
-	case TypeSelectMany.slug:
-		return TypeSelectMany
-	}
-	return TypeUnknown
+var AllQualityEnums = []string{
+	string(QualityNeutral),
+	string(QualityBad),
+	string(QualityPerfect),
+}
+
+// String is implemented for nicer looking numbers.
+func (q QualityEnum) String() string {
+	return string(q)
+}
+
+type DogTest struct {
+	gorm.Model
+	Name           string      `gorm:"unique; not null"`
+	SelectOne1     string      `gorm:"not null"`
+	SelectOne2     string      `gorm:"not null"`
+	SelectOne3     string      `gorm:"not null"`
+	CheckBox1      bool        `gorm:"not null"`
+	CheckBox2      bool        `gorm:"not null"`
+	CheckBox3      bool        `gorm:"not null"`
+	String1        string      `gorm:"not null"`
+	String2        string      `gorm:"not null"`
+	String3        string      `gorm:"not null"`
+	String1Quality QualityEnum `gorm:"not null"`
+	String2Quality QualityEnum `gorm:"not null"`
+	String3Quality QualityEnum `gorm:"not null"`
+	Text1          string      `gorm:"not null"`
+	Text2          string      `gorm:"not null"`
+	Text3          string      `gorm:"not null"`
+	Text1Quality   QualityEnum `gorm:"not null"`
+	Text2Quality   QualityEnum `gorm:"not null"`
+	Text3Quality   QualityEnum `gorm:"not null"`
+	Integer1       int64       `gorm:"not null"`
+	Integer2       int64       `gorm:"not null"`
+	Integer3       int64       `gorm:"not null"`
+	Float1         float64     `gorm:"not null"`
+	Float2         float64     `gorm:"not null"`
+	Float3         float64     `gorm:"not null"`
+	Date1          time.Time   `gorm:"not null"`
+	Date2          time.Time   `gorm:"not null"`
+	Date3          time.Time   `gorm:"not null"`
+	Timestamp1     time.Time   `gorm:"not null"`
+	Timestamp2     time.Time   `gorm:"not null"`
+	Timestamp3     time.Time   `gorm:"not null"`
+	/*SelectMany1    []string    `gorm:"not null"`
+	SelectMany2    []string    `gorm:"not null"`
+	SelectMany3    []string    `gorm:"not null"`*/
 }
 
 type BaseMetaFeature struct {
 	gorm.Model
-	Name      string `gorm:"unique"`
-	ShortName string `gorm:"unique"`
-	Type      TypeEnum
-	GroupID   uint
+	Name      string       `gorm:"unique; not null"`
+	ShortName string       `gorm:"unique; not null"`
+	GroupID   uint         `gorm:"not null"`
 	Group     FeatureGroup `gorm:"foreignkey:GroupID;association_autocreate:false;association_autoupdate:false"`
+	ColumnNum int          `gorm:"unique; not null"`
 }
 
 type FeatureGroup struct {
 	gorm.Model
-	Name      string `gorm:"unique"`
-	ShortName string `gorm:"unique"`
-	ColorID   uint
-	Color     Color `gorm:"foreignkey:ColorID;association_autocreate:false;association_autoupdate:false"`
+	Name      string `gorm:"unique; not null"`
+	ShortName string `gorm:"unique; not null"`
+	ColorID   uint   `gorm:"not null"`
+	Color     Color  `gorm:"foreignkey:ColorID;association_autocreate:false;association_autoupdate:false"`
 }
 
 type Color struct {
 	gorm.Model
-	Name     string `gorm:"unique"`
-	HexValue string `gorm:"unique"`
+	Name     string `gorm:"unique; not null"`
+	HexValue string `gorm:"unique; not null"`
+}
+
+type SelectOneMetaFeature struct {
+	BaseMetaFeature
+	Order   int         `gorm:"not null"`
+	Value   string      `gorm:"not null"`
+	Quality QualityEnum `gorm:"not null"`
+}
+
+type CheckBoxMetaFeature struct {
+	BaseMetaFeature
+	QualityChecked   QualityEnum `gorm:"not null"`
+	QualityUnchecked QualityEnum `gorm:"not null"`
+}
+
+type StringMetaFeature struct {
+	BaseMetaFeature
+	MinLength uint `gorm:"not null"`
+	MaxLength uint `gorm:"not null"`
+}
+
+type TextMetaFeature struct {
+	BaseMetaFeature
+	MinLength uint `gorm:"not null"`
+	MaxLength uint `gorm:"not null"`
+}
+
+type IntegerMetaFeature struct {
+	BaseMetaFeature
+	NeutralMin int64 `gorm:"not null"`
+	NeutralMax int64 `gorm:"not null"`
+	BadMin     int64 `gorm:"not null"`
+	BadMax     int64 `gorm:"not null"`
+	PerfectMin int64 `gorm:"not null"`
+	PerfectMax int64 `gorm:"not null"`
+}
+
+type FloatMetaFeature struct {
+	BaseMetaFeature
+	NeutralMin float64 `gorm:"not null"`
+	NeutralMax float64 `gorm:"not null"`
+	BadMin     float64 `gorm:"not null"`
+	BadMax     float64 `gorm:"not null"`
+	PerfectMin float64 `gorm:"not null"`
+	PerfectMax float64 `gorm:"not null"`
+}
+
+type DateMetaFeature struct {
+	BaseMetaFeature
+	// still decide
+}
+
+type TimestampMetaFeature struct {
+	BaseMetaFeature
+	// still decide
+}
+
+type SelectManyMetaFeature struct {
+	BaseMetaFeature
+	Order   int         `gorm:"not null"`
+	Value   string      `gorm:"not null"`
+	Quality QualityEnum `gorm:"not null"`
 }

mygorm/breedingbookfunc.go

@@ -0,0 +1,24 @@
+package mygorm
+
+import (
+	"fmt"
+	"github.com/jinzhu/gorm"
+)
+
+/*
+Init initializes the qor admin UI by creating and configuring all resources.
+*/
+
+func Init2(db *gorm.DB) error {
+	// Set up the database
+	if err := db.AutoMigrate(&DogTest{}, &FeatureGroup{}, &Color{}, &SelectOneMetaFeature{}, &CheckBoxMetaFeature{},
+		&StringMetaFeature{}, &TextMetaFeature{}, &IntegerMetaFeature{}, &FloatMetaFeature{}, &DateMetaFeature{}, &TimestampMetaFeature{}).Error; err != nil {
+		return fmt.Errorf("unable to migrate DB to current state: %v", err)
+	}
+
+	// Initalize
+
+	// Create resources from GORM-backend model
+
+	return nil
+}

mygorm/gorm.go

@@ -520,6 +520,7 @@ func Init(dbFname string) (*gorm.DB, error) {
 	if err != nil {
 		return nil, fmt.Errorf("unable to create view 'all_mates': %v", err)
 	}
+	Init2(db)
 	return db, nil
 }