@@ -262,45 +262,27 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue) error {
262
262
}
263
263
264
264
// delete all database data still assigned to this issue
265
- if err := issues_model .DeleteInIssue (ctx , issue .ID ,
266
- & issues_model.ContentHistory {},
267
- & issues_model.Comment {},
268
- & issues_model.IssueLabel {},
269
- & issues_model.IssueDependency {},
270
- & issues_model.IssueAssignees {},
271
- & issues_model.IssueUser {},
272
- & activities_model.Notification {},
273
- & issues_model.Reaction {},
274
- & issues_model.IssueWatch {},
275
- & issues_model.Stopwatch {},
276
- & issues_model.TrackedTime {},
277
- & project_model.ProjectIssue {},
278
- & repo_model.Attachment {},
279
- & issues_model.PullRequest {},
265
+ if err := db .DeleteBeans (ctx ,
266
+ & issues_model.ContentHistory {IssueID : issue .ID },
267
+ & issues_model.Comment {IssueID : issue .ID },
268
+ & issues_model.IssueLabel {IssueID : issue .ID },
269
+ & issues_model.IssueDependency {IssueID : issue .ID },
270
+ & issues_model.IssueAssignees {IssueID : issue .ID },
271
+ & issues_model.IssueUser {IssueID : issue .ID },
272
+ & activities_model.Notification {IssueID : issue .ID },
273
+ & issues_model.Reaction {IssueID : issue .ID },
274
+ & issues_model.IssueWatch {IssueID : issue .ID },
275
+ & issues_model.Stopwatch {IssueID : issue .ID },
276
+ & issues_model.TrackedTime {IssueID : issue .ID },
277
+ & project_model.ProjectIssue {IssueID : issue .ID },
278
+ & repo_model.Attachment {IssueID : issue .ID },
279
+ & issues_model.PullRequest {IssueID : issue .ID },
280
+ & issues_model.Comment {RefIssueID : issue .ID },
281
+ & issues_model.IssueDependency {DependencyID : issue .ID },
282
+ & issues_model.Comment {DependentIssueID : issue .ID },
280
283
); err != nil {
281
284
return err
282
285
}
283
286
284
- // References to this issue in other issues
285
- if _ , err := db .DeleteByBean (ctx , & issues_model.Comment {
286
- RefIssueID : issue .ID ,
287
- }); err != nil {
288
- return err
289
- }
290
-
291
- // Delete dependencies for issues in other repositories
292
- if _ , err := db .DeleteByBean (ctx , & issues_model.IssueDependency {
293
- DependencyID : issue .ID ,
294
- }); err != nil {
295
- return err
296
- }
297
-
298
- // delete from dependent issues
299
- if _ , err := db .DeleteByBean (ctx , & issues_model.Comment {
300
- DependentIssueID : issue .ID ,
301
- }); err != nil {
302
- return err
303
- }
304
-
305
287
return committer .Commit ()
306
288
}
0 commit comments