@iann29/rastro 0.1.0-alpha.9 → 0.1.0

package/src/component/retention.ts

@@ -629,7 +629,7 @@ function coverageDatasetsForKind(kind: CleanupKind): string[] {
   if (kind === "sessions") return ["sessions"];
   if (kind === "conversions") return ["conversions"];
   if (kind === "aggregateHour") return ["overviewHour"];
-  if (kind === "aggregateDay") return ["overviewDay"];
+  if (kind === "aggregateDay") return ["overviewDay", "overviewLocalDay"];
   if (kind === "goalCompletions") return ["goalCompletions"];
   if (kind === "funnelSteps") return ["funnelSteps"];
   if (kind === "affiliateStats") return ["affiliateStats"];
@@ -724,17 +724,35 @@ async function deletionsForCleanup(
     ).map((row) => () => ctx.db.delete("goalCompletions", row._id));
   }
   if (kind === "aggregateHour" || kind === "aggregateDay") {
-    return (
-      await ctx.db
+    // The daily kind also retires the site's local-day buckets. Their cutoff
+    // sits a day and an hour earlier than the UTC-aligned one: a local day
+    // may begin almost a day before its UTC counterpart and, across a
+    // fall-back transition, last 25 hours, so this keeps every bucket that
+    // could still contain the cutoff instant.
+    const granularities =
+      kind === "aggregateHour"
+        ? ([["hour", before]] as const)
+        : ([
+            ["day", before],
+            ["localDay", before - DAY_MS - HOUR_MS],
+          ] as const);
+    const deletions: Array<() => Promise<void>> = [];
+    for (const [granularity, cutoff] of granularities) {
+      if (deletions.length >= limit) break;
+      const rows = await ctx.db
         .query("aggregateBuckets")
         .withIndex("by_siteId_and_granularity_and_bucketStart", (q) =>
           q
             .eq("siteId", siteId)
-            .eq("granularity", kind === "aggregateHour" ? "hour" : "day")
-            .lt("bucketStart", before),
+            .eq("granularity", granularity)
+            .lt("bucketStart", cutoff),
         )
-        .take(limit)
-    ).map((row) => () => ctx.db.delete("aggregateBuckets", row._id));
+        .take(limit - deletions.length);
+      deletions.push(
+        ...rows.map((row) => () => ctx.db.delete("aggregateBuckets", row._id)),
+      );
+    }
+    return deletions;
   }
   if (kind === "funnelProgress") {
     return (