From 78638d4879ef1e1673f711acd23591f9e7f8b98e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 3 Aug 2023 17:26:02 +0800 Subject: [PATCH 1/6] Fix bug with sqlite load read --- models/activities/notification.go | 2 +- models/issues/issue_user.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/activities/notification.go b/models/activities/notification.go index e0af2ee8bbf56..0eb0d2f6dfb0a 100644 --- a/models/activities/notification.go +++ b/models/activities/notification.go @@ -742,7 +742,7 @@ func GetUIDsAndNotificationCounts(since, until timeutil.TimeStamp) ([]UserIDCoun // SetIssueReadBy sets issue to be read by given user. func SetIssueReadBy(ctx context.Context, issueID, userID int64) error { - if err := issues_model.UpdateIssueUserByRead(userID, issueID); err != nil { + if err := issues_model.UpdateIssueUserByRead(ctx, userID, issueID); err != nil { return err } diff --git a/models/issues/issue_user.go b/models/issues/issue_user.go index 47da5c62c4d4a..d053b1d54350b 100644 --- a/models/issues/issue_user.go +++ b/models/issues/issue_user.go @@ -55,8 +55,8 @@ func NewIssueUsers(ctx context.Context, repo *repo_model.Repository, issue *Issu } // UpdateIssueUserByRead updates issue-user relation for reading. -func UpdateIssueUserByRead(uid, issueID int64) error { - _, err := db.GetEngine(db.DefaultContext).Exec("UPDATE `issue_user` SET is_read=? WHERE uid=? AND issue_id=?", true, uid, issueID) +func UpdateIssueUserByRead(ctx context.Context, uid, issueID int64) error { + _, err := db.GetEngine(ctx).Exec("UPDATE `issue_user` SET is_read=? WHERE uid=? AND issue_id=?", true, uid, issueID) return err } From 31422c3ddfab66e85b6b0fff014c8eb1ffb31edb Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 3 Aug 2023 17:36:47 +0800 Subject: [PATCH 2/6] Add test for read --- models/activities/notification_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/models/activities/notification_test.go b/models/activities/notification_test.go index 36b63b266b1e6..d55e5348164f5 100644 --- a/models/activities/notification_test.go +++ b/models/activities/notification_test.go @@ -4,6 +4,7 @@ package activities_test import ( + "context" "testing" activities_model "code.gitea.io/gitea/models/activities" @@ -109,3 +110,17 @@ func TestUpdateNotificationStatuses(t *testing.T) { unittest.AssertExistsAndLoadBean(t, &activities_model.Notification{ID: notfPinned.ID, Status: activities_model.NotificationStatusPinned}) } + +func TestSetIssueReadBy(t *testing.T) { + assert.NoError(t, unittest.PrepareTestDatabase()) + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1}) + db.WithTx(db.DefaultContext, func(ctx context.Context) error { + assert.NoError(t, activities_model.SetIssueReadBy(ctx, issue.ID, user.ID)) + return nil + }) + + cnt, err := activities_model.GetNotificationCount(db.DefaultContext, user, activities_model.NotificationStatusUnread) + assert.NoError(t, err) + assert.EqualValues(t, 0, cnt) +} From 03ee8b2b6fd747005e82daf4e46fb05fbd967097 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 3 Aug 2023 22:48:25 +0800 Subject: [PATCH 3/6] Fix test --- models/issues/issue_user_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/issues/issue_user_test.go b/models/issues/issue_user_test.go index 0daace6c9b19c..ce47adb53a0b5 100644 --- a/models/issues/issue_user_test.go +++ b/models/issues/issue_user_test.go @@ -40,13 +40,13 @@ func TestUpdateIssueUserByRead(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1}) - assert.NoError(t, issues_model.UpdateIssueUserByRead(4, issue.ID)) + assert.NoError(t, issues_model.UpdateIssueUserByRead(db.DefaultContext, 4, issue.ID)) unittest.AssertExistsAndLoadBean(t, &issues_model.IssueUser{IssueID: issue.ID, UID: 4}, "is_read=1") - assert.NoError(t, issues_model.UpdateIssueUserByRead(4, issue.ID)) + assert.NoError(t, issues_model.UpdateIssueUserByRead(db.DefaultContext, 4, issue.ID)) unittest.AssertExistsAndLoadBean(t, &issues_model.IssueUser{IssueID: issue.ID, UID: 4}, "is_read=1") - assert.NoError(t, issues_model.UpdateIssueUserByRead(unittest.NonexistentID, unittest.NonexistentID)) + assert.NoError(t, issues_model.UpdateIssueUserByRead(db.DefaultContext, unittest.NonexistentID, unittest.NonexistentID)) } func TestUpdateIssueUsersByMentions(t *testing.T) { From 5971f67ead3f5adbe6bd749bc223b2b441be1197 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 4 Aug 2023 12:20:50 +0800 Subject: [PATCH 4/6] Fix test --- models/activities/notification.go | 7 ++++--- models/activities/notification_test.go | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/models/activities/notification.go b/models/activities/notification.go index 0eb0d2f6dfb0a..ccd21d5f6a179 100644 --- a/models/activities/notification.go +++ b/models/activities/notification.go @@ -310,7 +310,7 @@ func createIssueNotification(ctx context.Context, userID int64, issue *issues_mo } func updateIssueNotification(ctx context.Context, userID, issueID, commentID, updatedByID int64) error { - notification, err := getIssueNotification(ctx, userID, issueID) + notification, err := GetIssueNotification(ctx, userID, issueID) if err != nil { return err } @@ -331,7 +331,8 @@ func updateIssueNotification(ctx context.Context, userID, issueID, commentID, up return err } -func getIssueNotification(ctx context.Context, userID, issueID int64) (*Notification, error) { +// GetIssueNotification return the notification about an issue +func GetIssueNotification(ctx context.Context, userID, issueID int64) (*Notification, error) { notification := new(Notification) _, err := db.GetEngine(ctx). Where("user_id = ?", userID). @@ -750,7 +751,7 @@ func SetIssueReadBy(ctx context.Context, issueID, userID int64) error { } func setIssueNotificationStatusReadIfUnread(ctx context.Context, userID, issueID int64) error { - notification, err := getIssueNotification(ctx, userID, issueID) + notification, err := GetIssueNotification(ctx, userID, issueID) // ignore if not exists if err != nil { return nil diff --git a/models/activities/notification_test.go b/models/activities/notification_test.go index d55e5348164f5..afe814657bfd5 100644 --- a/models/activities/notification_test.go +++ b/models/activities/notification_test.go @@ -120,7 +120,7 @@ func TestSetIssueReadBy(t *testing.T) { return nil }) - cnt, err := activities_model.GetNotificationCount(db.DefaultContext, user, activities_model.NotificationStatusUnread) + nt, err := activities_model.GetIssueNotification(db.DefaultContext, user.ID, issue.ID) assert.NoError(t, err) - assert.EqualValues(t, 0, cnt) + assert.EqualValues(t, activities_model.NotificationStatusRead, nt.Status) } From 6b896c1839eabe8a5be116abad58917beaf9c9e8 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 4 Aug 2023 13:10:09 +0800 Subject: [PATCH 5/6] Fix test --- models/activities/notification.go | 2 +- models/activities/notification_test.go | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/models/activities/notification.go b/models/activities/notification.go index ccd21d5f6a179..ef263ef735c3d 100644 --- a/models/activities/notification.go +++ b/models/activities/notification.go @@ -763,7 +763,7 @@ func setIssueNotificationStatusReadIfUnread(ctx context.Context, userID, issueID notification.Status = NotificationStatusRead - _, err = db.GetEngine(ctx).ID(notification.ID).Update(notification) + _, err = db.GetEngine(ctx).ID(notification.ID).Cols("status").Update(notification) return err } diff --git a/models/activities/notification_test.go b/models/activities/notification_test.go index afe814657bfd5..3c7c860ff037f 100644 --- a/models/activities/notification_test.go +++ b/models/activities/notification_test.go @@ -115,10 +115,9 @@ func TestSetIssueReadBy(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1}) - db.WithTx(db.DefaultContext, func(ctx context.Context) error { - assert.NoError(t, activities_model.SetIssueReadBy(ctx, issue.ID, user.ID)) - return nil - }) + assert.NoError(t, db.WithTx(db.DefaultContext, func(ctx context.Context) error { + return activities_model.SetIssueReadBy(ctx, issue.ID, user.ID) + })) nt, err := activities_model.GetIssueNotification(db.DefaultContext, user.ID, issue.ID) assert.NoError(t, err) From 070dc4f262e1953c33b488d48ed3690d164a3dba Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 5 Aug 2023 10:09:15 +0800 Subject: [PATCH 6/6] Fix test --- models/activities/notification_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/activities/notification_test.go b/models/activities/notification_test.go index 3c7c860ff037f..2d4c369a99b04 100644 --- a/models/activities/notification_test.go +++ b/models/activities/notification_test.go @@ -113,7 +113,7 @@ func TestUpdateNotificationStatuses(t *testing.T) { func TestSetIssueReadBy(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1}) assert.NoError(t, db.WithTx(db.DefaultContext, func(ctx context.Context) error { return activities_model.SetIssueReadBy(ctx, issue.ID, user.ID)