scout_ante/dashboard-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DB migration

Browse Source
This commit is contained in:
rxdn 2021-05-28 15:27:16 +01:00
parent 90d6b5f72a
commit 629bde5e7f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/http/endpoints/api/panel/panelcreate.go
View File

@ -167,7 +167,7 @@ func CreatePanel(ctx *gin.Context) {
} }
} }
if responseCode, err := insertTeams(guildId, msgId, data.Teams); err != nil { if responseCode, err := insertTeams(guildId, panelId, data.Teams); err != nil {
ctx.JSON(responseCode, utils.ErrorJson(err)) ctx.JSON(responseCode, utils.ErrorJson(err))
return return
} }
@ -179,7 +179,7 @@ func CreatePanel(ctx *gin.Context) {
} }
// returns (response_code, error) // returns (response_code, error)
func insertTeams(guildId, panelMessageId uint64, teamIds []string) (int, error) { func insertTeams(guildId uint64, panelId int, teamIds []string) (int, error) {
// insert teams // insert teams
group, _ := errgroup.WithContext(context.Background()) group, _ := errgroup.WithContext(context.Background())
for _, teamId := range teamIds { for _, teamId := range teamIds {
@ -203,7 +203,7 @@ func insertTeams(guildId, panelMessageId uint64, teamIds []string) (int, error)
return fmt.Errorf("team with id %d not found", teamId) return fmt.Errorf("team with id %d not found", teamId)
} }
return dbclient.Client.PanelTeams.Add(panelMessageId, teamId) return dbclient.Client.PanelTeams.Add(panelId, teamId)
}) })
} }

2
app/http/endpoints/api/panel/panellist.go
View File

@ -68,7 +68,7 @@ func ListPanels(ctx *gin.Context) {
mentions = append(mentions, "user") mentions = append(mentions, "user")
} }
teams, err := dbclient.Client.PanelTeams.GetTeams(p.MessageId) teams, err := dbclient.Client.PanelTeams.GetTeams(p.PanelId)
if err != nil { if err != nil {
return err return err
} }

4
app/http/endpoints/api/panel/panelupdate.go
View File

@ -200,13 +200,13 @@ func UpdatePanel(ctx *gin.Context) {
// insert support teams // insert support teams
// TODO: Stop race conditions - 1 transaction // TODO: Stop race conditions - 1 transaction
// delete teams // delete teams
if err := dbclient.Client.PanelTeams.DeleteAll(newMessageId); err != nil { if err := dbclient.Client.PanelTeams.DeleteAll(panel.PanelId); err != nil {
ctx.JSON(500, utils.ErrorJson(err)) ctx.JSON(500, utils.ErrorJson(err))
return return
} }
// insert new // insert new
if responseCode, err := insertTeams(guildId, newMessageId, data.Teams); err != nil { if responseCode, err := insertTeams(guildId, panel.PanelId, data.Teams); err != nil {
ctx.JSON(responseCode, utils.ErrorJson(err)) ctx.JSON(responseCode, utils.ErrorJson(err))
return return
} }

4
go.mod
View File

@ -6,8 +6,8 @@ require (
github.com/BurntSushi/toml v0.3.1 github.com/BurntSushi/toml v0.3.1
github.com/TicketsBot/archiverclient v0.0.0-20210220155137-a562b2f1bbbb github.com/TicketsBot/archiverclient v0.0.0-20210220155137-a562b2f1bbbb
github.com/TicketsBot/common v0.0.0-20210527174309-f7344004ae32 github.com/TicketsBot/common v0.0.0-20210527174309-f7344004ae32
github.com/TicketsBot/database v0.0.0-20210528120222-49534148fc63 github.com/TicketsBot/database v0.0.0-20210528135409-4721a3529b9f
github.com/TicketsBot/worker v0.0.0-20210528120548-e0e37646be05 github.com/TicketsBot/worker v0.0.0-20210528135955-34744f610804
github.com/apex/log v1.1.2 github.com/apex/log v1.1.2
github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/dgrijalva/jwt-go v3.2.0+incompatible