delete Projects and related correctly on RepoDeletion -> adapt change…

…s of go-gitea#11111

models/issue.go

@@ -1983,6 +1983,11 @@ func deleteIssuesByRepoID(sess Engine, repoID int64) (attachmentPaths []string,
  return
  }
 
+ if _, err = sess.In("issue_id", deleteCond).
+ Delete(&ProjectIssues{}); err != nil {
+ return
+ }
+
  var attachments []*Attachment
  if err = sess.In("issue_id", deleteCond).
  Find(&attachments); err != nil {

models/project.go

@@ -82,10 +82,14 @@ type ProjectSearchOptions struct {
 
 // GetProjects returns a list of all projects that have been created in the repository
 func GetProjects(opts ProjectSearchOptions) ([]*Project, error) {
+ return getProjects(x, opts)
+}
+
+func getProjects(e Engine, opts ProjectSearchOptions) ([]*Project, error) {
 
  projects := make([]*Project, 0, setting.UI.IssuePagingNum)
 
- sess := x.Where("repo_id = ?", opts.RepoID)
+ sess := e.Where("repo_id = ?", opts.RepoID)
  switch opts.IsClosed {
  case util.OptionalBoolTrue:
  sess = sess.Where("is_closed = ?", true)
@@ -242,10 +246,6 @@ func DeleteProjectByID(id int64) error {
  return err
  }
 
- if err := deleteProjectIssuesByProjectID(sess, id); err != nil {
- return err
- }
-
  return sess.Commit()
 }
 
@@ -263,6 +263,14 @@ func deleteProjectByID(e Engine, id int64) error {
  return err
  }
 
+ if err := deleteProjectIssuesByProjectID(e, id); err != nil {
+ return err
+ }
+
+ if err := deleteProjectBoardByProjectID(e, id); err != nil {
+ return err
+ }
+
  if _, err = e.ID(p.ID).Delete(new(Project)); err != nil {
  return err
  }

models/project_board.go

@@ -134,6 +134,11 @@ func deleteProjectBoardByID(e Engine, boardID int64) error {
  return nil
 }
 
+func deleteProjectBoardByProjectID(e Engine, projectID int64) error {
+ _, err := e.Where("project_id=?", projectID).Delete(&ProjectIssues{})
+ return err
+}
+
 // GetProjectBoard fetches the current board of a project
 func GetProjectBoard(boardID int64) (*ProjectBoard, error) {
  return getProjectBoard(x, boardID)

models/repo.go

@@ -1637,6 +1637,18 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
  }
  }
 
+ if projects, err := getProjects(sess, ProjectSearchOptions{
+ RepoID: repoID,
+ }); err != nil {
+ return fmt.Errorf("get projects: %v", err)
+ } else {
+ for i := range projects {
+ if err := deleteProjectByID(sess, projects[i].ID); err != nil {
+ return fmt.Errorf("delete project [%d]: %v", projects[i].ID, err)
+ }
+ }
+ }
+
  // FIXME: Remove repository files should be executed after transaction succeed.
  repoPath := repo.RepoPath()
  removeAllWithNotice(sess, "Delete repository files", repoPath)