NCGEARS/cheesy-arena-lite
1
0
Fork 0
mirror of https://github.com/Team254/cheesy-arena-lite.git synced 2026-03-09 13:46:44 -04:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Fix bug with committing playoff matches after a team substitution.

Browse Source
This commit is contained in:
Patrick Fairbank
2019-10-07 21:41:43 -07:00
parent 6f6fa9ba78
commit c0e3f16144
4 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web/match_play.go
View File

@@ -376,6 +376,15 @@ func (web *Web) commitMatchScore(match *model.Match, matchResult *model.MatchRes
}
if match.ShouldUpdateEliminationMatches() {
if err = tournament.UpdateAlliance(web.arena.Database, [3]int{match.Red1, match.Red2, match.Red3},
match.ElimRedAlliance); err != nil {
return err
}
if err = tournament.UpdateAlliance(web.arena.Database, [3]int{match.Blue1, match.Blue2, match.Blue3},
match.ElimBlueAlliance); err != nil {
return err
}
// Generate any subsequent elimination matches.
isTournamentWon, err := tournament.UpdateEliminationSchedule(web.arena.Database,
time.Now().Add(time.Second*tournament.ElimMatchSpacingSec))

2
web/match_play_test.go
View File

@@ -228,6 +228,8 @@ func TestCommitCards(t *testing.T) {
// Check that a red card in eliminations zeroes out the score.
tournament.CreateTestAlliances(web.arena.Database, 2)
match.Type = "elimination"
match.ElimRedAlliance = 1
match.ElimBlueAlliance = 2
web.arena.Database.SaveMatch(match)
matchResult = model.BuildTestMatchResult(match.Id, 10)
matchResult.MatchType = match.Type

4
web/match_review_test.go
View File

@@ -39,7 +39,7 @@ func TestMatchReviewEditExistingResult(t *testing.T) {
web := setupTestWeb(t)
match := model.Match{Type: "elimination", DisplayName: "QF4-3", Status: "complete", Winner: "R", Red1: 1001,
Red2: 1002, Red3: 1003, Blue1: 1004, Blue2: 1005, Blue3: 1006}
Red2: 1002, Red3: 1003, Blue1: 1004, Blue2: 1005, Blue3: 1006, ElimRedAlliance: 1, ElimBlueAlliance: 2}
web.arena.Database.CreateMatch(&match)
matchResult := model.BuildTestMatchResult(match.Id, 1)
matchResult.MatchType = match.Type
@@ -79,7 +79,7 @@ func TestMatchReviewCreateNewResult(t *testing.T) {
web := setupTestWeb(t)
match := model.Match{Type: "elimination", DisplayName: "QF4-3", Status: "complete", Winner: "R", Red1: 1001,
Red2: 1002, Red3: 1003, Blue1: 1004, Blue2: 1005, Blue3: 1006}
Red2: 1002, Red3: 1003, Blue1: 1004, Blue2: 1005, Blue3: 1006, ElimRedAlliance: 1, ElimBlueAlliance: 2}
web.arena.Database.CreateMatch(&match)
tournament.CreateTestAlliances(web.arena.Database, 2)