@remit/drizzle-service 0.0.67 → 0.0.68

package/package.json

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

package/src/repos/calendar-collection.ts

@@ -72,6 +72,37 @@ export class CalendarCollectionRepo implements ICalendarCollectionRepository {
 		return rowToCalendar(row);
 	}
 
+	/**
+	 * One statement, so the loser of a race is told the segment is taken rather
+	 * than handed the winner's calendar. A read followed by an insert would let
+	 * both callers see the segment free and one of them silently write into the
+	 * other's collection.
+	 */
+	async createExclusive(
+		input: CreateCalendarCollectionInput,
+	): Promise<CalendarCollectionItem | null> {
+		const now = Date.now();
+		const urlSegment = normalizeCalendarUrlSegment(input.urlSegment);
+		const [row] = await this.db
+			.insert(calendarTable)
+			.values({
+				calendarId: deriveCalendarId(input.accountConfigId, urlSegment),
+				accountConfigId: input.accountConfigId,
+				urlSegment,
+				displayName: input.displayName,
+				color: input.color ?? "Cal1",
+				componentSet: input.componentSet ?? "VeventOnly",
+				source: input.source ?? "UserCreated",
+				timezone: input.timezone ?? "",
+				syncSequence: 0,
+				createdAt: now,
+				updatedAt: now,
+			})
+			.onConflictDoNothing({ target: calendarTable.calendarId })
+			.returning();
+		return row ? rowToCalendar(row) : null;
+	}
+
 	async get(
 		accountConfigId: string,
 		calendarId: string,

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

@@ -0,0 +1,73 @@
+import assert from "node:assert/strict";
+import { after, before, describe, test } from "node:test";
+import { provisionDefaultCalendar } from "@remit/calendar-service";
+import type { ICalendarUnitOfWork } from "@remit/data-ports";
+import type { Db } from "../db.js";
+import {
+	calendarEventIndexTable,
+	calendarObjectTable,
+	calendarTable,
+} from "../schema.js";
+import { createSqliteTestDb } from "../test-db-sqlite.js";
+import { CalendarCollectionRepo } from "./calendar-collection.js";
+import { DrizzleCalendarUnitOfWork } from "./calendar-unit-of-work.js";
+
+const ACCOUNT_CONFIG_ID = "account-config-default";
+
+describe("provisioning the default calendar", () => {
+	let db: Db<Record<string, unknown>>;
+	let close: () => Promise<void>;
+	let unitOfWork: ICalendarUnitOfWork;
+
+	before(async () => {
+		const created = await createSqliteTestDb({
+			calendars: calendarTable,
+			calendarObjects: calendarObjectTable,
+			calendarEventIndexes: calendarEventIndexTable,
+		});
+		db = created.db as unknown as Db<Record<string, unknown>>;
+		close = created.close;
+		unitOfWork = new DrizzleCalendarUnitOfWork(db);
+	});
+
+	after(() => close());
+
+	test("leaves one calendar behind when several first reads arrive together", async () => {
+		const provisioned = await Promise.all(
+			Array.from({ length: 8 }, () =>
+				provisionDefaultCalendar(unitOfWork, ACCOUNT_CONFIG_ID),
+			),
+		);
+
+		const ids = new Set(provisioned.map((collection) => collection.calendarId));
+		assert.equal(ids.size, 1, "every caller was handed the same calendar");
+
+		const rows = await new CalendarCollectionRepo(db).listByAccountConfig(
+			ACCOUNT_CONFIG_ID,
+		);
+		assert.equal(rows.length, 1);
+		assert.equal(rows[0]?.urlSegment, "default");
+		assert.equal(
+			rows[0]?.syncSequence,
+			0,
+			"a losing provision did not reset a collection the winner may already have written to",
+		);
+	});
+
+	test("a later provision returns the stored collection rather than resetting it", async () => {
+		const repo = new CalendarCollectionRepo(db);
+		const [before] = await repo.listByAccountConfig(ACCOUNT_CONFIG_ID);
+		assert.ok(before);
+		await repo.bumpSyncSequence(ACCOUNT_CONFIG_ID, before.calendarId);
+
+		const again = await provisionDefaultCalendar(
+			unitOfWork,
+			ACCOUNT_CONFIG_ID,
+			"A different name",
+		);
+
+		assert.equal(again.calendarId, before.calendarId);
+		assert.equal(again.displayName, before.displayName);
+		assert.equal(again.syncSequence, 1);
+	});
+});

package/src/repos/calendar-event-index.ts

@@ -19,6 +19,9 @@ function rowToOccurrence(
 		startAt: row.startAt,
 		endAt: row.endAt,
 		allDay: row.allDay,
+		summary: row.summary,
+		status: row.status,
+		transparency: row.transparency,
 		createdAt: row.createdAt,
 		updatedAt: row.updatedAt,
 	};
@@ -44,6 +47,9 @@ export class CalendarEventIndexRepo implements ICalendarEventIndexRepository {
 				startAt: occurrence.startAt,
 				endAt: occurrence.endAt,
 				allDay: occurrence.allDay,
+				summary: occurrence.summary,
+				status: occurrence.status,
+				transparency: occurrence.transparency,
 				createdAt: now,
 				updatedAt: now,
 			})),

package/src/repos/calendar-object.ts

@@ -4,7 +4,7 @@ import type {
 	PutCalendarObjectInput,
 } from "@remit/data-ports";
 import { deriveCalendarObjectId } from "@remit/data-ports/id";
-import { and, asc, eq, gt } from "drizzle-orm";
+import { and, asc, eq, gt, lt, ne } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { calendarObjectTable } from "../schema.js";
@@ -82,6 +82,22 @@ export class CalendarObjectRepo implements ICalendarObjectRepository {
 		return rowToCalendarObject(row);
 	}
 
+	async find(
+		calendarId: string,
+		calendarObjectId: string,
+	): Promise<CalendarObjectItem | null> {
+		const [row] = await this.db
+			.select()
+			.from(calendarObjectTable)
+			.where(
+				and(
+					eq(calendarObjectTable.calendarId, calendarId),
+					eq(calendarObjectTable.calendarObjectId, calendarObjectId),
+				),
+			);
+		return row ? rowToCalendarObject(row) : null;
+	}
+
 	async delete(calendarId: string, calendarObjectId: string): Promise<void> {
 		await this.db
 			.delete(calendarObjectTable)
@@ -139,6 +155,24 @@ export class CalendarObjectRepo implements ICalendarObjectRepository {
 		return rows.map(rowToCalendarObject);
 	}
 
+	async listIncompleteExpansions(
+		calendarId: string,
+		instant: string,
+	): Promise<CalendarObjectItem[]> {
+		const rows = await this.db
+			.select()
+			.from(calendarObjectTable)
+			.where(
+				and(
+					eq(calendarObjectTable.calendarId, calendarId),
+					ne(calendarObjectTable.expandedThrough, ""),
+					lt(calendarObjectTable.expandedThrough, instant),
+				),
+			)
+			.orderBy(asc(calendarObjectTable.calendarObjectId));
+		return rows.map(rowToCalendarObject);
+	}
+
 	async listChangedSince(
 		calendarId: string,
 		syncSequence: number,