add teams, being m2m relationships, update README

Author: adamdevigili

.env

@@ -1,7 +1,7 @@
 # API
 PORT=8080
 TOKEN_KEY=
-#DEV_MODE=true
+DEV_MODE=true
 
 # DB
 #DB_DISABLED=true

README.md

@@ -1,23 +1,26 @@
-# skillbased.io
+# skillbased
 [![Go Report Card](https://goreportcard.com/badge/github.com/adamdevigili/skillbased.io)](https://goreportcard.com/report/github.com/adamdevigili/skillbased.io)
 
-[skillbased](http://skillbased.xyz) is a service that is aimed to provide players of casual, "pick-up" type sports to quickly and easily create balanced teams for their activity, and save those teams to create elevated levels of competition.
+[Skillbased](http://skillbased.xyz) is a service that is aimed to provide players of casual, "pick-up" type sports and activities to quickly and easily create balanced teams, and save those teams to create elevated levels of competition. Skillbased is designed to be generic,
+allowing an unlimited number of custom `Sports` and `Skills` to be added and modified.
 
 ## Development
 
 Rename the `.env` file to `.env.local`. The default values should allow the API and postgres to start, however to
-enable Auth0 on the frontend, you'll need to supply your own credentials to their corresponding environment variables
+enable Auth0 on the frontend, you'll need to supply your own credentials to their corresponding environment variables.
+
+The `DEV_MODE` variable is set to `true` by default, and disables SSL for Postgres.
 
 Build and run the API, frontend, and a postgres database locally with: `docker-compose -f docker-compose.local.yml up --build`
 
 ## Tech
 ### Stack
-- Frontend: [ReactJS](https://reactjs.org/)
-- Backend: [Go](https://golang.org/) ([echo](https://echo.labstack.com/))
+- Frontend: [NextJS w/ Auth0](https://nextjs.org/)
+- API: [Go](https://golang.org/)
 - Database: [PostgreSQL](https://www.postgresql.org/)
 - Runtime: [Docker](https://www.docker.com/)
 - Infrastructure: [DigitalOcean](https://www.digitalocean.com/)
 
-
 ### Other tools
 - API designer: [insomnia.rest](https://insomnia.rest/)
+- Diagraming: [lucid.app](https://lucid.app/)

api/.env

@@ -6,7 +6,6 @@ require (
 	github.com/badoux/checkmail v1.2.1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/google/uuid v1.3.0
-	github.com/jinzhu/gorm v1.9.16
 	github.com/joho/godotenv v1.4.0
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/labstack/echo/v4 v4.6.1
@@ -20,7 +19,17 @@ require (
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
+	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
+	github.com/jackc/pgconn v1.10.0 // indirect
+	github.com/jackc/pgio v1.0.0 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgproto3/v2 v2.1.1 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
+	github.com/jackc/pgtype v1.8.1 // indirect
+	github.com/jackc/pgx/v4 v4.13.0 // indirect
+	github.com/jinzhu/gorm v1.9.16 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.2 // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/stretchr/testify v1.7.0 // indirect
@@ -31,4 +40,6 @@ require (
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gorm.io/driver/postgres v1.2.2 // indirect
+	gorm.io/gorm v1.22.3 // indirect
 )

api/go.mod

@@ -5,7 +5,6 @@ import (
 
 	"github.com/adamdevigili/skillbased/api/pkg/db"
 	"github.com/adamdevigili/skillbased/api/pkg/server"
-	dotenv "github.com/joho/godotenv"
 	"github.com/kelseyhightower/envconfig"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/gommon/log"
@@ -21,9 +20,6 @@ func main() {
 	// Create new Echo server
 	e := echo.New()
 
-	// Load env vars for configuration
-	dotenv.Load(".env")
-
 	var dbConfig db.Config
 	err := envconfig.Process("db", &dbConfig)
 	if err != nil {

api/go.sum

@@ -4,14 +4,10 @@ import (
 	"fmt"
 
 	"github.com/adamdevigili/skillbased/api/pkg/models"
-	"github.com/jinzhu/gorm"
-	_ "github.com/jinzhu/gorm/dialects/postgres"
 	"github.com/labstack/gommon/log"
-	_ "github.com/lib/pq"
-)
-
-const (
-	dbConnRetryLimit = 5
+	"gorm.io/driver/postgres"
+	"gorm.io/gorm"
+	// _ "github.com/lib/pq"
 )
 
 // Environment variables to configure target DB. All are required. Will be looked for with the "PG_" prefix
@@ -54,7 +50,7 @@ func InitDB(dbConfig Config) *gorm.DB {
 
 	// Connect to the default "postgres" database first
 	log.Infof("Attempting initial connection to database", defaultConnStr)
-	db, err := gorm.Open("postgres", defaultConnStr)
+	db, err := gorm.Open(postgres.Open(defaultConnStr), &gorm.Config{})
 	if err != nil {
 		log.Fatalf("Unable to connect to database with default settings: %v", err)
 	}
@@ -64,7 +60,7 @@ func InitDB(dbConfig Config) *gorm.DB {
 	db.Exec(fmt.Sprintf("CREATE DATABASE %s;", dbConfig.Database))
 
 	// Connect to the "skillbased" database
-	db, err = gorm.Open("postgres", connStr)
+	db, err = gorm.Open(postgres.Open(connStr), &gorm.Config{})
 	if err != nil {
 		log.Fatalf("Unable to connect to main database: %v", err)
 	}
@@ -84,16 +80,24 @@ func InitDB(dbConfig Config) *gorm.DB {
 }
 
 func initTables(db *gorm.DB) {
+	log.Info("initializing tables")
+	seedPlayers := generateSeedPlayers()
+	initPlayersTable(db, seedPlayers)
+	seedTeams := generateSeedTeams(seedPlayers, db)
 	initSportsTable(db)
+	initTeamsTable(db, seedTeams)
 	deleteAllSeedPlayers(db)
-	initPlayersTable(db)
+
 }
 
-func initPlayersTable(db *gorm.DB) {
+func initPlayersTable(db *gorm.DB, seedPlayers []*models.Player) {
 	log.Info("Populating players database with initial values..")
 
-	db.AutoMigrate(&models.Player{})
-	for _, p := range generateSeedPlayers() {
+	if err := db.AutoMigrate(&models.Player{}); err != nil {
+		log.Fatalf("Unable to migrate schema: %v", err)
+	}
+
+	for _, p := range seedPlayers {
 		if err := InsertPlayer(db, p); err != nil {
 			log.Warn(err)
 		}
@@ -108,10 +112,27 @@ func deleteAllSeedPlayers(db *gorm.DB) {
 func initSportsTable(db *gorm.DB) {
 	log.Info("Populating sports database with initial values..")
 
-	db.AutoMigrate(&models.Sport{})
+	if err := db.AutoMigrate(&models.Sport{}); err != nil {
+		log.Fatalf("Unable to migrate schema: %v", err)
+	}
+
 	for _, s := range initialSports {
 		if err := InsertSport(db, &s); err != nil {
 			log.Warn(err)
 		}
 	}
 }
+
+func initTeamsTable(db *gorm.DB, seedTeams []*models.Team) {
+	log.Info("Initializing Teams table..")
+
+	if err := db.AutoMigrate(&models.Team{}); err != nil {
+		log.Fatalf("Unable to migrate schema: %v", err)
+	}
+
+	for _, t := range seedTeams {
+		if err := InsertTeam(db, t); err != nil {
+			log.Warn(err)
+		}
+	}
+}

api/main.go

@@ -1,10 +1,11 @@
 package db
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/adamdevigili/skillbased/api/pkg/models"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 )
 
 func InsertPlayer(db *gorm.DB, player *models.Player) error {
@@ -13,7 +14,7 @@ func InsertPlayer(db *gorm.DB, player *models.Player) error {
 
 func GetPlayer(db *gorm.DB, id string) (*models.Player, error) {
 	player := &models.Player{}
-	if db.Where("id = ?", id).First(player).RecordNotFound() {
+	if err := db.Where("id = ?", id).First(player).Error; errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fmt.Errorf("player not found")
 	}
 
@@ -39,7 +40,7 @@ func UpdatePlayer(db *gorm.DB, player *models.Player) (*models.Player, error) {
 }
 
 func DeletePlayer(db *gorm.DB, id string) error {
-	if db.Where("id = ?", id).First(&models.Player{}).RecordNotFound() {
+	if err := db.Where("id = ?", id).First(&models.Player{}).Error; errors.Is(err, gorm.ErrRecordNotFound) {
 		return fmt.Errorf("player not found")
 	} else {
 		fmt.Println("ya")

api/pkg/db/init.go

@@ -4,15 +4,18 @@ import (
 	"fmt"
 
 	"github.com/adamdevigili/skillbased/api/pkg/models"
+	"github.com/labstack/gommon/log"
 	"github.com/pioz/faker"
 	"github.com/segmentio/ksuid"
+	"gorm.io/gorm"
 )
 
 var (
 	ultimateFrisbee = models.Sport{
 		Base: models.Base{
-			Name: "Ultimate Frisbee",
-			ID:   ksuid.New().String(),
+			Name:   "Ultimate Frisbee",
+			ID:     ksuid.New().String(),
+			IsSeed: true,
 		},
 		SkillWeights: models.SkillWeightMap{
 			"handling": 0.9,
@@ -26,8 +29,9 @@ var (
 
 	football = models.Sport{
 		Base: models.Base{
-			Name: "Football",
-			ID:   ksuid.New().String(),
+			Name:   "Football",
+			ID:     ksuid.New().String(),
+			IsSeed: true,
 		},
 		SkillWeights: models.SkillWeightMap{
 			"strength": 0.7,
@@ -41,8 +45,9 @@ var (
 
 	basketball = models.Sport{
 		Base: models.Base{
-			Name: "Basketball",
-			ID:   ksuid.New().String(),
+			Name:   "Basketball",
+			ID:     ksuid.New().String(),
+			IsSeed: true,
 		},
 		SkillWeights: models.SkillWeightMap{
 			"shooting": 0.9,
@@ -74,11 +79,11 @@ func generateSeedPlayers() []*models.Player {
 			FirstName: fn,
 			LastName:  ln,
 			Base: models.Base{
-				Name: fmt.Sprintf("%s %s", fn, ln),
-				ID:   ksuid.New().String(),
+				Name:   fmt.Sprintf("%s %s", fn, ln),
+				ID:     ksuid.New().String(),
+				IsSeed: true,
 			},
 			PowerScores: make(map[string]int),
-			IsSeed:      true,
 		}
 
 		for _, s := range models.SkillsList {
@@ -90,3 +95,33 @@ func generateSeedPlayers() []*models.Player {
 
 	return players
 }
+
+func generateSeedTeams(seedPlayers []*models.Player, db *gorm.DB) []*models.Team {
+	teamSize := 5
+	numTeams := len(seedPlayers) / teamSize
+	teams := make([]*models.Team, numTeams)
+
+	log.Infof("%+v", teams, teamSize, numTeams, len(seedPlayers))
+	currPlayer := 0
+	for i := range teams {
+		t := &models.Team{
+			Base: models.Base{
+				Name:   faker.ColorName(),
+				ID:     ksuid.New().String(),
+				IsSeed: true,
+			},
+		}
+
+		for i := currPlayer; i < currPlayer+i; i++ {
+			// t.Players = append(t.Players, seedPlayers[i])
+			db.Model(t).Association("Players").Append()
+			db.Model(seedPlayers[i]).Association("Teams").Append(seedPlayers[i])
+		}
+
+		log.Infof("generated team: %+v", t)
+
+		teams[i] = t
+	}
+
+	return teams
+}

api/pkg/db/player.go

@@ -1,10 +1,11 @@
 package db
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/adamdevigili/skillbased/api/pkg/models"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 )
 
 func InsertSport(db *gorm.DB, sport *models.Sport) error {
@@ -13,7 +14,7 @@ func InsertSport(db *gorm.DB, sport *models.Sport) error {
 
 func GetSport(db *gorm.DB, id string) (*models.Sport, error) {
 	sport := &models.Sport{}
-	if db.Where("id = ?", id).First(sport).RecordNotFound() {
+	if err := db.Where("id = ?", id).First(sport).Error; errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fmt.Errorf("sport not found")
 	}
 
@@ -39,7 +40,7 @@ func UpdateSport(db *gorm.DB, sport *models.Sport) (*models.Sport, error) {
 }
 
 func DeleteSport(db *gorm.DB, id string) error {
-	if db.Where("id = ?", id).First(&models.Sport{}).RecordNotFound() {
+	if err := db.Where("id = ?", id).First(&models.Sport{}).Error; errors.Is(err, gorm.ErrRecordNotFound) {
 		return fmt.Errorf("sport not found")
 	} else {
 		fmt.Println("ya")