diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2022-10-16 18:44:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-16 18:44:16 +0800 |
| commit | 6f48a36227b7427afd2020aa416afe49d4c81015 (patch) | |
| tree | acf275dd1daec784c756014d6aba0225fb60558f /models/issues/pull.go | |
| parent | 0647df3e831c320436d42a5572a6ec6a9d23d8b1 (diff) | |
| download | gitea-6f48a36227b7427afd2020aa416afe49d4c81015.tar.gz gitea-6f48a36227b7427afd2020aa416afe49d4c81015.zip | |
Refactor GetNextResourceIndex to make it work properly with transaction (#21469)
Related:
* #21362
This PR uses a general and stable method to generate resource index (eg:
Issue Index, PR Index)
If the code looks good, I can add more tests
ps: please skip the diff, only have a look at the new code. It's
entirely re-written.
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'models/issues/pull.go')
| -rw-r--r-- | models/issues/pull.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/models/issues/pull.go b/models/issues/pull.go index f96b03445e..69259c269f 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -490,13 +490,6 @@ func (pr *PullRequest) SetMerged(ctx context.Context) (bool, error) { // NewPullRequest creates new pull request with labels for repository. func NewPullRequest(outerCtx context.Context, repo *repo_model.Repository, issue *Issue, labelIDs []int64, uuids []string, pr *PullRequest) (err error) { - idx, err := db.GetNextResourceIndex("issue_index", repo.ID) - if err != nil { - return fmt.Errorf("generate pull request index failed: %v", err) - } - - issue.Index = idx - ctx, committer, err := db.TxContext() if err != nil { return err @@ -504,6 +497,13 @@ func NewPullRequest(outerCtx context.Context, repo *repo_model.Repository, issue defer committer.Close() ctx.WithContext(outerCtx) + idx, err := db.GetNextResourceIndex(ctx, "issue_index", repo.ID) + if err != nil { + return fmt.Errorf("generate pull request index failed: %v", err) + } + + issue.Index = idx + if err = NewIssueWithIndex(ctx, issue.Poster, NewIssueOptions{ Repo: repo, Issue: issue, |