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

Convert AllianceTeam, Award, and LowerThird models to use Bolt DB.

Browse Source
This commit is contained in:
Patrick Fairbank
2021-05-09 21:12:23 -07:00
parent bd3921ce08
commit ea4d56e665
23 changed files with 228 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/setup_awards.go
View File

@@ -55,7 +55,7 @@ func (web *Web) awardsPostHandler(w http.ResponseWriter, r *http.Request) {
return
}
awardId, _ := strconv.Atoi(r.PostFormValue("id"))
awardId, _ := strconv.ParseInt(r.PostFormValue("id"), 10, 64)
if r.PostFormValue("action") == "delete" {
if err := tournament.DeleteAward(web.arena.Database, awardId); err != nil {
handleWebErr(w, err)

12
web/setup_lower_thirds.go
View File

@@ -83,7 +83,7 @@ func (web *Web) lowerThirdsWebsocketHandler(w http.ResponseWriter, r *http.Reque
ws.WriteError(err.Error())
continue
}
err = web.arena.Database.DeleteLowerThird(&lowerThird)
err = web.arena.Database.DeleteLowerThird(lowerThird.Id)
if err != nil {
ws.WriteError(err.Error())
continue
@@ -113,7 +113,7 @@ func (web *Web) lowerThirdsWebsocketHandler(w http.ResponseWriter, r *http.Reque
continue
case "reorderLowerThird":
args := struct {
Id int
Id int64
MoveUp bool
}{}
err = mapstructure.Decode(data, &args)
@@ -151,7 +151,7 @@ func (web *Web) saveLowerThird(lowerThird *model.LowerThird) error {
lowerThird.DisplayOrder = web.arena.Database.GetNextLowerThirdDisplayOrder()
err = web.arena.Database.CreateLowerThird(lowerThird)
} else {
err = web.arena.Database.SaveLowerThird(lowerThird)
err = web.arena.Database.UpdateLowerThird(lowerThird)
}
if err != nil {
return err
@@ -160,7 +160,7 @@ func (web *Web) saveLowerThird(lowerThird *model.LowerThird) error {
}
// Swaps the lower third having the given ID with the one immediately above or below it.
func (web *Web) reorderLowerThird(id int, moveUp bool) error {
func (web *Web) reorderLowerThird(id int64, moveUp bool) error {
lowerThird, err := web.arena.Database.GetLowerThirdById(id)
if err != nil {
return err
@@ -195,11 +195,11 @@ func (web *Web) reorderLowerThird(id int, moveUp bool) error {
// Swap their display orders and save.
lowerThird.DisplayOrder, adjacentLowerThird.DisplayOrder =
adjacentLowerThird.DisplayOrder, lowerThird.DisplayOrder
err = web.arena.Database.SaveLowerThird(lowerThird)
err = web.arena.Database.UpdateLowerThird(lowerThird)
if err != nil {
return err
}
err = web.arena.Database.SaveLowerThird(adjacentLowerThird)
err = web.arena.Database.UpdateLowerThird(adjacentLowerThird)
if err != nil {
return err
}

4
web/setup_lower_thirds_test.go
View File

@@ -57,6 +57,6 @@ func TestSetupLowerThirds(t *testing.T) {
ws.Write("reorderLowerThird", map[string]interface{}{"Id": 2, "moveUp": false})
time.Sleep(time.Millisecond * 100)
lowerThirds, _ := web.arena.Database.GetAllLowerThirds()
assert.Equal(t, 3, lowerThirds[0].Id)
assert.Equal(t, 2, lowerThirds[1].Id)
assert.Equal(t, int64(3), lowerThirds[0].Id)
assert.Equal(t, int64(2), lowerThirds[1].Id)
}