|
|
@ -174,8 +174,8 @@ func CreateWebhook(w *Webhook) error { |
|
|
|
return err |
|
|
|
return err |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// GetWebhookByID returns webhook of repository by given ID.
|
|
|
|
// GetWebhookByRepoID returns webhook of repository by given ID.
|
|
|
|
func GetWebhookByID(repoID, id int64) (*Webhook, error) { |
|
|
|
func GetWebhookByRepoID(repoID, id int64) (*Webhook, error) { |
|
|
|
w := new(Webhook) |
|
|
|
w := new(Webhook) |
|
|
|
has, err := x.Id(id).And("repo_id=?", repoID).Get(w) |
|
|
|
has, err := x.Id(id).And("repo_id=?", repoID).Get(w) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
@ -186,6 +186,18 @@ func GetWebhookByID(repoID, id int64) (*Webhook, error) { |
|
|
|
return w, nil |
|
|
|
return w, nil |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// GetWebhookByOrgID returns webhook of organization by given ID.
|
|
|
|
|
|
|
|
func GetWebhookByOrgID(orgID, id int64) (*Webhook, error) { |
|
|
|
|
|
|
|
w := new(Webhook) |
|
|
|
|
|
|
|
has, err := x.Id(id).And("org_id=?", orgID).Get(w) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return nil, err |
|
|
|
|
|
|
|
} else if !has { |
|
|
|
|
|
|
|
return nil, ErrWebhookNotExist{id} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return w, nil |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// GetActiveWebhooksByRepoID returns all active webhooks of repository.
|
|
|
|
// GetActiveWebhooksByRepoID returns all active webhooks of repository.
|
|
|
|
func GetActiveWebhooksByRepoID(repoID int64) (ws []*Webhook, err error) { |
|
|
|
func GetActiveWebhooksByRepoID(repoID int64) (ws []*Webhook, err error) { |
|
|
|
err = x.Where("repo_id=?", repoID).And("is_active=?", true).Find(&ws) |
|
|
|
err = x.Where("repo_id=?", repoID).And("is_active=?", true).Find(&ws) |
|
|
@ -221,8 +233,8 @@ func DeleteWebhook(id int64) (err error) { |
|
|
|
return sess.Commit() |
|
|
|
return sess.Commit() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// GetWebhooksByOrgId returns all webhooks for an organization.
|
|
|
|
// GetWebhooksByOrgID returns all webhooks for an organization.
|
|
|
|
func GetWebhooksByOrgId(orgID int64) (ws []*Webhook, err error) { |
|
|
|
func GetWebhooksByOrgID(orgID int64) (ws []*Webhook, err error) { |
|
|
|
err = x.Find(&ws, &Webhook{OrgID: orgID}) |
|
|
|
err = x.Find(&ws, &Webhook{OrgID: orgID}) |
|
|
|
return ws, err |
|
|
|
return ws, err |
|
|
|
} |
|
|
|
} |
|
|
@ -548,7 +560,7 @@ func (t *HookTask) deliver() { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Update webhook last delivery status.
|
|
|
|
// Update webhook last delivery status.
|
|
|
|
w, err := GetWebhookByID(t.RepoID, t.HookID) |
|
|
|
w, err := GetWebhookByRepoID(t.RepoID, t.HookID) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
log.Error(5, "GetWebhookByID: %v", err) |
|
|
|
log.Error(5, "GetWebhookByID: %v", err) |
|
|
|
return |
|
|
|
return |
|
|
|