@remit/drizzle-service 0.0.95 → 0.0.97

package/package.json

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

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

@@ -35,6 +35,16 @@ const filterAtDedupe = sqliteTable("filter", {
 	updatedAt: integer("updated_at").notNull(),
 });
 
+const organizeJobAtDedupe = sqliteTable("organize_job_request", {
+	organizeJobId: text("organize_job_id").primaryKey(),
+	accountConfigId: text("account_config_id").notNull(),
+	userId: text("user_id").notNull(),
+	actionMailboxId: text("action_mailbox_id").notNull(),
+	ttl: integer("ttl").notNull(),
+	createdAt: integer("created_at").notNull(),
+	updatedAt: integer("updated_at").notNull(),
+});
+
 type Handle = { sqlite: Database.Database; db: Db<Record<string, unknown>> };
 
 const atPredecessor = (): Handle => {
@@ -229,7 +239,7 @@ describe("(account_id, full_path) becomes unique", () => {
 			createdAt: 0,
 			updatedAt: 0,
 		});
-		await handle.db.insert(entities.organizeJobRequests).values({
+		await handle.db.insert(organizeJobAtDedupe).values({
 			organizeJobId: "job-1",
 			accountConfigId: CONFIG,
 			userId: "user",
@@ -272,7 +282,7 @@ describe("(account_id, full_path) becomes unique", () => {
 		assert.equal(child?.parent, "with-mail");
 		const [filter] = await handle.db.select().from(filterAtDedupe);
 		assert.equal(filter?.actionMailboxId, "with-mail");
-		const [job] = await handle.db.select().from(entities.organizeJobRequests);
+		const [job] = await handle.db.select().from(organizeJobAtDedupe);
 		assert.equal(job?.actionMailboxId, "with-mail");
 		const [copied] = await handle.db
 			.select({ original: entities.messages.originalMailboxId })

package/src/repos/calendar-migrations.sqlite.test.ts

@@ -242,6 +242,7 @@ describe("the calendar tables under the shipped migrations", () => {
 			summary: "Design review",
 			dtStart: "2026-09-01T10:00:00+02:00",
 			dtEnd: "2026-09-01T11:00:00+02:00",
+			endsAtUtc: "2026-09-01T09:00:00Z",
 			allDay: false,
 			location: "",
 			organizer: "organizer@example.test",
@@ -256,3 +257,89 @@ describe("the calendar tables under the shipped migrations", () => {
 		assert.equal(fetched.organizer, "organizer@example.test");
 	});
 });
+
+describe("the ends_at_utc backfill of existing suggestions", () => {
+	const TAG = "0039_calendar_suggestion_ends_at_utc";
+	const VTIMEZONE = [
+		"BEGIN:VTIMEZONE",
+		"TZID:Europe/Amsterdam",
+		"BEGIN:DAYLIGHT",
+		"DTSTART:19700329T020000",
+		"RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU",
+		"END:DAYLIGHT",
+		"END:VTIMEZONE",
+	];
+	const invite = (...eventLines: string[]): string =>
+		[
+			"BEGIN:VCALENDAR",
+			...VTIMEZONE,
+			"BEGIN:VEVENT",
+			...eventLines,
+			"END:VEVENT",
+			"END:VCALENDAR",
+			"",
+		].join("\r\n");
+
+	const backfilled = (
+		rows: Record<string, { dtEnd: string; icalData: string }>,
+	): Record<string, string> => {
+		const sqlite = new Database(":memory:");
+		for (const entry of migrationJournal()) {
+			if (entry.tag === TAG) break;
+			applyMigration(sqlite, entry.tag);
+		}
+		const columns = sqlite
+			.prepare("PRAGMA table_info(calendar_suggestion)")
+			.all() as { name: string; type: string }[];
+		for (const [id, row] of Object.entries(rows)) {
+			const values: Record<string, string | number> = {};
+			for (const column of columns) {
+				values[column.name] = column.type === "integer" ? 0 : "";
+			}
+			values.suggestion_id = id;
+			values.dt_end = row.dtEnd;
+			values.ical_data = row.icalData;
+			const names = Object.keys(values);
+			sqlite
+				.prepare(
+					`INSERT INTO calendar_suggestion (${names.join(",")}) VALUES (${names.map(() => "?").join(",")})`,
+				)
+				.run(...Object.values(values));
+		}
+		applyMigration(sqlite, TAG);
+		const result = Object.fromEntries(
+			(
+				sqlite
+					.prepare("SELECT suggestion_id, ends_at_utc FROM calendar_suggestion")
+					.all() as { suggestion_id: string; ends_at_utc: string }[]
+			).map((row) => [row.suggestion_id, row.ends_at_utc]),
+		);
+		sqlite.close();
+		return result;
+	};
+
+	test("converts a past non-recurring invite carrying a VTIMEZONE to its UTC end", () => {
+		const result = backfilled({
+			plain: {
+				dtEnd: "2024-03-01T11:00:00+02:00",
+				icalData: invite(
+					"UID:a@example.test",
+					"DTSTART;TZID=Europe/Amsterdam:20240301T100000",
+					"DTEND;TZID=Europe/Amsterdam:20240301T110000",
+				),
+			},
+			weekly: {
+				dtEnd: "2024-03-01T11:00:00+02:00",
+				icalData: invite(
+					"UID:b@example.test",
+					"DTSTART;TZID=Europe/Amsterdam:20240301T100000",
+					"DTEND;TZID=Europe/Amsterdam:20240301T110000",
+					"RRULE:FREQ=WEEKLY",
+				),
+			},
+		});
+
+		assert.equal(result.plain, "2024-03-01T09:00:00Z");
+		assert.equal(result.weekly, "9999-12-31T23:59:59Z");
+	});
+});

package/src/repos/calendar-suggestion.ts

@@ -7,7 +7,7 @@ import type {
 } from "@remit/data-ports";
 import { deriveCalendarSuggestionId } from "@remit/data-ports/id";
 import { CalendarSuggestionState } from "@remit/domain-enums";
-import { and, asc, desc, eq, inArray, lt, or } from "drizzle-orm";
+import { and, asc, desc, eq, gte, inArray, lt, or } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { decodeToken, resultList } from "../pagination.js";
@@ -31,6 +31,7 @@ function rowToCalendarSuggestion(
 		summary: row.summary,
 		dtStart: row.dtStart,
 		dtEnd: row.dtEnd,
+		endsAtUtc: row.endsAtUtc,
 		allDay: row.allDay,
 		location: row.location,
 		organizer: row.organizer,
@@ -147,10 +148,14 @@ export class CalendarSuggestionRepo implements ICalendarSuggestionRepository {
 	async listByState(
 		accountConfigId: string,
 		state: CalendarSuggestionItem["state"],
-		options?: { limit?: number; continuationToken?: string },
+		options: {
+			endsAfter: string;
+			limit?: number;
+			continuationToken?: string;
+		},
 	): Promise<ResultList<CalendarSuggestionItem>> {
-		const limit = options?.limit ?? 100;
-		const cursor = options?.continuationToken
+		const limit = options.limit ?? 100;
+		const cursor = options.continuationToken
 			? decodeToken(options.continuationToken)
 			: undefined;
 		const after = cursor
@@ -167,6 +172,7 @@ export class CalendarSuggestionRepo implements ICalendarSuggestionRepository {
 				and(
 					eq(calendarSuggestionTable.accountConfigId, accountConfigId),
 					eq(calendarSuggestionTable.state, state),
+					gte(calendarSuggestionTable.endsAtUtc, options.endsAfter),
 					after
 						? or(
 								lt(calendarSuggestionTable.createdAt, after.createdAt),

package/src/repos/i4-organize-job-request.ts

@@ -22,6 +22,7 @@ function rowToItem(
 		accountConfigId: row.accountConfigId,
 		userId: row.userId,
 		state: row.state as OrganizeJobRequestItem["state"],
+		filterId: row.filterId,
 		anchorMessageId: row.anchorMessageId,
 		matchOperator: row.matchOperator as OrganizeJobRequestItem["matchOperator"],
 		literalClauses:
@@ -53,6 +54,7 @@ export class OrganizeJobRequestRepo implements IOrganizeJobRequestRepository {
 				accountConfigId: input.accountConfigId,
 				userId: input.userId,
 				state: input.state ?? "Pending",
+				filterId: input.filterId,
 				anchorMessageId: input.anchorMessageId,
 				matchOperator: input.matchOperator,
 				literalClauses: input.literalClauses,

package/src/repos/thread-message.ts

@@ -664,6 +664,7 @@ export class DrizzleThreadMessageRepository
 			limit?: number;
 			continuationToken?: string;
 			excludeDeleted?: boolean;
+			mailboxIds?: readonly string[];
 		},
 	): Promise<ResultList<ThreadMessageItem>> {
 		const order = options?.order ?? "desc";
@@ -681,6 +682,9 @@ export class DrizzleThreadMessageRepository
 					options?.excludeDeleted
 						? eq(threadMessageTable.isDeleted, false)
 						: undefined,
+					options?.mailboxIds
+						? inArray(threadMessageTable.mailboxId, [...options.mailboxIds])
+						: undefined,
 					buildFieldTermCondition(terms, options?.operator ?? "and"),
 					sentDateCursorCond(order, cursor),
 				),