self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-26 18:58:21 +02:00
Code Issues Releases Activity

Added tests

Browse Source
This commit is contained in:
Laurent Cozic 2021-11-29 17:51:41 +00:00
parent 01048f5971
commit ef23d99b47
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import config from '../config';
import { msleep } from '../utils/time';
import loadStorageDriver from './items/storage/loadStorageDriver';
import { ErrorPayloadTooLarge } from '../utils/errors';
import { isSqlite } from '../db';
describe('ItemModel', function() {
@ -424,6 +425,43 @@ describe('ItemModel', function() {
expect(await toDriver.exists(itemId, { models: fromModels })).toBe(true);
});
test('should delete the database item content', async function() {
if (isSqlite(db())) {
expect(1).toBe(1);
return;
}
const { user: user1 } = await createUserAndSession(1);
await createItemTree3(user1.id, '', '', [
{
id: '000000000000000000000000000000F1',
children: [
{ id: '00000000000000000000000000000001' },
],
},
]);
const folder1 = await models().item().loadByName(user1.id, '000000000000000000000000000000F1.md');
const note1 = await models().item().loadByName(user1.id, '00000000000000000000000000000001.md');
await msleep(1);
expect(await models().item().dbContent(folder1.id)).not.toEqual(Buffer.from(''));
expect(await models().item().dbContent(note1.id)).not.toEqual(Buffer.from(''));
await models().item().deleteDatabaseContentColumn({ batchSize: 1 });
const folder1_v2 = await models().item().loadByName(user1.id, '000000000000000000000000000000F1.md');
const note1_v2 = await models().item().loadByName(user1.id, '00000000000000000000000000000001.md');
expect(folder1.updated_time).toBe(folder1_v2.updated_time);
expect(note1.updated_time).toBe(note1_v2.updated_time);
expect(await models().item().dbContent(folder1.id)).toEqual(Buffer.from(''));
expect(await models().item().dbContent(note1.id)).toEqual(Buffer.from(''));
});
// test('should stop importing item if it has been deleted', async function() {
// const { user: user1 } = await createUserAndSession(1);

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

@ -399,7 +399,9 @@ export default class ItemModel extends BaseModel<Item> {
}
}
public async deleteDatabaseContentColumn(options: DeleteDatabaseContentOptions) {
public async deleteDatabaseContentColumn(options: DeleteDatabaseContentOptions = null) {
if (!returningSupported(this.db)) throw new Error('Not supported by this database driver');
options = {
batchSize: 1000,
logger: new Logger(),
@ -438,6 +440,11 @@ export default class ItemModel extends BaseModel<Item> {
}
}
public async dbContent(itemId: Uuid): Promise<Buffer> {
const row: Item = await this.db(this.tableName).select(['content']).where('id', itemId).first();
return row.content;
}
public async sharedFolderChildrenItems(shareUserIds: Uuid[], folderId: string, includeResources: boolean = true): Promise<Item[]> {
if (!shareUserIds.length) throw new Error('User IDs must be specified');