@remit/drizzle-service 0.0.92 → 0.0.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "0.0.92",
+  "version": "0.0.94",
   "description": "Drizzle ORM service over SQLite",
   "type": "module",
   "main": "src/index.ts",

package/src/mailbox-path-dedupe.sqlite.test.ts

@@ -4,6 +4,7 @@ import * as entities from "@remit/drizzle-sqlite-schema";
 import Database from "better-sqlite3";
 import { asc, eq } from "drizzle-orm";
 import { drizzle } from "drizzle-orm/better-sqlite3";
+import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
 import type { Db } from "./db.js";
 import {
 	PARKED_MAILBOX_ID,
@@ -22,6 +23,18 @@ const MAILBOX_COLUMNS_ADDED_SINCE = ["0033_mailbox_sync_failure_reason"];
 const ACCOUNT = "acct";
 const CONFIG = "cfg";
 
+const filterAtDedupe = sqliteTable("filter", {
+	filterId: text("filter_id").primaryKey(),
+	accountConfigId: text("account_config_id").notNull(),
+	name: text("name").notNull(),
+	scope: text("scope").notNull(),
+	ruleChangedAt: integer("rule_changed_at").notNull(),
+	actionChangedAt: integer("action_changed_at").notNull(),
+	actionMailboxId: text("action_mailbox_id").notNull(),
+	createdAt: integer("created_at").notNull(),
+	updatedAt: integer("updated_at").notNull(),
+});
+
 type Handle = { sqlite: Database.Database; db: Db<Record<string, unknown>> };
 
 const atPredecessor = (): Handle => {
@@ -205,7 +218,7 @@ describe("(account_id, full_path) becomes unique", () => {
 			.update(entities.mailboxes)
 			.set({ parentMailboxId: "older-empty" })
 			.where(eq(entities.mailboxes.mailboxId, "child"));
-		await handle.db.insert(entities.filters).values({
+		await handle.db.insert(filterAtDedupe).values({
 			filterId: "f1",
 			accountConfigId: CONFIG,
 			name: "Alerts",
@@ -257,7 +270,7 @@ describe("(account_id, full_path) becomes unique", () => {
 			.from(entities.mailboxes)
 			.where(eq(entities.mailboxes.mailboxId, "child"));
 		assert.equal(child?.parent, "with-mail");
-		const [filter] = await handle.db.select().from(entities.filters);
+		const [filter] = await handle.db.select().from(filterAtDedupe);
 		assert.equal(filter?.actionMailboxId, "with-mail");
 		const [job] = await handle.db.select().from(entities.organizeJobRequests);
 		assert.equal(job?.actionMailboxId, "with-mail");

package/src/repos/calendar-suggestion.ts

@@ -37,6 +37,7 @@ function rowToCalendarSuggestion(
 		zoneCertainty: row.zoneCertainty,
 		icalData: row.icalData,
 		acceptedCalendarObjectId: row.acceptedCalendarObjectId,
+		supersededByMessageId: row.supersededByMessageId,
 		createdAt: row.createdAt,
 		updatedAt: row.updatedAt,
 	};
@@ -61,6 +62,7 @@ export class CalendarSuggestionRepo implements ICalendarSuggestionRepository {
 				suggestionId,
 				state: CalendarSuggestionState.Pending,
 				acceptedCalendarObjectId: "",
+				supersededByMessageId: "",
 				createdAt: now,
 				updatedAt: now,
 			})
@@ -200,12 +202,14 @@ export class CalendarSuggestionRepo implements ICalendarSuggestionRepository {
 	async supersedeIfPending(
 		accountConfigId: string,
 		suggestionId: string,
+		supersededByMessageId: string,
 	): Promise<CalendarSuggestionItem | null> {
 		const [row] = await this.db
 			.update(calendarSuggestionTable)
 			.set({
 				state: CalendarSuggestionState.Superseded,
 				acceptedCalendarObjectId: "",
+				supersededByMessageId,
 				updatedAt: Date.now(),
 			})
 			.where(
@@ -220,4 +224,23 @@ export class CalendarSuggestionRepo implements ICalendarSuggestionRepository {
 			.returning();
 		return row ? rowToCalendarSuggestion(row) : null;
 	}
+
+	async repointSuperseded(
+		accountConfigId: string,
+		suggestionId: string,
+		supersededByMessageId: string,
+	): Promise<CalendarSuggestionItem | null> {
+		const [row] = await this.db
+			.update(calendarSuggestionTable)
+			.set({ supersededByMessageId, updatedAt: Date.now() })
+			.where(
+				and(
+					eq(calendarSuggestionTable.accountConfigId, accountConfigId),
+					eq(calendarSuggestionTable.suggestionId, suggestionId),
+					eq(calendarSuggestionTable.state, CalendarSuggestionState.Superseded),
+				),
+			)
+			.returning();
+		return row ? rowToCalendarSuggestion(row) : null;
+	}
 }

package/src/repos/filter.test.ts

@@ -1,6 +1,10 @@
 import assert from "node:assert";
 import { after, before, describe, test } from "node:test";
-import { FilterScope, FilterState } from "@remit/domain-enums";
+import {
+	FilterDisabledReason,
+	FilterScope,
+	FilterState,
+} from "@remit/domain-enums";
 import { NotFoundError } from "../error.js";
 import { createTestDb, randomId, type TestDb } from "../test-db.js";
 import { FilterRepo } from "./filter.js";
@@ -28,6 +32,7 @@ describe("FilterRepo", () => {
 		});
 
 		assert.equal(filter.state, FilterState.Active);
+		assert.equal(filter.disabledReason, FilterDisabledReason.None);
 		assert.equal(filter.hasAnchor, false);
 		assert.equal(filter.literalClauses.length, 0);
 		assert.equal(filter.actionLabelId, "None");
@@ -44,6 +49,36 @@ describe("FilterRepo", () => {
 		assert.equal(filter.ttl, undefined);
 	});
 
+	test("a disabled filter keeps its reason and drops out of the Active listing (#1103)", async () => {
+		const accountConfigId = randomId();
+		const filter = await repo.create({
+			accountConfigId,
+			name: "Invoices",
+			scope: FilterScope.Standing,
+			state: FilterState.Disabled,
+			disabledReason: FilterDisabledReason.AwaitingFolder,
+		});
+
+		assert.equal(filter.state, FilterState.Disabled);
+		assert.equal(filter.disabledReason, FilterDisabledReason.AwaitingFolder);
+		assert.deepEqual(
+			await repo.listByAccountAndState(accountConfigId, FilterState.Active),
+			[],
+		);
+
+		const enabled = await repo.update(accountConfigId, filter.filterId, {
+			state: FilterState.Active,
+			disabledReason: FilterDisabledReason.None,
+		});
+		assert.equal(enabled.disabledReason, FilterDisabledReason.None);
+		assert.deepEqual(
+			(
+				await repo.listByAccountAndState(accountConfigId, FilterState.Active)
+			).map((item) => item.filterId),
+			[filter.filterId],
+		);
+	});
+
 	test("a Temporary filter round-trips expiresAt and ttl", async () => {
 		const accountConfigId = randomId();
 		const expiresAt = "2026-08-01T00:00:00+02:00";
@@ -285,6 +320,24 @@ describe("FilterRepo", () => {
 		assert.equal(result.state, FilterState.Active);
 	});
 
+	test("refreshExpiry leaves a disabled filter and its reason alone (#1103)", async () => {
+		const accountConfigId = randomId();
+		const past = new Date(Date.now() - 86_400_000).toISOString();
+		const filter = await repo.create({
+			accountConfigId,
+			name: "Until yesterday, awaiting its folder",
+			scope: FilterScope.Temporary,
+			expiresAt: past,
+			ttl: Math.floor(new Date(past).getTime() / 1000) + 172_800,
+			state: FilterState.Disabled,
+			disabledReason: FilterDisabledReason.AwaitingFolder,
+		});
+
+		const result = await repo.refreshExpiry(filter);
+		assert.equal(result.state, FilterState.Disabled);
+		assert.equal(result.disabledReason, FilterDisabledReason.AwaitingFolder);
+	});
+
 	test("refreshExpiry lazily patches a past-expiresAt Temporary filter to Expired", async () => {
 		const accountConfigId = randomId();
 		const past = new Date(Date.now() - 86_400_000).toISOString();

package/src/repos/filter.ts

@@ -6,6 +6,7 @@ import type {
 	UpdateFilterInput,
 } from "@remit/data-ports";
 import {
+	FilterDisabledReason,
 	FilterMatchOperator,
 	FilterScope,
 	FilterState,
@@ -79,6 +80,7 @@ function rowToFilter(row: typeof filterTable.$inferSelect): FilterItem {
 		expiresAt: row.expiresAt ?? undefined,
 		ttl: row.ttl ?? undefined,
 		state: row.state,
+		disabledReason: row.disabledReason,
 		hasAnchor: row.hasAnchor,
 		ruleChangedAt: row.ruleChangedAt,
 		actionChangedAt: row.actionChangedAt,
@@ -112,6 +114,7 @@ export class FilterRepo implements IFilterRepository {
 				expiresAt: input.expiresAt ?? null,
 				ttl: input.ttl ?? null,
 				state: input.state ?? FilterState.Active,
+				disabledReason: input.disabledReason ?? FilterDisabledReason.None,
 				hasAnchor: input.hasAnchor ?? false,
 				ruleChangedAt: createdRuleChangedAt,
 				actionChangedAt: createdRuleChangedAt,
@@ -290,8 +293,8 @@ export class FilterRepo implements IFilterRepository {
 	 * Patches a Temporary filter's `state` to `Expired` when read past its
 	 * `expiresAt` (RFC 034 Decision 1.2). `expiresAt`/`now` are compared
 	 * directly — `state` is only ever a lazily-refreshed cache of that
-	 * comparison. A no-op for a Standing filter (no `expiresAt`) or one already
-	 * Expired.
+	 * comparison. A no-op for a Standing filter (no `expiresAt`) or one that is not
+	 * Active: a Disabled filter keeps the reason it was turned off for.
 	 *
 	 * There is no TTL reaper here, so an Expired Temporary row is never deleted by
 	 * a background sweep the way DynamoDB reaps it via the `ttl` attribute. That
@@ -301,12 +304,16 @@ export class FilterRepo implements IFilterRepository {
 	 */
 	async refreshExpiry(item: FilterItem): Promise<FilterItem> {
 		if (item.scope !== "Temporary" || !item.expiresAt) return item;
-		if (item.state === FilterState.Expired) return item;
+		if (item.state !== FilterState.Active) return item;
 		if (new Date(item.expiresAt).getTime() > Date.now()) return item;
 
 		const [row] = await this.db
 			.update(filterTable)
-			.set({ state: FilterState.Expired, updatedAt: Date.now() })
+			.set({
+				state: FilterState.Expired,
+				disabledReason: FilterDisabledReason.None,
+				updatedAt: Date.now(),
+			})
 			.where(
 				and(
 					eq(filterTable.accountConfigId, item.accountConfigId),

package/src/repos/i4-config-import.ts

@@ -1,8 +1,10 @@
-import type {
-	ConfigImportItem,
-	CreateConfigImportInput,
-	IConfigImportRepository,
-	UpdateConfigImportInput,
+import {
+	type ConfigImportItem,
+	type ConfigImportUnresolvedRefItem,
+	type CreateConfigImportInput,
+	FILTER_NO_ACTION,
+	type IConfigImportRepository,
+	type UpdateConfigImportInput,
 } from "@remit/data-ports";
 import { desc, eq } from "drizzle-orm";
 import type { Db } from "../db.js";
@@ -12,6 +14,30 @@ import { configImportTable } from "../schema/i4-config-import.js";
 
 type DB = Db<Record<string, unknown>>;
 
+type StoredRef = Omit<ConfigImportUnresolvedRefItem, "mailboxId"> & {
+	mailboxId?: string;
+};
+
+const isStoredRef = (value: unknown): value is StoredRef =>
+	typeof value === "object" &&
+	value !== null &&
+	"kind" in value &&
+	"accountId" in value &&
+	"folderPath" in value &&
+	"target" in value;
+
+const refsOf = (value: unknown): ConfigImportUnresolvedRefItem[] => {
+	if (!Array.isArray(value) || !value.every(isStoredRef)) {
+		throw new Error(
+			"config_import.unresolved_refs is not a list of folder references",
+		);
+	}
+	return value.map((ref) => ({
+		...ref,
+		mailboxId: ref.mailboxId ?? FILTER_NO_ACTION,
+	}));
+};
+
 function rowToConfigImport(
 	row: typeof configImportTable.$inferSelect,
 ): ConfigImportItem {
@@ -21,7 +47,7 @@ function rowToConfigImport(
 		schemaVersion: row.schemaVersion,
 		state: row.state as ConfigImportItem["state"],
 		document: row.document as ConfigImportItem["document"],
-		unresolvedRefs: row.unresolvedRefs as ConfigImportItem["unresolvedRefs"],
+		unresolvedRefs: refsOf(row.unresolvedRefs),
 		createdAt: row.createdAt,
 		completedAt: row.completedAt,
 		updatedAt: row.updatedAt,