refactor checkExpired to use Promise.all

This commit is contained in:
Johann150 2023-05-30 20:40:25 +02:00
parent bed8286175
commit 7c9e118ff1
Signed by untrusted user: Johann150
GPG key ID: 9EE6577A2A06F8F1

View file

@ -10,12 +10,17 @@ const logger = queueLogger.createSubLogger('check-expired');
export async function checkExpired(job: Bull.Job<Record<string, unknown>>, done: any): Promise<void> {
logger.info('Checking expired data...');
const expiredMutings = await Mutings.createQueryBuilder('muting')
const OlderThan = (millis: number) => {
return LessThan(new Date(new Date().getTime() - millis));
};
await Promise.all([
Mutings.createQueryBuilder('muting')
.where('muting.expiresAt IS NOT NULL')
.andWhere('muting.expiresAt < :now', { now: new Date() })
.innerJoinAndSelect('muting.mutee', 'mutee')
.getMany();
.getMany()
.then(async (expiredMutings) => {
if (expiredMutings.length > 0) {
await Mutings.delete({
id: In(expiredMutings.map(m => m.id)),
@ -25,37 +30,29 @@ export async function checkExpired(job: Bull.Job<Record<string, unknown>>, done:
publishUserEvent(m.muterId, 'unmute', m.mutee!);
}
}
const OlderThan = (millis: number) => {
return LessThan(new Date(new Date().getTime() - millis));
};
await Signins.delete({
}),
Signins.delete({
createdAt: OlderThan(2 * MONTH),
});
await AttestationChallenges.delete({
}),
AttestationChallenges.delete({
createdAt: OlderThan(5 * MINUTE),
});
await PasswordResetRequests.delete({
}),
PasswordResetRequests.delete({
// this timing should be the same as in @/server/api/endpoints/reset-password.ts
createdAt: OlderThan(30 * MINUTE),
});
await AuthSessions.delete({
}),
AuthSessions.delete({
createdAt: OlderThan(15 * MINUTE),
});
await Notifications.delete({
}),
Notifications.delete({
isRead: true,
createdAt: OlderThan(3 * MONTH),
});
await Users.delete({
}),
Users.delete({
// delete users where the deletion status reference count has come down to zero
isDeleted: 0,
});
}),
]);
logger.succ('Deleted expired data.');