@remit/drizzle-service 0.0.96 → 0.0.98

package/package.json

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

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-mailbox-lock.test.ts

@@ -43,6 +43,7 @@ describe("MailboxLockRepo", () => {
 			eventName,
 			accountId,
 			lockId,
+			3600,
 		);
 		assert.equal(acquired, true, "should acquire lock");
 
@@ -71,6 +72,7 @@ describe("MailboxLockRepo", () => {
 			eventName,
 			accountId,
 			lockId1,
+			3600,
 		);
 		assert.equal(first, true, "first acquire should succeed");
 
@@ -79,6 +81,7 @@ describe("MailboxLockRepo", () => {
 			eventName,
 			accountId,
 			lockId2,
+			3600,
 		);
 		assert.equal(second, false, "second acquire should fail");
 
@@ -104,6 +107,7 @@ describe("MailboxLockRepo", () => {
 			eventName,
 			accountId,
 			freshLockId,
+			3600,
 		);
 		assert.equal(acquired, true, "should steal the expired lock");
 
@@ -129,13 +133,20 @@ describe("MailboxLockRepo", () => {
 		const contenderLockId = randomId();
 		const eventName = "SYNC_MESSAGES";
 
-		await repo.tryAcquireLock(mailboxId, eventName, accountId, liveLockId);
+		await repo.tryAcquireLock(
+			mailboxId,
+			eventName,
+			accountId,
+			liveLockId,
+			3600,
+		);
 
 		const acquired = await repo.tryAcquireLock(
 			mailboxId,
 			eventName,
 			accountId,
 			contenderLockId,
+			3600,
 		);
 		assert.equal(acquired, false, "should not steal a live lock");
 
@@ -166,8 +177,8 @@ describe("MailboxLockRepo", () => {
 		});
 
 		const results = await Promise.all([
-			repo.tryAcquireLock(mailboxId, eventName, accountId, contenderA),
-			repo.tryAcquireLock(mailboxId, eventName, accountId, contenderB),
+			repo.tryAcquireLock(mailboxId, eventName, accountId, contenderA, 3600),
+			repo.tryAcquireLock(mailboxId, eventName, accountId, contenderB, 3600),
 		]);
 
 		assert.equal(
@@ -187,7 +198,7 @@ describe("MailboxLockRepo", () => {
 		const lockId = randomId();
 		const eventName = "SYNC_MESSAGES";
 
-		await repo.tryAcquireLock(mailboxId, eventName, accountId, lockId);
+		await repo.tryAcquireLock(mailboxId, eventName, accountId, lockId, 3600);
 		await repo.releaseLock(accountId, mailboxId, eventName, lockId);
 
 		const lock = await repo.get(accountId, mailboxId, eventName);
@@ -201,7 +212,7 @@ describe("MailboxLockRepo", () => {
 		const lockId2 = randomId();
 		const eventName = "SYNC_MESSAGES";
 
-		await repo.tryAcquireLock(mailboxId, eventName, accountId, lockId1);
+		await repo.tryAcquireLock(mailboxId, eventName, accountId, lockId1, 3600);
 		await repo.releaseLock(accountId, mailboxId, eventName, lockId2); // wrong lockId
 
 		const lock = await repo.get(accountId, mailboxId, eventName);
@@ -241,7 +252,7 @@ describe("MailboxLockRepo", () => {
 		const lockId = randomId();
 		const eventName = "SYNC_MESSAGES";
 
-		await repo.tryAcquireLock(mailboxId, eventName, accountId, lockId);
+		await repo.tryAcquireLock(mailboxId, eventName, accountId, lockId, 3600);
 
 		const result = await repo.withMailboxLock(
 			mailboxId,
@@ -287,12 +298,14 @@ describe("MailboxLockRepo", () => {
 			"SYNC_MESSAGES",
 			accountId,
 			lockId1,
+			3600,
 		);
 		const a2 = await repo.tryAcquireLock(
 			mailboxId,
 			"SYNC_FLAGS",
 			accountId,
 			lockId2,
+			3600,
 		);
 
 		assert.equal(a1, true);
@@ -311,8 +324,8 @@ describe("MailboxLockRepo", () => {
 		const lockId2 = randomId();
 		const eventName = "SYNC_MESSAGES";
 
-		await repo.tryAcquireLock(mailboxId1, eventName, accountId1, lockId1);
-		await repo.tryAcquireLock(mailboxId2, eventName, accountId2, lockId2);
+		await repo.tryAcquireLock(mailboxId1, eventName, accountId1, lockId1, 3600);
+		await repo.tryAcquireLock(mailboxId2, eventName, accountId2, lockId2, 3600);
 
 		const locks = await repo.listByAccount(accountId1);
 		assert.equal(locks.filter((l) => l.lockId === lockId1).length, 1);
@@ -329,8 +342,8 @@ describe("MailboxLockRepo", () => {
 		const mb1 = randomId();
 		const mb2 = randomId();
 
-		await repo.tryAcquireLock(mb1, "SYNC_MESSAGES", accountId, lockId1);
-		await repo.tryAcquireLock(mb2, "SYNC_FLAGS", accountId, lockId2);
+		await repo.tryAcquireLock(mb1, "SYNC_MESSAGES", accountId, lockId1, 3600);
+		await repo.tryAcquireLock(mb2, "SYNC_FLAGS", accountId, lockId2, 3600);
 
 		await repo.deleteByAccount(accountId);
 
@@ -343,7 +356,13 @@ describe("MailboxLockRepo", () => {
 		const other = randomId();
 		const mailboxId = randomId();
 		const lockId = randomId();
-		await repo.tryAcquireLock(mailboxId, "SYNC_MESSAGES", accountId, lockId);
+		await repo.tryAcquireLock(
+			mailboxId,
+			"SYNC_MESSAGES",
+			accountId,
+			lockId,
+			3600,
+		);
 
 		assert.ok(await repo.get(accountId, mailboxId, "SYNC_MESSAGES"));
 		assert.equal(await repo.get(other, mailboxId, "SYNC_MESSAGES"), null);
@@ -356,7 +375,13 @@ describe("MailboxLockRepo", () => {
 		const other = randomId();
 		const mailboxId = randomId();
 		const lockId = randomId();
-		await repo.tryAcquireLock(mailboxId, "SYNC_MESSAGES", accountId, lockId);
+		await repo.tryAcquireLock(
+			mailboxId,
+			"SYNC_MESSAGES",
+			accountId,
+			lockId,
+			3600,
+		);
 
 		// Foreign account with the (leaked) lockId still cannot release it.
 		await repo.releaseLock(other, mailboxId, "SYNC_MESSAGES", lockId);

package/src/repos/i4-mailbox-lock.ts

@@ -32,10 +32,11 @@ export class MailboxLockRepo implements IMailboxLockRepository {
 		eventName: string,
 		accountId: string,
 		lockId: string,
+		ttlSeconds: number,
 	): Promise<boolean> {
 		const now = Date.now();
 		const nowSeconds = Math.floor(now / 1000);
-		const ttl = nowSeconds + TTL_SECONDS;
+		const ttl = nowSeconds + ttlSeconds;
 
 		const rows = await this.db
 			.insert(mailboxLockTable)
@@ -90,6 +91,7 @@ export class MailboxLockRepo implements IMailboxLockRepository {
 			eventName,
 			accountId,
 			lockId,
+			TTL_SECONDS,
 		);
 		if (!acquired) return { executed: false };