core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix session bugs (#16552) 

* fix deadlog bug

* Fix models/issue_stopwatch.go

* Update models/issue_stopwatch.go

Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
6543 2021-07-26 22:46:06 +02:00 committed by GitHub
parent e76f8cac9a
commit 7c7771e42b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
models/issue_stopwatch.go
View File

@ -9,6 +9,8 @@ import (
"time" "time"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"xorm.io/xorm"
) )
// Stopwatch represents a stopwatch for time tracking. // 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 // HasUserStopwatch returns true if the user has a stopwatch
func HasUserStopwatch(userID int64) (exists bool, sw *Stopwatch, err error) { 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) sw = new(Stopwatch)
exists, err = x. exists, err = e.
Where("user_id = ?", userID). Where("user_id = ?", userID).
Get(sw) Get(sw)
return 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. // CreateOrStopIssueStopwatch will create or remove a stopwatch and will log it into issue's timeline.
func CreateOrStopIssueStopwatch(user *User, issue *Issue) error { 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 { if err != nil {
return err return err
} }
if err := issue.loadRepo(x); err != nil { if err := issue.loadRepo(e); err != nil {
return err return err
} }
@ -90,11 +108,11 @@ func CreateOrStopIssueStopwatch(user *User, issue *Issue) error {
Time: timediff, Time: timediff,
} }
if _, err := x.Insert(tt); err != nil { if _, err := e.Insert(tt); err != nil {
return err return err
} }
if _, err := CreateComment(&CreateCommentOptions{ if _, err := createComment(e, &CreateCommentOptions{
Doer: user, Doer: user,
Issue: issue, Issue: issue,
Repo: issue.Repo, Repo: issue.Repo,
@ -104,21 +122,21 @@ func CreateOrStopIssueStopwatch(user *User, issue *Issue) error {
}); err != nil { }); err != nil {
return err return err
} }
if _, err := x.Delete(sw); err != nil { if _, err := e.Delete(sw); err != nil {
return err return err
} }
} else { } else {
// if another stopwatch is running: stop it // if another stopwatch is running: stop it
exists, sw, err := HasUserStopwatch(user.ID) exists, sw, err := hasUserStopwatch(e, user.ID)
if err != nil { if err != nil {
return err return err
} }
if exists { if exists {
issue, err := getIssueByID(x, sw.IssueID) issue, err := getIssueByID(e, sw.IssueID)
if err != nil { if err != nil {
return err return err
} }
if err := CreateOrStopIssueStopwatch(user, issue); err != nil { if err := createOrStopIssueStopwatch(e, user, issue); err != nil {
return err return err
} }
} }
@ -129,11 +147,11 @@ func CreateOrStopIssueStopwatch(user *User, issue *Issue) error {
IssueID: issue.ID, IssueID: issue.ID,
} }
if _, err := x.Insert(sw); err != nil { if _, err := e.Insert(sw); err != nil {
return err return err
} }
if _, err := CreateComment(&CreateCommentOptions{ if _, err := createComment(e, &CreateCommentOptions{
Doer: user, Doer: user,
Issue: issue, Issue: issue,
Repo: issue.Repo, 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. // CancelStopwatch removes the given stopwatch and logs it into issue's timeline.
func CancelStopwatch(user *User, issue *Issue) error { 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 { if err != nil {
return err return err
} }
if exists { if exists {
if _, err := x.Delete(sw); err != nil { if _, err := e.Delete(sw); err != nil {
return err return err
} }
if err := issue.loadRepo(x); err != nil { if err := issue.loadRepo(e); err != nil {
return err return err
} }
if _, err := CreateComment(&CreateCommentOptions{ if _, err := createComment(e, &CreateCommentOptions{
Doer: user, Doer: user,
Issue: issue, Issue: issue,
Repo: issue.Repo, Repo: issue.Repo,

2
models/repo.go
View File

@ -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. // Give access to all members in teams with access to all repositories.
if u.IsOrganization() { if u.IsOrganization() {
if err := u.GetTeams(&SearchTeamOptions{}); err != nil { if err := u.getTeams(ctx.e); err != nil {
return fmt.Errorf("GetTeams: %v", err) return fmt.Errorf("GetTeams: %v", err)
} }
for _, t := range u.Teams { for _, t := range u.Teams {