fix(server): anchor the folder view path match (#32612)
(cherry picked from commit c76e1517321df98df6e9b2f856493ac49ec05877)
This commit is contained in:
@@ -68,6 +68,7 @@ import { TagRepository } from 'src/repositories/tag.repository.js';
|
||||
import { TelemetryRepository } from 'src/repositories/telemetry.repository.js';
|
||||
import { UserRepository } from 'src/repositories/user.repository.js';
|
||||
import { VersionHistoryRepository } from 'src/repositories/version-history.repository.js';
|
||||
import { ViewRepository } from 'src/repositories/view-repository.js';
|
||||
import { WebAuthnRepository } from 'src/repositories/webauthn.repository.js';
|
||||
import { WebsocketRepository } from 'src/repositories/websocket.repository.js';
|
||||
import { WorkflowRepository } from 'src/repositories/workflow.repository.js';
|
||||
@@ -519,6 +520,7 @@ const newRealRepository = <T extends BaseServiceDeps[number]>(key: T, db: Kysely
|
||||
case SystemMetadataRepository:
|
||||
case UserRepository:
|
||||
case VersionHistoryRepository:
|
||||
case ViewRepository:
|
||||
case WorkflowRepository: {
|
||||
return new key(db) as InstanceType<T>;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
import { Kysely } from 'kysely';
|
||||
import { LoggingRepository } from 'src/repositories/logging.repository.js';
|
||||
import { ViewRepository } from 'src/repositories/view-repository.js';
|
||||
import { DB } from 'src/schema/index.js';
|
||||
import { BaseService } from 'src/services/base.service.js';
|
||||
import { newMediumService } from 'test/medium.factory.js';
|
||||
import { getKyselyDB } from 'test/utils.js';
|
||||
|
||||
let defaultDatabase: Kysely<DB>;
|
||||
|
||||
const setup = (db?: Kysely<DB>) => {
|
||||
const { ctx } = newMediumService(BaseService, {
|
||||
database: db || defaultDatabase,
|
||||
real: [],
|
||||
mock: [LoggingRepository],
|
||||
});
|
||||
return { ctx, sut: ctx.get(ViewRepository) };
|
||||
};
|
||||
|
||||
beforeAll(async () => {
|
||||
defaultDatabase = await getKyselyDB();
|
||||
});
|
||||
|
||||
describe(ViewRepository.name, () => {
|
||||
describe('getAssetsByOriginalPath', () => {
|
||||
it('should only return assets directly in the folder', async () => {
|
||||
const { ctx, sut } = setup();
|
||||
const { user } = await ctx.newUser();
|
||||
const { asset } = await ctx.newAsset({ ownerId: user.id, originalPath: '/photos/a_b/1.jpg' });
|
||||
await ctx.newAsset({ ownerId: user.id, originalPath: '/photos/a_b/sub/2.jpg' });
|
||||
await ctx.newAsset({ ownerId: user.id, originalPath: '/photos/a-b/3.jpg' });
|
||||
await ctx.newAsset({ ownerId: user.id, originalPath: '/backup/photos/a_b/4.jpg' });
|
||||
const { asset: rootAsset } = await ctx.newAsset({ ownerId: user.id, originalPath: '/5.jpg' });
|
||||
|
||||
const getIds = async (path: string) => {
|
||||
const assets = await sut.getAssetsByOriginalPath(user.id, path);
|
||||
return assets.map(({ id }) => id);
|
||||
};
|
||||
|
||||
for (const path of ['/photos/a_b', '/photos/a_b/', 'photos/a_b']) {
|
||||
await expect(getIds(path)).resolves.toEqual([asset.id]);
|
||||
}
|
||||
await expect(getIds('/')).resolves.toEqual([rootAsset.id]);
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user