diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go index dfcaf58e08..d3c9365dfe 100644 --- a/routers/web/user/notification.go +++ b/routers/web/user/notification.go @@ -111,20 +111,26 @@ func getNotifications(ctx *context.Context) { return } - statuses := []activities_model.NotificationStatus{status, activities_model.NotificationStatusPinned} - nls, err := db.Find[activities_model.Notification](ctx, activities_model.FindNotificationOptions{ - ListOptions: db.ListOptions{ - PageSize: perPage, - Page: page, - }, - UserID: ctx.Doer.ID, - Status: statuses, - }) - if err != nil { - ctx.ServerError("db.Find[activities_model.Notification]", err) - return + sess := db.GetEngine(ctx).Table("notification") + if setting.Database.Type.IsMySQL() { + sess = sess.IndexHint("USE", "JOIN", "IDX_notification_user_id") + } + sess.Where("user_id = ?", ctx.Doer.ID). + And("status = ? OR status = ?", status, activities_model.NotificationStatusPinned). + OrderBy("notification.updated_unix DESC") + + if perPage > 0 { + if page == 0 { + page = 1 + } + sess.Limit(perPage, (page-1)*perPage) } + nls := make([]*activities_model.Notification, 0, perPage) + if err := sess.Find(&nls); err != nil { + ctx.ServerError("FindNotifications", err) + return + } notifications := activities_model.NotificationList(nls) failCount := 0 diff --git a/tests/integration/notification_test.go b/tests/integration/notification_test.go new file mode 100644 index 0000000000..6195ec2282 --- /dev/null +++ b/tests/integration/notification_test.go @@ -0,0 +1,32 @@ +// Copyright 2024 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package integration + +import ( + "net/http" + "testing" + + "code.gitea.io/gitea/models/unittest" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/tests" +) + +func TestNotification(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + session := loginUser(t, user2.Name) + + req := NewRequest(t, "GET", "/notifications") + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + + // Unread and pinned notification. + htmlDoc.AssertElement(t, ".notifications-link[href='/user2/repo1/pulls/3']", true) + htmlDoc.AssertElement(t, ".notifications-link[href='/user2/repo1/issues/4']", true) + htmlDoc.AssertElement(t, ".notifications-link[href='/user2/repo2/issues/1']", true) + + // Read notification. + htmlDoc.AssertElement(t, ".notifications-link[href='/user2/repo2/pulls/2']", false) +}