fix(server): activity with deleted assets / users (#9068)

fix: activity with deleted assets / users
This commit is contained in:
martin
2024-04-25 23:45:15 +02:00
committed by GitHub
parent 40899f6137
commit c9dcb5c624
3 changed files with 62 additions and 10 deletions

View File

@@ -27,6 +27,12 @@ export class ActivityRepository implements IActivityRepository {
assetId: assetId === null ? IsNull() : assetId,
albumId,
isLiked,
asset: {
deletedAt: IsNull(),
},
user: {
deletedAt: IsNull(),
},
},
relations: {
user: true,
@@ -48,10 +54,21 @@ export class ActivityRepository implements IActivityRepository {
@GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
getStatistics(assetId: string, albumId: string): Promise<number> {
return this.repository.count({
where: { assetId, albumId, isLiked: false },
where: {
assetId,
albumId,
isLiked: false,
asset: {
deletedAt: IsNull(),
},
user: {
deletedAt: IsNull(),
},
},
relations: {
user: true,
},
withDeleted: true,
});
}