Refactor web handlers into separate package.

model/database.go

@@ -25,7 +25,7 @@ const migrationsDir = "db/migrations"
 var BaseDir = "." // Mutable for testing
 
 type Database struct {
-	filename         string
+	Path             string
 	db               *sql.DB
 	eventSettingsMap *modl.DbMap
 	matchMap         *modl.DbMap
@@ -41,9 +41,9 @@ type Database struct {
 // migrations.
 func OpenDatabase(filename string) (*Database, error) {
 	// Find and run the migrations using goose. This also auto-creates the DB.
-	database := Database{filename: filename}
+	database := Database{Path: filename}
 	migrationsPath := filepath.Join(BaseDir, migrationsDir)
-	dbDriver := goose.DBDriver{"sqlite3", database.GetPath(), "github.com/mattn/go-sqlite3", &goose.Sqlite3Dialect{}}
+	dbDriver := goose.DBDriver{"sqlite3", database.Path, "github.com/mattn/go-sqlite3", &goose.Sqlite3Dialect{}}
 	dbConf := goose.DBConf{MigrationsDir: migrationsPath, Env: "prod", Driver: dbDriver}
 	target, err := goose.GetMostRecentDBVersion(migrationsPath)
 	if err != nil {
@@ -54,7 +54,7 @@ func OpenDatabase(filename string) (*Database, error) {
 		return nil, err
 	}
 
-	db, err := sql.Open("sqlite3", database.GetPath())
+	db, err := sql.Open("sqlite3", database.Path)
 	if err != nil {
 		return nil, err
 	}
@@ -77,7 +77,7 @@ func (database *Database) Backup(eventName, reason string) error {
 	}
 	filename := fmt.Sprintf("%s/%s_%s_%s.db", backupsPath, strings.Replace(eventName, " ", "_", -1),
 		time.Now().Format("20060102150405"), reason)
-	src, err := os.Open(database.GetPath())
+	src, err := os.Open(database.Path)
 	if err != nil {
 		return err
 	}
@@ -93,10 +93,6 @@ func (database *Database) Backup(eventName, reason string) error {
 	return nil
 }
 
-func (database *Database) GetPath() string {
-	return filepath.Join(BaseDir, database.filename)
-}
-
 // Sets up table-object associations.
 func (database *Database) mapTables() {
 	dialect := new(modl.SqliteDialect)

model/event_settings.go

@@ -8,7 +8,6 @@ package model
 type EventSettings struct {
 	Id                         int
 	Name                       string
-	Code                       string
 	DisplayBackgroundColor     string
 	NumElimAlliances           int
 	SelectionRound2Order       string
@@ -39,7 +38,6 @@ func (database *Database) GetEventSettings() (*EventSettings, error) {
 	if err != nil {
 		// Database record doesn't exist yet; create it now.
 		eventSettings.Name = "Untitled Event"
-		eventSettings.Code = "UE"
 		eventSettings.DisplayBackgroundColor = "#00ff00"
 		eventSettings.NumElimAlliances = 8
 		eventSettings.SelectionRound2Order = "L"

model/event_settings_test.go

@@ -13,12 +13,11 @@ func TestEventSettingsReadWrite(t *testing.T) {
 
 	eventSettings, err := db.GetEventSettings()
 	assert.Nil(t, err)
-	assert.Equal(t, EventSettings{Id: 0, Name: "Untitled Event", Code: "UE", DisplayBackgroundColor: "#00ff00",
+	assert.Equal(t, EventSettings{Id: 0, Name: "Untitled Event", DisplayBackgroundColor: "#00ff00",
 		NumElimAlliances: 8, SelectionRound2Order: "L", SelectionRound3Order: "", TBADownloadEnabled: true},
 		*eventSettings)
 
 	eventSettings.Name = "Chezy Champs"
-	eventSettings.Code = "cc"
 	eventSettings.DisplayBackgroundColor = "#ff00ff"
 	eventSettings.NumElimAlliances = 6
 	eventSettings.SelectionRound2Order = "F"

model/test_helpers.go

@@ -16,8 +16,8 @@ import (
 
 func SetupTestDb(t *testing.T, uniqueName string) *Database {
 	BaseDir = ".."
-	dbPath := fmt.Sprintf("%s_test.db", uniqueName)
-	os.Remove(filepath.Join(BaseDir, dbPath))
+	dbPath := filepath.Join(BaseDir, fmt.Sprintf("%s_test.db", uniqueName))
+	os.Remove(dbPath)
 	database, err := OpenDatabase(dbPath)
 	assert.Nil(t, err)
 	return database