luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(server): correct notification pagination by using 'lt' instead of 'gt' for createdAt (#11430)

Browse Source
This commit is contained in:
fengmk2
2025-04-03 01:25:35 +00:00
parent bd5428e311
commit a5eb1b9985
2 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
packages/backend/server/src/__tests__/e2e/notification/resolver.spec.ts
View File

@@ -625,24 +625,7 @@ e2e('should list and count notifications', async t => {
t.is(body2.workspace!.name, 'test-workspace-name'); t.is(body2.workspace!.name, 'test-workspace-name');
t.falsy(body2.workspace!.avatarUrl); t.falsy(body2.workspace!.avatarUrl);
await app.login(owner); // load more notifications
await app.gql({
query: mentionUserMutation,
variables: {
input: {
userId: member.id,
workspaceId: workspace.id,
doc: {
id: 'doc-id-5',
title: 'doc-title-5',
blockId: 'block-id-5',
mode: DocMode.page,
},
},
},
});
// get new notifications
await app.login(member); await app.login(member);
const result2 = await app.gql({ const result2 = await app.gql({
query: listNotificationsQuery, query: listNotificationsQuery,
@@ -650,43 +633,43 @@ e2e('should list and count notifications', async t => {
pagination: { pagination: {
first: 2, first: 2,
offset: 0, offset: 0,
after: result.currentUser!.notifications.pageInfo.startCursor, after: result.currentUser!.notifications.pageInfo.endCursor,
}, },
}, },
}); });
t.is(result2.currentUser!.notifications.totalCount, 5); t.is(result2.currentUser!.notifications.totalCount, 4);
t.is(result2.currentUser!.notifications.pageInfo.hasNextPage, false); t.is(result2.currentUser!.notifications.pageInfo.hasNextPage, true);
t.is(result2.currentUser!.notifications.pageInfo.hasPreviousPage, true); t.is(result2.currentUser!.notifications.pageInfo.hasPreviousPage, true);
const notifications2 = result2.currentUser!.notifications.edges.map( const notifications2 = result2.currentUser!.notifications.edges.map(
edge => edge.node edge => edge.node
) as NotificationObjectType[]; ) as NotificationObjectType[];
t.is(notifications2.length, 1); t.is(notifications2.length, 2);
const notification3 = notifications2[0]; const notification3 = notifications2[0];
t.is(notification3.read, false); t.is(notification3.read, false);
const body3 = notification3.body as MentionNotificationBodyType; const body3 = notification3.body as MentionNotificationBodyType;
t.is(body3.workspace!.id, workspace.id); t.is(body3.workspace!.id, workspace.id);
t.is(body3.doc.id, 'doc-id-5'); t.is(body3.doc.id, 'doc-id-2');
t.is(body3.doc.title, 'doc-title-5'); t.is(body3.doc.title, 'doc-title-2');
t.is(body3.doc.blockId, 'block-id-5'); t.is(body3.doc.blockId, 'block-id-2');
t.is(body3.createdByUser!.id, owner.id); t.is(body3.createdByUser!.id, owner.id);
t.is(body3.createdByUser!.name, owner.name); t.is(body3.createdByUser!.name, owner.name);
t.is(body3.workspace!.id, workspace.id); t.is(body3.workspace!.id, workspace.id);
t.is(body3.workspace!.name, 'test-workspace-name'); t.is(body3.workspace!.name, 'test-workspace-name');
t.falsy(body3.workspace!.avatarUrl); t.falsy(body3.workspace!.avatarUrl);
// no new notifications // no notifications
const result3 = await app.gql({ const result3 = await app.gql({
query: listNotificationsQuery, query: listNotificationsQuery,
variables: { variables: {
pagination: { pagination: {
first: 2, first: 2,
offset: 0, offset: 0,
after: result2.currentUser!.notifications.pageInfo.startCursor, after: result2.currentUser!.notifications.pageInfo.endCursor,
}, },
}, },
}); });
t.is(result3.currentUser!.notifications.totalCount, 5); t.is(result3.currentUser!.notifications.totalCount, 4);
t.is(result3.currentUser!.notifications.pageInfo.hasNextPage, false); t.is(result3.currentUser!.notifications.pageInfo.hasNextPage, false);
t.is(result3.currentUser!.notifications.pageInfo.hasPreviousPage, true); t.is(result3.currentUser!.notifications.pageInfo.hasPreviousPage, true);
t.is(result3.currentUser!.notifications.pageInfo.startCursor, null); t.is(result3.currentUser!.notifications.pageInfo.startCursor, null);

2
packages/backend/server/src/models/notification.ts
View File

@@ -209,7 +209,7 @@ export class NotificationModel extends BaseModel {
where: { where: {
userId, userId,
...(options?.includeRead ? {} : { read: false }), ...(options?.includeRead ? {} : { read: false }),
...(options?.after ? { createdAt: { gt: options.after } } : {}), ...(options?.after ? { createdAt: { lt: options.after } } : {}),
}, },
orderBy: { createdAt: 'desc' }, orderBy: { createdAt: 'desc' },
skip: options?.offset, skip: options?.offset,