Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Server: Prevent item size calculation task from failing when a user has been deleted

pull/10781/head
Laurent Cozic 2024-07-24 19:15:52 +01:00
parent 331f7ebe5c
commit e6ec27a501
2 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
packages/server/src/models/ItemModel.test.ts
View File

@ -203,6 +203,55 @@ describe('ItemModel', () => {
expect((await models().user().load(user3.id)).total_item_size).toBe(totalSize3); expect((await models().user().load(user3.id)).total_item_size).toBe(totalSize3);
}); });
test('should not fail when a user account has been deleted', async () => {
const { user: user1 } = await createUserAndSession(1);
const { user: user2 } = await createUserAndSession(2);
const { user: user3 } = await createUserAndSession(3);
await createItemTree3(user1.id, '', '', [
{
id: '000000000000000000000000000000F1',
children: [
{
id: '00000000000000000000000000000001',
},
],
},
]);
await createItemTree3(user2.id, '', '', [
{
id: '000000000000000000000000000000F2',
children: [
{
id: '00000000000000000000000000000002',
},
{
id: '00000000000000000000000000000003',
},
],
},
]);
await createItemTree3(user3.id, '', '', [
{
id: '000000000000000000000000000000F3',
children: [
{
id: '00000000000000000000000000000004',
},
{
id: '00000000000000000000000000000005',
},
],
},
]);
await models().user().delete(user3.id);
await expectNotThrow(async () => models().item().updateTotalSizes());
});
test('should update total size when an item is deleted', async () => { test('should update total size when an item is deleted', async () => {
const { user: user1 } = await createUserAndSession(1); const { user: user1 } = await createUserAndSession(1);

14
packages/server/src/models/ItemModel.ts
View File

@ -1075,6 +1075,8 @@ export default class ItemModel extends BaseModel<Item> {
.concat(changes.map(c => c.user_id)), .concat(changes.map(c => c.user_id)),
); );
const users = await this.models().user().loadByIds(userIds, { fields: ['id'] });
const totalSizes: TotalSizeRow[] = []; const totalSizes: TotalSizeRow[] = [];
for (const userId of userIds) { for (const userId of userIds) {
if (doneUserIds[userId]) continue; if (doneUserIds[userId]) continue;
@ -1089,10 +1091,14 @@ export default class ItemModel extends BaseModel<Item> {
await this.withTransaction(async () => { await this.withTransaction(async () => {
for (const row of totalSizes) { for (const row of totalSizes) {
await this.models().user().save({ if (!users.find(u => u.id === row.userId)) {
id: row.userId, modelLogger.warn(`User item refers to a user that has been deleted - skipping it: ${row.userId}`);
total_item_size: row.totalSize, } else {
}); await this.models().user().save({
id: row.userId,
total_item_size: row.totalSize,
});
}
} }
await this.models().keyValue().setValue('ItemModel::updateTotalSizes::latestProcessedChange', paginatedChanges.cursor); await this.models().keyValue().setValue('ItemModel::updateTotalSizes::latestProcessedChange', paginatedChanges.cursor);