refactor player seeding, remove existing seed players

Author: adamdevigili

api/pkg/db/init.go

@@ -85,6 +85,7 @@ func InitDB(dbConfig Config) *gorm.DB {
 
 func initTables(db *gorm.DB) {
 	initSportsTable(db)
+	deleteAllSeedPlayers(db)
 	initPlayersTable(db)
 }
 
@@ -93,7 +94,7 @@ func initPlayersTable(db *gorm.DB) {
 
 	db.AutoMigrate(&models.Player{})
 	for _, p := range models.GenerateSeedPlayers() {
-		if err := InsertPlayer(db, &p); err != nil {
+		if err := InsertPlayer(db, p); err != nil {
 			log.Warn(err)
 		}
 	}

api/pkg/db/player.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/adamdevigili/skillbased/api/pkg/models"
 	"github.com/jinzhu/gorm"
+	"github.com/labstack/gommon/log"
 )
 
 func InsertPlayer(db *gorm.DB, player *models.Player) error {
@@ -47,3 +48,8 @@ func DeletePlayer(db *gorm.DB, id string) error {
 		return nil
 	}
 }
+
+func deleteAllSeedPlayers(db *gorm.DB) {
+	log.Info("deleteing all seed players from existing DB")
+	db.Where("is_seed = ?", "t").Delete(&models.Player{})
+}

api/pkg/models/player.go

@@ -1,14 +1,36 @@
 package models
 
+import (
+	"encoding/json"
+
+	"github.com/jinzhu/gorm"
+	"github.com/jinzhu/gorm/dialects/postgres"
+)
+
 type Player struct {
-	ID        string `json:"id"`
+	Base
 	FirstName string `json:"first_name"`
 	LastName  string `json:"last_name"`
 
 	// Skills is a map relating an existing Sport's ID to a SkillMap (map of skill name to rating out of 10)
-	Skills      map[string]SkillMap `json:"skills"`
-	PowerScores map[string]int      `json:"power_scores"`
-	IsSeed      bool                `json:"-"`
+	Skills   map[string]SkillMap `gorm:"-" json:"skills"`
+	SkillsDB postgres.Jsonb      `json:"-"`
+
+	PowerScores   map[string]int `gorm:"-" json:"power_scores"`
+	PowerScoresDB postgres.Jsonb `json:"-"`
+
+	IsSeed bool `json:"-"`
+}
+
+// BeforeCreate is a GORM hook that is used to convert the Go map to a JSON struct to be stored in postgres
+func (p *Player) BeforeCreate(scope *gorm.Scope) (err error) {
+	if x, err := json.Marshal(p.PowerScores); err != nil {
+		return err
+	} else {
+		p.PowerScoresDB = postgres.Jsonb{RawMessage: x}
+	}
+
+	return
 }
 
 type PlayerList struct {

api/pkg/models/seed.go

@@ -1,6 +1,8 @@
 package models
 
 import (
+	"fmt"
+
 	"github.com/pioz/faker"
 	"github.com/rs/xid"
 )
@@ -55,19 +57,28 @@ var (
 
 var playersToGenerate = 30
 
-func GenerateSeedPlayers() []Player {
+func GenerateSeedPlayers() []*Player {
 	faker.SetSeed(623)
-	players := make([]Player, playersToGenerate)
+	players := make([]*Player, playersToGenerate)
+
+	for i := range players {
+		fn, ln := faker.FirstName(), faker.LastName()
+		p := &Player{
+			FirstName: fn,
+			LastName:  ln,
+			Base: Base{
+				Name: fmt.Sprintf("%s %s", fn, ln),
+				ID:   xid.New(),
+			},
+			PowerScores: make(map[string]int),
+			IsSeed:      true,
+		}
 
-	for _, p := range players {
-		p.ID = xid.New().String()
-		p.FirstName = faker.FirstName()
-		p.LastName = faker.LastName()
 		for _, s := range skillsList {
 			p.PowerScores[s] = faker.IntInRange(1, 10)
 		}
 
-		p.IsSeed = true
+		players[i] = p
 	}
 
 	return players