viscous/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-03-03 00:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: stricter repository typing

Browse Source 
Signed-off-by: izzy <me@insrt.uk>
This commit is contained in:
izzy
2026-02-25 11:36:26 +00:00
parent 0a358090cb
commit 891a3c8123
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/repositories/integrity.repository.ts
View File

@@ -146,7 +146,12 @@ export class IntegrityRepository {
),
)
.select(['allPaths.path as path', 'allPaths.assetId', 'allPaths.fileAssetId', 'integrity_report.id as reportId'])
.stream();
.stream() as AsyncIterableIterator<
{ path: string; reportId: string | null } & (
| { assetId: string; fileAssetId: null }
| { assetId: null; fileAssetId: string }
)
>;
}
@GenerateSql({ params: [DummyValue.DATE, DummyValue.DATE], stream: true })

10
server/src/types.ts
View File

@@ -301,12 +301,10 @@ export interface IIntegrityUntrackedFilesJob {
}
export interface IIntegrityMissingFilesJob {
items: {
path: string;
reportId: string | null;
assetId: string | null;
fileAssetId: string | null;
}[];
items: ({ path: string; reportId: string | null } & (
| { assetId: string; fileAssetId: null }
| { assetId: null; fileAssetId: string }
))[];
}
export interface IIntegrityPathWithReportJob {

15
server/test/medium/specs/services/integrity.service.spec.ts
View File

@@ -468,9 +468,18 @@ describe(IntegrityService.name, () => {
const integrity = ctx.get(IntegrityRepository);
const storage = ctx.getMock(StorageRepository);
const {
result: { id: ownerId },
} = await ctx.newUser();
const {
result: { id: assetId },
} = await ctx.newAsset({ ownerId, originalPath: '/path/to/file1' });
const { id: restoredId } = await integrity.create({
type: IntegrityReportType.MissingFile,
path: '/path/to/restored',
assetId,
});
storage.stat
@@ -480,9 +489,9 @@ describe(IntegrityService.name, () => {
await sut.handleMissingFiles({
items: [
{ path: '/path/to/existing', assetId: null, fileAssetId: null, reportId: null },
{ path: '/path/to/missing', assetId: null, fileAssetId: null, reportId: null },
{ path: '/path/to/restored', assetId: null, fileAssetId: null, reportId: restoredId },
{ path: '/path/to/existing', assetId, fileAssetId: null, reportId: null },
{ path: '/path/to/missing', assetId, fileAssetId: null, reportId: null },
{ path: '/path/to/restored', assetId, fileAssetId: null, reportId: restoredId },
],
});