diff --git a/app/http/endpoints/api/panel/panelcreate.go b/app/http/endpoints/api/panel/panelcreate.go index 76bbe79..240b21d 100644 --- a/app/http/endpoints/api/panel/panelcreate.go +++ b/app/http/endpoints/api/panel/panelcreate.go @@ -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)) return } @@ -179,7 +179,7 @@ func CreatePanel(ctx *gin.Context) { } // 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 group, _ := errgroup.WithContext(context.Background()) 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 dbclient.Client.PanelTeams.Add(panelMessageId, teamId) + return dbclient.Client.PanelTeams.Add(panelId, teamId) }) } diff --git a/app/http/endpoints/api/panel/panellist.go b/app/http/endpoints/api/panel/panellist.go index 5c0f713..37fcee7 100644 --- a/app/http/endpoints/api/panel/panellist.go +++ b/app/http/endpoints/api/panel/panellist.go @@ -68,7 +68,7 @@ func ListPanels(ctx *gin.Context) { mentions = append(mentions, "user") } - teams, err := dbclient.Client.PanelTeams.GetTeams(p.MessageId) + teams, err := dbclient.Client.PanelTeams.GetTeams(p.PanelId) if err != nil { return err } diff --git a/app/http/endpoints/api/panel/panelupdate.go b/app/http/endpoints/api/panel/panelupdate.go index f6a89f0..2fd0efd 100644 --- a/app/http/endpoints/api/panel/panelupdate.go +++ b/app/http/endpoints/api/panel/panelupdate.go @@ -200,13 +200,13 @@ func UpdatePanel(ctx *gin.Context) { // insert support teams // TODO: Stop race conditions - 1 transaction // 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)) return } // 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)) return } diff --git a/go.mod b/go.mod index 9677562..fbf67b8 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ require ( github.com/BurntSushi/toml v0.3.1 github.com/TicketsBot/archiverclient v0.0.0-20210220155137-a562b2f1bbbb github.com/TicketsBot/common v0.0.0-20210527174309-f7344004ae32 - github.com/TicketsBot/database v0.0.0-20210528120222-49534148fc63 - github.com/TicketsBot/worker v0.0.0-20210528120548-e0e37646be05 + github.com/TicketsBot/database v0.0.0-20210528135409-4721a3529b9f + github.com/TicketsBot/worker v0.0.0-20210528135955-34744f610804 github.com/apex/log v1.1.2 github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible