Просмотр исходного кода

fix(server): include trashed asset during face re-index and cleanup (#4450)

shenlong 1 год назад
Родитель
Сommit
f3b17d8f73
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      server/src/infra/repositories/person.repository.ts

+ 3 - 2
server/src/infra/repositories/person.repository.ts

@@ -51,7 +51,7 @@ export class PersonRepository implements IPersonRepository {
   }
 
   getAllFaces(): Promise<AssetFaceEntity[]> {
-    return this.assetFaceRepository.find({ relations: { asset: true } });
+    return this.assetFaceRepository.find({ relations: { asset: true }, withDeleted: true });
   }
 
   getAll(): Promise<PersonEntity[]> {
@@ -88,6 +88,7 @@ export class PersonRepository implements IPersonRepository {
       .leftJoin('person.faces', 'face')
       .having('COUNT(face.assetId) = 0')
       .groupBy('person.id')
+      .withDeleted()
       .getMany();
   }
 
@@ -142,7 +143,7 @@ export class PersonRepository implements IPersonRepository {
   }
 
   async getFacesByIds(ids: AssetFaceId[]): Promise<AssetFaceEntity[]> {
-    return this.assetFaceRepository.find({ where: ids, relations: { asset: true } });
+    return this.assetFaceRepository.find({ where: ids, relations: { asset: true }, withDeleted: true });
   }
 
   async getRandomFace(personId: string): Promise<AssetFaceEntity | null> {