@remit/drizzle-service 0.0.93 → 0.0.95

package/package.json

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

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, lt, ne } from "drizzle-orm";
+import { and, asc, eq, gt, gte, lt, ne } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { calendarObjectTable } from "../schema.js";
@@ -146,6 +146,23 @@ export class CalendarObjectRepo implements ICalendarObjectRepository {
 		return row ? rowToCalendarObject(row) : null;
 	}
 
+	async listByUidPrefix(
+		calendarId: string,
+		prefix: string,
+	): Promise<CalendarObjectItem[]> {
+		const rows = await this.db
+			.select()
+			.from(calendarObjectTable)
+			.where(
+				and(
+					eq(calendarObjectTable.calendarId, calendarId),
+					gte(calendarObjectTable.icalUid, prefix),
+					lt(calendarObjectTable.icalUid, `${prefix}\uffff`),
+				),
+			);
+		return rows.map(rowToCalendarObject);
+	}
+
 	async listByCalendar(calendarId: string): Promise<CalendarObjectItem[]> {
 		const rows = await this.db
 			.select()

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, lt, or } from "drizzle-orm";
+import { and, asc, desc, eq, inArray, lt, or } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { decodeToken, resultList } from "../pagination.js";
@@ -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,
 			})
@@ -97,6 +99,26 @@ export class CalendarSuggestionRepo implements ICalendarSuggestionRepository {
 		return rowToCalendarSuggestion(row);
 	}
 
+	async listByAcceptedCalendarObjects(
+		accountConfigId: string,
+		calendarObjectIds: string[],
+	): Promise<CalendarSuggestionItem[]> {
+		if (calendarObjectIds.length === 0) return [];
+		const rows = await this.db
+			.select()
+			.from(calendarSuggestionTable)
+			.where(
+				and(
+					eq(calendarSuggestionTable.accountConfigId, accountConfigId),
+					inArray(
+						calendarSuggestionTable.acceptedCalendarObjectId,
+						calendarObjectIds,
+					),
+				),
+			);
+		return rows.map(rowToCalendarSuggestion);
+	}
+
 	async listByMessage(
 		accountConfigId: string,
 		messageId: string,
@@ -200,12 +222,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 +244,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;
+	}
 }