One Func to RecalculateIssueIndexForRepo

Author: 6543

models/index.go

@@ -111,10 +111,3 @@ func getNextResourceIndex(tableName string, groupID int64) (int64, error) {
 	}
 	return curIdx, nil
 }
-
-// UpdateResourceIndex is used to set max_index to a specific value.
-// !!! Only used to set max_index after repo migration !!!
-func UpdateResourceIndex(tableName string, groupID, max int64) error {
-	_, err := x.Exec(fmt.Sprintf("UPDATE %s SET max_index=? WHERE group_id=?", tableName), max, groupID)
-	return err
-}

models/issue.go

@@ -982,11 +982,29 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) {
 	return opts.Issue.addCrossReferences(e, doer, false)
 }
 
-// GetMaxIssueIndex return highest index of an issue based on repo id.
-// !!! Only used it to calculate entry for issue_index on repo migration !!!
-func GetMaxIssueIndex(repoID int64) (max int64, err error) {
-	_, err = x.Select(" MAX(`index`)").Table("issue").Where("repo_id=?", repoID).Get(&max)
-	return
+// RecalculateIssueIndexForRepo create issue_index for repo if not exist and
+// update it based on highest index of existing issues assigned to a repo
+func RecalculateIssueIndexForRepo(repoID int64) error {
+	sess := x.NewSession()
+	defer sess.Close()
+	if err := sess.Begin(); err != nil {
+		return err
+	}
+
+	if err := upsertResourceIndex(sess, "issue_index", repoID); err != nil {
+		return err
+	}
+
+	var max int64
+	if _, err := sess.Select(" MAX(`index`)").Table("issue").Where("repo_id=?", repoID).Get(&max); err != nil {
+		return err
+	}
+
+	if _, err := sess.Exec("UPDATE `issue_index` SET max_index=? WHERE group_id=?", max, repoID); err != nil {
+		return err
+	}
+
+	return sess.Commit()
 }
 
 // NewIssue creates new issue with labels for repository.

modules/migrations/gitea_uploader.go

@@ -872,16 +872,7 @@ func (g *GiteaLocalUploader) Finish() error {
 	}
 
 	// update issue_index
-	max, err := models.GetMaxIssueIndex(g.repo.ID)
-	if err != nil {
-		return err
-	}
-
-	if _, err := models.GetNextResourceIndex("issue_index", g.repo.ID); err != nil {
-		return err
-	}
-
-	if err := models.UpdateResourceIndex("issue_index", g.repo.ID, max); err != nil {
+	if err := models.RecalculateIssueIndexForRepo(g.repo.ID); err != nil {
 		return err
 	}