mirror of
https://github.com/KevinMidboe/immich.git
synced 2025-10-29 17:40:28 +00:00
refactor(server): jobs and processors (#1787)
* refactor: jobs and processors * refactor: storage migration processor * fix: tests * fix: code warning * chore: ignore coverage from infra * fix: sync move asset logic between job core and asset core * refactor: move error handling inside of catch * refactor(server): job core into dedicated service calls * refactor: smart info * fix: tests * chore: smart info tests * refactor: use asset repository * refactor: thumbnail processor * chore: coverage reqs
This commit is contained in:
10
server/libs/domain/src/asset/asset.repository.ts
Normal file
10
server/libs/domain/src/asset/asset.repository.ts
Normal file
@@ -0,0 +1,10 @@
|
||||
import { AssetEntity, AssetType } from '@app/infra/db/entities';
|
||||
|
||||
export const IAssetRepository = 'IAssetRepository';
|
||||
|
||||
export interface IAssetRepository {
|
||||
deleteAll(ownerId: string): Promise<void>;
|
||||
getAll(): Promise<AssetEntity[]>;
|
||||
save(asset: Partial<AssetEntity>): Promise<AssetEntity>;
|
||||
findLivePhotoMatch(livePhotoCID: string, type: AssetType, otherAssetId: string): Promise<AssetEntity | null>;
|
||||
}
|
||||
45
server/libs/domain/src/asset/asset.service.spec.ts
Normal file
45
server/libs/domain/src/asset/asset.service.spec.ts
Normal file
@@ -0,0 +1,45 @@
|
||||
import { AssetEntity, AssetType } from '@app/infra/db/entities';
|
||||
import { newJobRepositoryMock } from '../../test';
|
||||
import { AssetService } from '../asset';
|
||||
import { IJobRepository, JobName } from '../job';
|
||||
|
||||
describe(AssetService.name, () => {
|
||||
let sut: AssetService;
|
||||
let jobMock: jest.Mocked<IJobRepository>;
|
||||
|
||||
it('should work', () => {
|
||||
expect(sut).toBeDefined();
|
||||
});
|
||||
|
||||
beforeEach(async () => {
|
||||
jobMock = newJobRepositoryMock();
|
||||
sut = new AssetService(jobMock);
|
||||
});
|
||||
|
||||
describe(`handle asset upload`, () => {
|
||||
it('should process an uploaded video', async () => {
|
||||
const data = { asset: { type: AssetType.VIDEO } as AssetEntity, fileName: 'video.mp4' };
|
||||
|
||||
await expect(sut.handleAssetUpload(data)).resolves.toBeUndefined();
|
||||
|
||||
expect(jobMock.queue).toHaveBeenCalledTimes(3);
|
||||
expect(jobMock.queue.mock.calls).toEqual([
|
||||
[{ name: JobName.GENERATE_JPEG_THUMBNAIL, data }],
|
||||
[{ name: JobName.VIDEO_CONVERSION, data }],
|
||||
[{ name: JobName.EXTRACT_VIDEO_METADATA, data }],
|
||||
]);
|
||||
});
|
||||
|
||||
it('should process an uploaded image', async () => {
|
||||
const data = { asset: { type: AssetType.IMAGE } as AssetEntity, fileName: 'image.jpg' };
|
||||
|
||||
await sut.handleAssetUpload(data);
|
||||
|
||||
expect(jobMock.queue).toHaveBeenCalledTimes(2);
|
||||
expect(jobMock.queue.mock.calls).toEqual([
|
||||
[{ name: JobName.GENERATE_JPEG_THUMBNAIL, data }],
|
||||
[{ name: JobName.EXIF_EXTRACTION, data }],
|
||||
]);
|
||||
});
|
||||
});
|
||||
});
|
||||
18
server/libs/domain/src/asset/asset.service.ts
Normal file
18
server/libs/domain/src/asset/asset.service.ts
Normal file
@@ -0,0 +1,18 @@
|
||||
import { AssetType } from '@app/infra/db/entities';
|
||||
import { Inject } from '@nestjs/common';
|
||||
import { IAssetUploadedJob, IJobRepository, JobName } from '../job';
|
||||
|
||||
export class AssetService {
|
||||
constructor(@Inject(IJobRepository) private jobRepository: IJobRepository) {}
|
||||
|
||||
async handleAssetUpload(data: IAssetUploadedJob) {
|
||||
await this.jobRepository.queue({ name: JobName.GENERATE_JPEG_THUMBNAIL, data });
|
||||
|
||||
if (data.asset.type == AssetType.VIDEO) {
|
||||
await this.jobRepository.queue({ name: JobName.VIDEO_CONVERSION, data });
|
||||
await this.jobRepository.queue({ name: JobName.EXTRACT_VIDEO_METADATA, data });
|
||||
} else {
|
||||
await this.jobRepository.queue({ name: JobName.EXIF_EXTRACTION, data });
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1 +1,3 @@
|
||||
export * from './asset.repository';
|
||||
export * from './asset.service';
|
||||
export * from './response-dto';
|
||||
|
||||
Reference in New Issue
Block a user