Fix session bugs (#16552) (#16553)

* Fix session bugs (#16552)

* fix deadlog bug

* Fix models/issue_stopwatch.go

* Update models/issue_stopwatch.go

Co-authored-by: zeripath <art27@cantab.net>
* fix getLatestCommitStatus

Co-authored-by: zeripath <art27@cantab.net>

diff --git a/models/commit_status.go b/models/commit_status.go
index 1105c3b1731568ef40eb68795977d1d859e4c5ff..4193ad0d08d411f7f01be6490c9bc800d90da06e 100644 (file)
--- a/models/commit_status.go
+++ b/models/commit_status.go
@@ -160,7 +160,7 @@ func getLatestCommitStatus(e Engine, repoID int64, sha string, listOptions ListO
        if len(ids) == 0 {
                return statuses, nil
        }
-       return statuses, x.In("id", ids).Find(&statuses)
+       return statuses, e.In("id", ids).Find(&statuses)
 }
 
 // FindRepoRecentCommitStatusContexts returns repository's recent commit status contexts

diff --git a/models/issue_stopwatch.go b/models/issue_stopwatch.go
index b72dcaf60c67c18a1edbbbd98a34d5640c4a1c37..8cdad94fd4ae1b875efb891fc003c2c508708cb7 100644 (file)
--- a/models/issue_stopwatch.go
+++ b/models/issue_stopwatch.go
@@ -9,6 +9,8 @@ import (
        "time"
 
        "code.gitea.io/gitea/modules/timeutil"
+
+       "xorm.io/xorm"
 )
 
 // Stopwatch represents a stopwatch for time tracking.
@@ -61,8 +63,12 @@ func StopwatchExists(userID, issueID int64) bool {
 
 // HasUserStopwatch returns true if the user has a stopwatch
 func HasUserStopwatch(userID int64) (exists bool, sw *Stopwatch, err error) {
+       return hasUserStopwatch(x, userID)
+}
+
+func hasUserStopwatch(e Engine, userID int64) (exists bool, sw *Stopwatch, err error) {
        sw = new(Stopwatch)
-       exists, err = x.
+       exists, err = e.
                Where("user_id = ?", userID).
                Get(sw)
        return
@@ -70,11 +76,23 @@ func HasUserStopwatch(userID int64) (exists bool, sw *Stopwatch, err error) {
 
 // CreateOrStopIssueStopwatch will create or remove a stopwatch and will log it into issue's timeline.
 func CreateOrStopIssueStopwatch(user *User, issue *Issue) error {
-       sw, exists, err := getStopwatch(x, user.ID, issue.ID)
+       sess := x.NewSession()
+       defer sess.Close()
+       if err := sess.Begin(); err != nil {
+               return err
+       }
+       if err := createOrStopIssueStopwatch(sess, user, issue); err != nil {
+               return err
+       }
+       return sess.Commit()
+}
+
+func createOrStopIssueStopwatch(e *xorm.Session, user *User, issue *Issue) error {
+       sw, exists, err := getStopwatch(e, user.ID, issue.ID)
        if err != nil {
                return err
        }
-       if err := issue.loadRepo(x); err != nil {
+       if err := issue.loadRepo(e); err != nil {
                return err
        }
 
@@ -90,11 +108,11 @@ func CreateOrStopIssueStopwatch(user *User, issue *Issue) error {
                        Time:    timediff,
                }
 
-               if _, err := x.Insert(tt); err != nil {
+               if _, err := e.Insert(tt); err != nil {
                        return err
                }
 
-               if _, err := CreateComment(&CreateCommentOptions{
+               if _, err := createComment(e, &CreateCommentOptions{
                        Doer:    user,
                        Issue:   issue,
                        Repo:    issue.Repo,
@@ -104,21 +122,21 @@ func CreateOrStopIssueStopwatch(user *User, issue *Issue) error {
                }); err != nil {
                        return err
                }
-               if _, err := x.Delete(sw); err != nil {
+               if _, err := e.Delete(sw); err != nil {
                        return err
                }
        } else {
                // if another stopwatch is running: stop it
-               exists, sw, err := HasUserStopwatch(user.ID)
+               exists, sw, err := hasUserStopwatch(e, user.ID)
                if err != nil {
                        return err
                }
                if exists {
-                       issue, err := getIssueByID(x, sw.IssueID)
+                       issue, err := getIssueByID(e, sw.IssueID)
                        if err != nil {
                                return err
                        }
-                       if err := CreateOrStopIssueStopwatch(user, issue); err != nil {
+                       if err := createOrStopIssueStopwatch(e, user, issue); err != nil {
                                return err
                        }
                }
@@ -129,11 +147,11 @@ func CreateOrStopIssueStopwatch(user *User, issue *Issue) error {
                        IssueID: issue.ID,
                }
 
-               if _, err := x.Insert(sw); err != nil {
+               if _, err := e.Insert(sw); err != nil {
                        return err
                }
 
-               if _, err := CreateComment(&CreateCommentOptions{
+               if _, err := createComment(e, &CreateCommentOptions{
                        Doer:  user,
                        Issue: issue,
                        Repo:  issue.Repo,
@@ -147,21 +165,33 @@ func CreateOrStopIssueStopwatch(user *User, issue *Issue) error {
 
 // CancelStopwatch removes the given stopwatch and logs it into issue's timeline.
 func CancelStopwatch(user *User, issue *Issue) error {
-       sw, exists, err := getStopwatch(x, user.ID, issue.ID)
+       sess := x.NewSession()
+       defer sess.Close()
+       if err := sess.Begin(); err != nil {
+               return err
+       }
+       if err := cancelStopwatch(sess, user, issue); err != nil {
+               return err
+       }
+       return sess.Commit()
+}
+
+func cancelStopwatch(e *xorm.Session, user *User, issue *Issue) error {
+       sw, exists, err := getStopwatch(e, user.ID, issue.ID)
        if err != nil {
                return err
        }
 
        if exists {
-               if _, err := x.Delete(sw); err != nil {
+               if _, err := e.Delete(sw); err != nil {
                        return err
                }
 
-               if err := issue.loadRepo(x); err != nil {
+               if err := issue.loadRepo(e); err != nil {
                        return err
                }
 
-               if _, err := CreateComment(&CreateCommentOptions{
+               if _, err := createComment(e, &CreateCommentOptions{
                        Doer:  user,
                        Issue: issue,
                        Repo:  issue.Repo,

diff --git a/models/repo.go b/models/repo.go
index de8a2825313ad9595899d80262cf63bef573386e..93827f6a8842cb76ac0632e8d599a645ca5011d5 100644 (file)
--- a/models/repo.go
+++ b/models/repo.go
@@ -1125,7 +1125,7 @@ func CreateRepository(ctx DBContext, doer, u *User, repo *Repository, overwriteO
 
        // Give access to all members in teams with access to all repositories.
        if u.IsOrganization() {
-               if err := u.GetTeams(&SearchTeamOptions{}); err != nil {
+               if err := u.getTeams(ctx.e); err != nil {
                        return fmt.Errorf("GetTeams: %v", err)
                }
                for _, t := range u.Teams {