From 1fbd979d403241ba17b16af0e1f522ef42d5213c Mon Sep 17 00:00:00 2001 From: charlesgauthereau Date: Sun, 28 Sep 2025 12:20:03 +0200 Subject: [PATCH] Ready for 1.1.2 --- src/lib/tasks/database/retention-gsf.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lib/tasks/database/retention-gsf.ts b/src/lib/tasks/database/retention-gsf.ts index 7cebaa35..12d828b6 100644 --- a/src/lib/tasks/database/retention-gsf.ts +++ b/src/lib/tasks/database/retention-gsf.ts @@ -31,7 +31,14 @@ export async function enforceRetentionGFS(databaseId: string, gfsSettings: { }); // WEEKLY - const weekStartDates = Array.from({length: gfsSettings.weekly}, (_, i) => startOfWeek(subWeeks(now, i))); + // const weekStartDates = Array.from({length: gfsSettings.weekly}, (_, i) => startOfWeek(subWeeks(now, i))); + // weekStartDates.forEach((weekStart) => { + // const backupOfWeek = backups.find( + // (b) => b.createdAt >= weekStart && b.createdAt < subWeeks(weekStart, -1) + // ); + // if (backupOfWeek) toKeep.add(backupOfWeek.id); + // }); + const weekStartDates = Array.from({length: gfsSettings.weekly}, (_, i) => startOfWeek(subWeeks(now, i), { weekStartsOn: 1 })); weekStartDates.forEach((weekStart) => { const backupOfWeek = backups.find( (b) => b.createdAt >= weekStart && b.createdAt < subWeeks(weekStart, -1) @@ -39,6 +46,9 @@ export async function enforceRetentionGFS(databaseId: string, gfsSettings: { if (backupOfWeek) toKeep.add(backupOfWeek.id); }); + + + // MONTHLY const monthStartDates = Array.from({length: gfsSettings.monthly}, (_, i) => startOfMonth(subMonths(now, i))); monthStartDates.forEach((monthStart) => {