Decouple HookTask from Repository

models/fixtures/hook_task.yml

@@ -1,6 +1,5 @@
 -
  id: 1
- repo_id: 1
  hook_id: 1
  uuid: uuid1
  is_delivered: true

models/repo.go

@@ -796,14 +796,23 @@ func DeleteRepository(doer *user_model.User, uid, repoID int64) error {
 return err
 }
 
+hooks, err := webhook.ListWebhooksByOptsCtx(ctx, &webhook.ListWebhookOptions{RepoID: repoID})
+if err != nil {
+return err
+}
+for _, hook := range hooks {
+if err := db.DeleteBeans(ctx, &webhook.HookTask{HookID: hook.ID}); err != nil {
+return err
+}
+}
+
 if err := db.DeleteBeans(ctx,
 &Access{RepoID: repo.ID},
 &Action{RepoID: repo.ID},
 &Collaboration{RepoID: repoID},
 &Comment{RefRepoID: repoID},
 &CommitStatus{RepoID: repoID},
 &DeletedBranch{RepoID: repoID},
-&webhook.HookTask{RepoID: repoID},
 &LFSLock{RepoID: repoID},
 &repo_model.LanguageStat{RepoID: repoID},
 &Milestone{RepoID: repoID},

models/webhook/hooktask.go

@@ -100,7 +100,7 @@ type HookResponse struct {
 // HookTask represents a hook task.
 type HookTask struct {
 ID int64 `xorm:"pk autoincr"`
-RepoID int64 `xorm:"INDEX"`
+RepoID int64 `xorm:"INDEX"` // unused
 HookID int64
 UUID string
 api.Payloader `xorm:"-"`
@@ -191,10 +191,8 @@ func UpdateHookTask(t *HookTask) error {
 }
 
 // ReplayHookTask copies a hook task to get re-delivered
-func ReplayHookTask(hookID int64, uuid string) (*HookTask, error) {
-var newTask *HookTask
-
-err := db.WithTx(func(ctx context.Context) error {
+func ReplayHookTask(hookID int64, uuid string) error {
+return db.WithTx(func(ctx context.Context) error {
 task := &HookTask{
 HookID: hookID,
 UUID: uuid,
@@ -209,17 +207,14 @@ func ReplayHookTask(hookID int64, uuid string) (*HookTask, error) {
 }
 }
 
-newTask = &HookTask{
+newTask := &HookTask{
 UUID: gouuid.New().String(),
-RepoID: task.RepoID,
 HookID: task.HookID,
 PayloadContent: task.PayloadContent,
 EventType: task.EventType,
 }
 return db.Insert(ctx, newTask)
 })
-
-return newTask, err
 }
 
 // FindUndeliveredHookTasks represents find the undelivered hook tasks
@@ -231,15 +226,6 @@ func FindUndeliveredHookTasks() ([]*HookTask, error) {
 return tasks, nil
 }
 
-// FindRepoUndeliveredHookTasks represents find the undelivered hook tasks of one repository
-func FindRepoUndeliveredHookTasks(repoID int64) ([]*HookTask, error) {
-tasks := make([]*HookTask, 0, 5)
-if err := db.GetEngine(db.DefaultContext).Where("repo_id=? AND is_delivered=?", repoID, false).Find(&tasks); err != nil {
-return nil, err
-}
-return tasks, nil
-}
-
 // CleanupHookTaskTable deletes rows from hook_task as needed.
 func CleanupHookTaskTable(ctx context.Context, cleanupType HookTaskCleanupType, olderThan time.Duration, numberToKeep int) error {
 log.Trace("Doing: CleanupHookTaskTable")

models/webhook/webhook.go

@@ -446,8 +446,10 @@ func (opts *ListWebhookOptions) toCond() builder.Cond {
 return cond
 }
 
-func listWebhooksByOpts(e db.Engine, opts *ListWebhookOptions) ([]*Webhook, error) {
-sess := e.Where(opts.toCond())
+// ListWebhooksByOptsCtx return webhooks based on options
+func ListWebhooksByOptsCtx(ctx context.Context, opts *ListWebhookOptions) ([]*Webhook, error) {
+sess := db.GetEngine(ctx).
+Where(opts.toCond())
 
 if opts.Page != 0 {
 sess = db.SetSessionPagination(sess, opts)
@@ -463,7 +465,7 @@ func listWebhooksByOpts(e db.Engine, opts *ListWebhookOptions) ([]*Webhook, erro
 
 // ListWebhooksByOpts return webhooks based on options
 func ListWebhooksByOpts(opts *ListWebhookOptions) ([]*Webhook, error) {
-return listWebhooksByOpts(db.GetEngine(db.DefaultContext), opts)
+return ListWebhooksByOptsCtx(db.DefaultContext, opts)
 }
 
 // CountWebhooksByOpts count webhooks based on options and ignore pagination

models/webhook/webhook_test.go

@@ -207,7 +207,6 @@ func TestHookTasks(t *testing.T) {
 func TestCreateHookTask(t *testing.T) {
 assert.NoError(t, unittest.PrepareTestDatabase())
 hookTask := &HookTask{
-RepoID: 3,
 HookID: 3,
 Payloader: &api.PushPayload{},
 }
@@ -231,7 +230,6 @@ func TestUpdateHookTask(t *testing.T) {
 func TestCleanupHookTaskTable_PerWebhook_DeletesDelivered(t *testing.T) {
 assert.NoError(t, unittest.PrepareTestDatabase())
 hookTask := &HookTask{
-RepoID: 3,
 HookID: 3,
 Payloader: &api.PushPayload{},
 IsDelivered: true,
@@ -248,7 +246,6 @@ func TestCleanupHookTaskTable_PerWebhook_DeletesDelivered(t *testing.T) {
 func TestCleanupHookTaskTable_PerWebhook_LeavesUndelivered(t *testing.T) {
 assert.NoError(t, unittest.PrepareTestDatabase())
 hookTask := &HookTask{
-RepoID: 2,
 HookID: 4,
 Payloader: &api.PushPayload{},
 IsDelivered: false,
@@ -264,7 +261,6 @@ func TestCleanupHookTaskTable_PerWebhook_LeavesUndelivered(t *testing.T) {
 func TestCleanupHookTaskTable_PerWebhook_LeavesMostRecentTask(t *testing.T) {
 assert.NoError(t, unittest.PrepareTestDatabase())
 hookTask := &HookTask{
-RepoID: 2,
 HookID: 4,
 Payloader: &api.PushPayload{},
 IsDelivered: true,
@@ -281,7 +277,6 @@ func TestCleanupHookTaskTable_PerWebhook_LeavesMostRecentTask(t *testing.T) {
 func TestCleanupHookTaskTable_OlderThan_DeletesDelivered(t *testing.T) {
 assert.NoError(t, unittest.PrepareTestDatabase())
 hookTask := &HookTask{
-RepoID: 3,
 HookID: 3,
 Payloader: &api.PushPayload{},
 IsDelivered: true,
@@ -298,7 +293,6 @@ func TestCleanupHookTaskTable_OlderThan_DeletesDelivered(t *testing.T) {
 func TestCleanupHookTaskTable_OlderThan_LeavesUndelivered(t *testing.T) {
 assert.NoError(t, unittest.PrepareTestDatabase())
 hookTask := &HookTask{
-RepoID: 2,
 HookID: 4,
 Payloader: &api.PushPayload{},
 IsDelivered: false,
@@ -314,7 +308,6 @@ func TestCleanupHookTaskTable_OlderThan_LeavesUndelivered(t *testing.T) {
 func TestCleanupHookTaskTable_OlderThan_LeavesTaskEarlierThanAgeToDelete(t *testing.T) {
 assert.NoError(t, unittest.PrepareTestDatabase())
 hookTask := &HookTask{
-RepoID: 2,
 HookID: 4,
 Payloader: &api.PushPayload{},
 IsDelivered: true,