Skip to content

Fix session bugs #16552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lafriks merged 3 commits into from
Jul 26, 2021
Merged

Fix session bugs #16552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f572027
fix deadlog bug
6543 Jul 26, 2021
740b22f
Fix models/issue_stopwatch.go
6543 Jul 26, 2021
85d98b6
Update models/issue_stopwatch.go
6543 Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 45 additions & 15 deletions models/issue_stopwatch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (
"time"

"code.gitea.io/gitea/modules/timeutil"

"xorm.io/xorm"
)

// Stopwatch represents a stopwatch for time tracking.
Expand Down Expand Up @@ -61,20 +63,36 @@ 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
}

// 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
}

Expand All @@ -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,
Expand All @@ -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
}
}
Expand All @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion models/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down