Convert EventSettings, Match, and MatchResult models to use Bolt DB.

This commit is contained in:
Patrick Fairbank
2021-05-12 16:40:07 -07:00
parent ea4d56e665
commit 1d523c5f37
28 changed files with 274 additions and 375 deletions

View File

@@ -263,7 +263,7 @@ func (arena *Arena) SubstituteTeam(teamId int, station string) error {
arena.MatchLoadNotifier.Notify()
if arena.CurrentMatch.Type != "test" {
arena.Database.SaveMatch(arena.CurrentMatch)
arena.Database.UpdateMatch(arena.CurrentMatch)
}
return nil
}
@@ -275,7 +275,7 @@ func (arena *Arena) StartMatch() error {
// Save the match start time and game-specifc data to the database for posterity.
arena.CurrentMatch.StartedAt = time.Now()
if arena.CurrentMatch.Type != "test" {
arena.Database.SaveMatch(arena.CurrentMatch)
arena.Database.UpdateMatch(arena.CurrentMatch)
}
arena.updateCycleTime(arena.CurrentMatch.StartedAt)

View File

@@ -82,7 +82,7 @@ func (arena *Arena) generateArenaStatusMessage() interface{} {
}
return &struct {
MatchId int
MatchId int64
AllianceStations map[string]*AllianceStation
TeamWifiStatuses map[string]network.TeamWifiStatus
MatchState

View File

@@ -388,13 +388,13 @@ func TestLoadNextMatch(t *testing.T) {
arena.Database.CreateMatch(&qualificationMatch2)
// Test match should be followed by another, empty test match.
assert.Equal(t, 0, arena.CurrentMatch.Id)
assert.Equal(t, int64(0), arena.CurrentMatch.Id)
err := arena.SubstituteTeam(1114, "R1")
assert.Nil(t, err)
arena.CurrentMatch.Status = model.TieMatch
err = arena.LoadNextMatch()
assert.Nil(t, err)
assert.Equal(t, 0, arena.CurrentMatch.Id)
assert.Equal(t, int64(0), arena.CurrentMatch.Id)
assert.Equal(t, 0, arena.CurrentMatch.Red1)
assert.Equal(t, false, arena.CurrentMatch.IsComplete())
@@ -405,15 +405,15 @@ func TestLoadNextMatch(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, practiceMatch1.Id, arena.CurrentMatch.Id)
practiceMatch1.Status = model.RedWonMatch
arena.Database.SaveMatch(&practiceMatch1)
arena.Database.UpdateMatch(&practiceMatch1)
err = arena.LoadNextMatch()
assert.Nil(t, err)
assert.Equal(t, practiceMatch3.Id, arena.CurrentMatch.Id)
practiceMatch3.Status = model.BlueWonMatch
arena.Database.SaveMatch(&practiceMatch3)
arena.Database.UpdateMatch(&practiceMatch3)
err = arena.LoadNextMatch()
assert.Nil(t, err)
assert.Equal(t, 0, arena.CurrentMatch.Id)
assert.Equal(t, int64(0), arena.CurrentMatch.Id)
assert.Equal(t, "test", arena.CurrentMatch.Type)
err = arena.LoadMatch(&qualificationMatch1)

View File

@@ -122,5 +122,5 @@ func setMatch(database *model.Database, match *model.Match, matchTime time.Time,
} else {
match.Status = model.MatchNotPlayed
}
_ = database.SaveMatch(match)
_ = database.UpdateMatch(match)
}