fix(server): include archived assets in forced thumbnail generation (#10409)

This commit is contained in:
Michel Heusschen
2024-06-16 22:16:02 +02:00
committed by GitHub
parent 6b1b5054f8
commit 8e373cee8d
3 changed files with 66 additions and 1 deletions

View File

@@ -132,6 +132,31 @@ describe(MediaService.name, () => {
]);
});
it('should queue archived assets when force is true', async () => {
assetMock.getAll.mockResolvedValue({
items: [assetStub.archived],
hasNextPage: false,
});
personMock.getAll.mockResolvedValue({
items: [],
hasNextPage: false,
});
await sut.handleQueueGenerateThumbnails({ force: true });
expect(assetMock.getAll).toHaveBeenCalledWith(
{ skip: 0, take: 1000 },
expect.objectContaining({ withArchived: true }),
);
expect(assetMock.getWithout).not.toHaveBeenCalled();
expect(jobMock.queueAll).toHaveBeenCalledWith([
{
name: JobName.GENERATE_PREVIEW,
data: { id: assetStub.archived.id },
},
]);
});
it('should queue all people with missing thumbnail path', async () => {
assetMock.getWithout.mockResolvedValue({
items: [assetStub.image],

View File

@@ -70,7 +70,7 @@ export class MediaService {
async handleQueueGenerateThumbnails({ force }: IBaseJob): Promise<JobStatus> {
const assetPagination = usePagination(JOBS_ASSET_PAGINATION_SIZE, (pagination) => {
return force
? this.assetRepository.getAll(pagination, { isVisible: true, withDeleted: true })
? this.assetRepository.getAll(pagination, { isVisible: true, withDeleted: true, withArchived: true })
: this.assetRepository.getWithout(pagination, WithoutProperty.THUMBNAIL);
});