From ef11df753227f3082d5c2226c0e7525e14ed47c7 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 20 Jan 2016 08:44:05 -0600 Subject: PLT-7 adding loc db calls for webhooks table --- api/channel.go | 8 ++++---- api/post.go | 2 +- api/user.go | 4 ++-- api/webhook.go | 20 ++++++++++---------- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'api') diff --git a/api/channel.go b/api/channel.go index 17a0f2031..f2880da5d 100644 --- a/api/channel.go +++ b/api/channel.go @@ -593,8 +593,8 @@ func deleteChannel(c *Context, w http.ResponseWriter, r *http.Request) { sc := Srv.Store.Channel().Get(id) scm := Srv.Store.Channel().GetMember(id, c.Session.UserId) uc := Srv.Store.User().Get(c.Session.UserId) - ihc := Srv.Store.Webhook().GetIncomingByChannel(id) - ohc := Srv.Store.Webhook().GetOutgoingByChannel(id) + ihc := Srv.Store.Webhook().GetIncomingByChannel(c.T, id) + ohc := Srv.Store.Webhook().GetOutgoingByChannel(c.T, id) if cresult := <-sc; cresult.Err != nil { c.Err = cresult.Err @@ -643,7 +643,7 @@ func deleteChannel(c *Context, w http.ResponseWriter, r *http.Request) { now := model.GetMillis() for _, hook := range incomingHooks { go func() { - if result := <-Srv.Store.Webhook().DeleteIncoming(hook.Id, now); result.Err != nil { + if result := <-Srv.Store.Webhook().DeleteIncoming(c.T, hook.Id, now); result.Err != nil { l4g.Error("Encountered error deleting incoming webhook, id=" + hook.Id) } }() @@ -651,7 +651,7 @@ func deleteChannel(c *Context, w http.ResponseWriter, r *http.Request) { for _, hook := range outgoingHooks { go func() { - if result := <-Srv.Store.Webhook().DeleteOutgoing(hook.Id, now); result.Err != nil { + if result := <-Srv.Store.Webhook().DeleteOutgoing(c.T, hook.Id, now); result.Err != nil { l4g.Error("Encountered error deleting outgoing webhook, id=" + hook.Id) } }() diff --git a/api/post.go b/api/post.go index 87678e9c6..17a3be8ba 100644 --- a/api/post.go +++ b/api/post.go @@ -310,7 +310,7 @@ func handleWebhookEventsAndForget(c *Context, post *model.Post, team *model.Team return } - hchan := Srv.Store.Webhook().GetOutgoingByTeam(c.Session.TeamId) + hchan := Srv.Store.Webhook().GetOutgoingByTeam(c.T, c.Session.TeamId) hooks := []*model.OutgoingWebhook{} diff --git a/api/user.go b/api/user.go index 001caae6c..66125d242 100644 --- a/api/user.go +++ b/api/user.go @@ -1444,11 +1444,11 @@ func PermanentDeleteUser(c *Context, user *model.User) *model.AppError { return result.Err } - if result := <-Srv.Store.Webhook().PermanentDeleteIncomingByUser(user.Id); result.Err != nil { + if result := <-Srv.Store.Webhook().PermanentDeleteIncomingByUser(c.T, user.Id); result.Err != nil { return result.Err } - if result := <-Srv.Store.Webhook().PermanentDeleteOutgoingByUser(user.Id); result.Err != nil { + if result := <-Srv.Store.Webhook().PermanentDeleteOutgoingByUser(c.T, user.Id); result.Err != nil { return result.Err } diff --git a/api/webhook.go b/api/webhook.go index a9a88b7b8..7c7d89866 100644 --- a/api/webhook.go +++ b/api/webhook.go @@ -62,7 +62,7 @@ func createIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { } } - if result := <-Srv.Store.Webhook().SaveIncoming(hook); result.Err != nil { + if result := <-Srv.Store.Webhook().SaveIncoming(c.T, hook); result.Err != nil { c.Err = result.Err return } else { @@ -89,7 +89,7 @@ func deleteIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.Webhook().GetIncoming(id); result.Err != nil { + if result := <-Srv.Store.Webhook().GetIncoming(c.T, id); result.Err != nil { c.Err = result.Err return } else { @@ -100,7 +100,7 @@ func deleteIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { } } - if err := (<-Srv.Store.Webhook().DeleteIncoming(id, model.GetMillis())).Err; err != nil { + if err := (<-Srv.Store.Webhook().DeleteIncoming(c.T, id, model.GetMillis())).Err; err != nil { c.Err = err return } @@ -116,7 +116,7 @@ func getIncomingHooks(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.Webhook().GetIncomingByUser(c.Session.UserId); result.Err != nil { + if result := <-Srv.Store.Webhook().GetIncomingByUser(c.T, c.Session.UserId); result.Err != nil { c.Err = result.Err return } else { @@ -171,7 +171,7 @@ func createOutgoingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.Webhook().SaveOutgoing(hook); result.Err != nil { + if result := <-Srv.Store.Webhook().SaveOutgoing(c.T, hook); result.Err != nil { c.Err = result.Err return } else { @@ -188,7 +188,7 @@ func getOutgoingHooks(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.Webhook().GetOutgoingByCreator(c.Session.UserId); result.Err != nil { + if result := <-Srv.Store.Webhook().GetOutgoingByCreator(c.T, c.Session.UserId); result.Err != nil { c.Err = result.Err return } else { @@ -214,7 +214,7 @@ func deleteOutgoingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-Srv.Store.Webhook().GetOutgoing(id); result.Err != nil { + if result := <-Srv.Store.Webhook().GetOutgoing(c.T, id); result.Err != nil { c.Err = result.Err return } else { @@ -225,7 +225,7 @@ func deleteOutgoingHook(c *Context, w http.ResponseWriter, r *http.Request) { } } - if err := (<-Srv.Store.Webhook().DeleteOutgoing(id, model.GetMillis())).Err; err != nil { + if err := (<-Srv.Store.Webhook().DeleteOutgoing(c.T, id, model.GetMillis())).Err; err != nil { c.Err = err return } @@ -252,7 +252,7 @@ func regenOutgoingHookToken(c *Context, w http.ResponseWriter, r *http.Request) } var hook *model.OutgoingWebhook - if result := <-Srv.Store.Webhook().GetOutgoing(id); result.Err != nil { + if result := <-Srv.Store.Webhook().GetOutgoing(c.T, id); result.Err != nil { c.Err = result.Err return } else { @@ -267,7 +267,7 @@ func regenOutgoingHookToken(c *Context, w http.ResponseWriter, r *http.Request) hook.Token = model.NewId() - if result := <-Srv.Store.Webhook().UpdateOutgoing(hook); result.Err != nil { + if result := <-Srv.Store.Webhook().UpdateOutgoing(c.T, hook); result.Err != nil { c.Err = result.Err return } else { -- cgit v1.2.3-1-g7c22