@remit/drizzle-service 0.0.101 → 0.0.103

package/src/repos/i4-address.ts

@@ -19,11 +19,10 @@ import {
 	eq,
 	getTableColumns,
 	gt,
-	inArray,
 	type SQL,
 	sql,
 } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { envelopeAddressId } from "../id.js";
 import { decodeToken, resultList } from "../pagination.js";
@@ -43,8 +42,9 @@ import {
 	addressRecency,
 	addressSearchMatch,
 } from "./address-search-predicates.js";
+import { inList } from "./in-list.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 type AddressUpdate = Partial<{
 	[K in keyof typeof addressTable.$inferInsert]:
@@ -400,7 +400,7 @@ export class AddressRepo implements IAddressRepository {
 				.where(
 					and(
 						eq(addressTable.accountConfigId, accountConfigId),
-						inArray(addressTable.addressId, addressId),
+						inList(addressTable.addressId, addressId),
 					),
 				);
 			return rows.map(rowToAddress);
@@ -666,7 +666,7 @@ export class AddressRepo implements IAddressRepository {
 			.where(
 				and(
 					eq(addressTable.accountConfigId, accountConfigId),
-					inArray(addressTable.addressId, addressIds),
+					inList(addressTable.addressId, addressIds),
 				),
 			);
 	}
@@ -786,6 +786,16 @@ export class AddressRepo implements IAddressRepository {
 		);
 	}
 
+	async listAllByAccountConfig(
+		accountConfigId: string,
+	): Promise<AddressItem[]> {
+		const rows = await this.db
+			.select()
+			.from(addressTable)
+			.where(eq(addressTable.accountConfigId, accountConfigId));
+		return rows.map(rowToAddress);
+	}
+
 	async createEnvelopeAddress(
 		input: CreateEnvelopeAddressInput,
 	): Promise<EnvelopeAddressItem> {
@@ -856,7 +866,7 @@ export class AddressRepo implements IAddressRepository {
 				.select()
 				.from(envelopeAddressTable)
 				.where(
-					inArray(envelopeAddressTable.envelopeAddressId, envelopeAddressId),
+					inList(envelopeAddressTable.envelopeAddressId, envelopeAddressId),
 				);
 			return rows.map(rowToEnvelopeAddress);
 		}
@@ -884,7 +894,7 @@ export class AddressRepo implements IAddressRepository {
 		await this.db
 			.delete(envelopeAddressTable)
 			.where(
-				inArray(envelopeAddressTable.envelopeAddressId, envelopeAddressIds),
+				inList(envelopeAddressTable.envelopeAddressId, envelopeAddressIds),
 			);
 	}
 }

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

@@ -7,12 +7,12 @@ import {
 	type UpdateConfigImportInput,
 } from "@remit/data-ports";
 import { desc, eq } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { configImportTable } from "../schema/i4-config-import.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 type StoredRef = Omit<ConfigImportUnresolvedRefItem, "mailboxId"> & {
 	mailboxId?: string;

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

@@ -4,11 +4,11 @@ import type {
 	WithMailboxLockResult,
 } from "@remit/data-ports";
 import { and, eq, lt } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { randomId } from "../id.js";
 import { mailboxLockTable } from "../schema/i4-mailbox-lock.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 const TTL_SECONDS = 3600;
 

package/src/repos/i4-mailbox-special-use.sqlite.test.ts

@@ -12,11 +12,11 @@ import {
 	mailboxSpecialUseTable,
 	mailboxTable,
 } from "../schema.js";
-import { SearchIndex } from "../search/thread-message-search.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createSqliteTestDb } from "../test-db-sqlite.js";
-import { AccountSettingRepo } from "./i4-account-setting.js";
-import { MailboxRepo } from "./i4-mailbox.js";
-import { MailboxSpecialUseRepo } from "./i4-mailbox-special-use.js";
+import type { AccountSettingRepo } from "./i4-account-setting.js";
+import type { MailboxRepo } from "./i4-mailbox.js";
+import type { MailboxSpecialUseRepo } from "./i4-mailbox-special-use.js";
 import { mailboxCreated } from "./test-helpers.js";
 
 const makeMailboxInput = (
@@ -57,12 +57,14 @@ describe("MailboxSpecialUseRepo role lookups (sqlite)", () => {
 		});
 		close = testDb.close;
 		db = testDb.db;
-		repo = new MailboxSpecialUseRepo(testDb.db as never, testDb.db as never);
-		mailboxes = new MailboxRepo(
-			testDb.db as never,
-			new SearchIndex(testDb.db as never, testDb.db as never),
-		);
-		accountSettings = new AccountSettingRepo(testDb.db as never);
+		const repos = createSqliteRepositories({
+			app: testDb.db,
+			mail: testDb.db,
+			search: testDb.db,
+		});
+		repo = repos.mailboxSpecialUse;
+		mailboxes = repos.mailbox;
+		accountSettings = repos.accountSetting;
 	});
 
 	after(async () => {

package/src/repos/i4-mailbox-special-use.ts

@@ -1,4 +1,7 @@
 import type {
+	AccountItem,
+	IAccountRepository,
+	IAccountSettingRepository,
 	IMailboxSpecialUseRepository,
 	MailboxSpecialUseItem,
 	MailboxSpecialUseValue,
@@ -14,14 +17,22 @@ import {
 	type UnappointedRoleResolution,
 } from "@remit/data-ports/folder-role";
 import { CanonicalMailboxRole } from "@remit/domain-enums";
-import { eq, inArray } from "drizzle-orm";
-import type { Db } from "../db.js";
+import { eq } from "drizzle-orm";
+import type { RepositoryDb } from "../db.js";
 import { randomId } from "../id.js";
-import { accountTable } from "../schema/i4-account-config.js";
 import { mailboxSpecialUseTable, mailboxTable } from "../schema/i4-mailbox.js";
-import { AccountSettingRepo } from "./i4-account-setting.js";
+import { inList } from "./in-list.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
+
+type AccountReader = Pick<
+	IAccountRepository,
+	"get" | "listAllByAccountConfig" | "listAll"
+>;
+
+type AppointmentReader = Pick<IAccountSettingRepository, "get" | "getMany">;
+
+type AppointedAccount = Pick<AccountItem, "accountId" | "accountConfigId">;
 
 const JUNK_ROLES: readonly CanonicalMailboxRoleValue[] = [
 	CanonicalMailboxRole.Junk,
@@ -88,14 +99,11 @@ function rowToSpecialUse(
 }
 
 export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
-	private readonly accountSetting: AccountSettingRepo;
-
 	constructor(
-		private app: DB,
 		private db: DB,
-	) {
-		this.accountSetting = new AccountSettingRepo(app);
-	}
+		private accounts: AccountReader,
+		private accountSetting: AppointmentReader,
+	) {}
 
 	async create(
 		mailboxId: string,
@@ -202,11 +210,9 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 	async resolveJunkRolesForConfig(
 		accountConfigId: string,
 	): Promise<JunkRoleMailboxes> {
-		const accounts = await this.app
-			.select({ accountId: accountTable.accountId })
-			.from(accountTable)
-			.where(eq(accountTable.accountConfigId, accountConfigId));
-		return this.resolveJunkRoles(accounts.map((row) => row.accountId));
+		return this.resolveJunkRoles(
+			await this.accounts.listAllByAccountConfig(accountConfigId),
+		);
 	}
 
 	/**
@@ -216,21 +222,19 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 	 * run one pass over the address table instead of one per config.
 	 */
 	async resolveJunkRolesForInstance(): Promise<JunkRoleMailboxes> {
-		const accounts = await this.app
-			.select({ accountId: accountTable.accountId })
-			.from(accountTable);
-		return this.resolveJunkRoles(accounts.map((row) => row.accountId));
+		return this.resolveJunkRoles(await this.accounts.listAll());
 	}
 
 	private async resolveJunkRoles(
-		accountIds: readonly string[],
+		accounts: readonly AppointedAccount[],
 	): Promise<JunkRoleMailboxes> {
-		if (accountIds.length === 0) {
+		if (accounts.length === 0) {
 			return { junkMailboxIds: [], trashMailboxIds: [] };
 		}
+		const accountIds = accounts.map((account) => account.accountId);
 		const [candidates, appointments] = await Promise.all([
 			this.roleCandidatesFor(accountIds),
-			this.appointedMailboxIds(accountIds, JUNK_ROLES),
+			this.appointedMailboxIds(accounts, JUNK_ROLES),
 		]);
 
 		const junkMailboxIds: string[] = [];
@@ -254,24 +258,13 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 	}
 
 	/**
-	 * Each account's appointment for each role, in two reads. Same precedence
-	 * input as `appointedMailboxId`, batched: an account row missing is a caller
-	 * racing a delete, and leaves the account with no appointment rather than
-	 * failing the lookup.
+	 * Each account's appointment for each role, in one read. Same precedence
+	 * input as `appointedMailboxId`, batched.
 	 */
 	private async appointedMailboxIds(
-		accountIds: readonly string[],
+		accounts: readonly AppointedAccount[],
 		roles: readonly CanonicalMailboxRoleValue[],
 	): Promise<Map<string, string>> {
-		const accounts = await this.app
-			.select({
-				accountId: accountTable.accountId,
-				accountConfigId: accountTable.accountConfigId,
-			})
-			.from(accountTable)
-			.where(inArray(accountTable.accountId, [...accountIds]));
-		if (accounts.length === 0) return new Map();
-
 		const wanted = new Map<string, string>();
 		for (const account of accounts) {
 			for (const role of roles) {
@@ -303,14 +296,14 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 		const rows = await this.db
 			.select()
 			.from(mailboxTable)
-			.where(inArray(mailboxTable.accountId, [...accountIds]));
+			.where(inList(mailboxTable.accountId, accountIds));
 		if (rows.length === 0) return new Map();
 
 		const entries = await this.db
 			.select()
 			.from(mailboxSpecialUseTable)
 			.where(
-				inArray(
+				inList(
 					mailboxSpecialUseTable.mailboxId,
 					rows.map((row) => row.mailboxId),
 				),
@@ -366,10 +359,7 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 		accountId: string,
 		role: CanonicalMailboxRoleValue,
 	): Promise<string | undefined> {
-		const [account] = await this.app
-			.select({ accountConfigId: accountTable.accountConfigId })
-			.from(accountTable)
-			.where(eq(accountTable.accountId, accountId));
+		const [account] = await this.accounts.get([accountId]);
 		if (!account) return undefined;
 
 		const setting = await this.accountSetting.get(
@@ -397,7 +387,7 @@ export class MailboxSpecialUseRepo implements IMailboxSpecialUseRepository {
 			.select()
 			.from(mailboxSpecialUseTable)
 			.where(
-				inArray(
+				inList(
 					mailboxSpecialUseTable.mailboxId,
 					rows.map((row) => row.mailboxId),
 				),

package/src/repos/i4-mailbox.sqlite.test.ts

@@ -5,13 +5,13 @@ import { MailboxSyncStatus } from "@remit/domain-enums";
 import Database from "better-sqlite3";
 import { drizzle } from "drizzle-orm/better-sqlite3";
 import { mailboxTable } from "../schema.js";
-import { SearchIndex } from "../search/thread-message-search.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createSqliteTestDb } from "../test-db-sqlite.js";
 import {
 	applyMigrationSet,
 	shippedTableDdl,
 } from "../test-shipped-sqlite-schema.js";
-import { MailboxRepo } from "./i4-mailbox.js";
+import type { MailboxRepo } from "./i4-mailbox.js";
 import { mailboxCreated } from "./test-helpers.js";
 
 function makeMailboxInput(accountId: string, fullPath = "INBOX") {
@@ -41,10 +41,11 @@ describe("MailboxRepo (sqlite)", () => {
 	before(async () => {
 		const testDb = await createSqliteTestDb({ mailbox: mailboxTable });
 		close = testDb.close;
-		repo = new MailboxRepo(
-			testDb.db as never,
-			new SearchIndex(testDb.db as never, testDb.db as never),
-		);
+		repo = createSqliteRepositories({
+			app: testDb.db,
+			mail: testDb.db,
+			search: testDb.db,
+		}).mailbox;
 	});
 
 	after(async () => {
@@ -210,10 +211,11 @@ describe("MailboxRepo (sqlite, shipped migrations)", () => {
 		const sqlite = new Database(":memory:");
 		applyMigrationSet(sqlite, "mail");
 		const db = drizzle(sqlite, { schema: { mailbox: mailboxTable } });
-		repo = new MailboxRepo(
-			db as never,
-			new SearchIndex(db as never, db as never),
-		);
+		repo = createSqliteRepositories({
+			app: db,
+			mail: db,
+			search: db,
+		}).mailbox;
 		close = async () => {
 			sqlite.close();
 		};

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

@@ -2,7 +2,7 @@ import assert from "node:assert";
 import { after, before, describe, test } from "node:test";
 import { MailboxSyncStatus } from "@remit/domain-enums";
 import { eq } from "drizzle-orm";
-import { runBatch } from "../batch.js";
+import { syncBatch } from "../batch.js";
 import {
 	envelopeId as deriveEnvelopeId,
 	rootBodyPartId as deriveRootBodyPartId,
@@ -10,14 +10,13 @@ import {
 import {
 	filterTable,
 	mailboxSpecialUseTable,
-	mailboxTable,
 	messageTable,
 	threadMessageTable,
 } from "../schema.js";
-import { SearchIndex } from "../search/thread-message-search.js";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createTestDb, randomId, type TestDb } from "../test-db.js";
-import { MailboxRepo } from "./i4-mailbox.js";
-import { DrizzleMessageRepository, deleteMessageSubtree } from "./message.js";
+import type { MailboxRepo } from "./i4-mailbox.js";
+import { deleteMessageSubtree } from "./message.js";
 import { mailboxCreated } from "./test-helpers.js";
 
 /** Every state a row can carry, for a transition that decides against none. */
@@ -55,10 +54,11 @@ describe("MailboxRepo", () => {
 
 	before(async () => {
 		({ db, close } = await createTestDb());
-		repo = new MailboxRepo(
-			db as never,
-			new SearchIndex(db as never, db as never),
-		);
+		repo = createSqliteRepositories({
+			app: db,
+			mail: db,
+			search: db,
+		}).mailbox;
 	});
 
 	after(async () => {
@@ -543,10 +543,11 @@ describe("MailboxRepo", () => {
 	describe("deleteMailboxWithMail — the folder's mail goes with it (D8)", () => {
 		const seedMessage = async (mailboxId: string, uid: number) => {
 			const messageId = randomId();
-			await new DrizzleMessageRepository(
-				db as never,
-				new SearchIndex(db as never, db as never),
-			).create({
+			await createSqliteRepositories({
+				app: db,
+				mail: db,
+				search: db,
+			}).message.create({
 				messageId,
 				mailboxId,
 				uid,
@@ -674,7 +675,7 @@ describe("MailboxRepo", () => {
 
 			// The shape an interruption leaves: one message's rows already gone,
 			// the mailbox row still there and still `deleting`.
-			await runBatch(db, deleteMessageSubtree(db, [first]));
+			await syncBatch(db)(deleteMessageSubtree(db, [first]));
 			await repo.transition(accountId, mailbox.mailboxId, {
 				from: EVERY_STATE,
 				to: MailboxSyncStatus.deleting,

package/src/repos/i4-mailbox.ts

@@ -27,8 +27,8 @@ import {
 	sql,
 } from "drizzle-orm";
 import shortUuid from "short-uuid";
-import { runBatch } from "../batch.js";
-import type { Db } from "../db.js";
+import type { WriteBatch } from "../batch.js";
+import type { RepositoryDb, SqliteStore } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { decodeToken, resultList } from "../pagination.js";
 import {
@@ -44,6 +44,7 @@ import { messageTable } from "../schema/message-data.js";
 import { syncWarningTable } from "../schema/sync-warning.js";
 import { threadMessageTable } from "../schema/thread-message.js";
 import type { SearchIndex } from "../search/thread-message-search.js";
+import { inList } from "./in-list.js";
 import { deleteMessageSubtree } from "./message.js";
 
 const base36Translator = shortUuid.createTranslator(
@@ -51,7 +52,7 @@ const base36Translator = shortUuid.createTranslator(
 );
 const generateMailboxId = () => base36Translator.fromUUID(randomUUID());
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 /**
  * Message subtrees removed per batch by {@link MailboxRepo.deleteMailboxWithMail},
@@ -148,10 +149,16 @@ export function rowToMailbox(
 }
 
 export class MailboxRepo implements IMailboxRepository {
+	private readonly db: DB;
+	private readonly batch: WriteBatch;
+
 	constructor(
-		private db: DB,
+		store: SqliteStore<Record<string, unknown>>,
 		private search: SearchIndex,
-	) {}
+	) {
+		this.db = store.db;
+		this.batch = store.batch;
+	}
 
 	async create(input: CreateMailboxInput): Promise<CreateMailboxResult> {
 		const now = Date.now();
@@ -207,7 +214,7 @@ export class MailboxRepo implements IMailboxRepository {
 				.where(
 					and(
 						eq(mailboxTable.accountId, accountId),
-						inArray(mailboxTable.mailboxId, mailboxId),
+						inList(mailboxTable.mailboxId, mailboxId),
 					),
 				);
 			return rows.map(rowToMailbox);
@@ -378,13 +385,13 @@ export class MailboxRepo implements IMailboxRepository {
 
 	async deleteMany(accountId: string, mailboxIds: string[]): Promise<void> {
 		if (mailboxIds.length === 0) return;
-		await runBatch(this.db, [
+		await this.batch([
 			this.db
 				.delete(syncWarningTable)
 				.where(
 					and(
 						eq(syncWarningTable.accountId, accountId),
-						inArray(syncWarningTable.mailboxId, mailboxIds),
+						inList(syncWarningTable.mailboxId, mailboxIds),
 					),
 				),
 			this.db
@@ -392,7 +399,7 @@ export class MailboxRepo implements IMailboxRepository {
 				.where(
 					and(
 						eq(mailboxTable.accountId, accountId),
-						inArray(mailboxTable.mailboxId, mailboxIds),
+						inList(mailboxTable.mailboxId, mailboxIds),
 					),
 				),
 		]);
@@ -551,15 +558,15 @@ export class MailboxRepo implements IMailboxRepository {
 			const listings = await this.db
 				.select({ threadMessageId: threadMessageTable.threadMessageId })
 				.from(threadMessageTable)
-				.where(inArray(threadMessageTable.messageId, messageIds));
+				.where(inList(threadMessageTable.messageId, messageIds));
 
 			// The primitive the rest of the codebase deletes mail with: nine
 			// per-message child tables. A bespoke table list would orphan them.
-			await runBatch(this.db, [
+			await this.batch([
 				...deleteMessageSubtree(this.db, messageIds),
 				this.db
 					.delete(threadMessageTable)
-					.where(inArray(threadMessageTable.messageId, messageIds)),
+					.where(inList(threadMessageTable.messageId, messageIds)),
 			]);
 			await this.search.sync(listings.map((row) => row.threadMessageId));
 		}

package/src/repos/i4-message-flag-push.ts

@@ -3,10 +3,10 @@ import type {
 	PutMessageFlagPushInput,
 } from "@remit/data-ports";
 import { and, eq } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { messageFlagPushTable } from "../schema/i4-message-flag-push.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 export type { MessageFlagPushItem, PutMessageFlagPushInput };
 export type FlagPushOperation = MessageFlagPushItem["operation"];

package/src/repos/i4-message-placement-move.ts

@@ -3,10 +3,10 @@ import type {
 	PutMessagePlacementMoveInput,
 } from "@remit/data-ports";
 import { eq } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { messagePlacementMoveTable } from "../schema/i4-message-placement-move.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 export type { MessagePlacementMoveItem, PutMessagePlacementMoveInput };
 export type MessagePlacementMoveState = MessagePlacementMoveItem["state"];

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

@@ -6,13 +6,13 @@ import type {
 	UpdateOrganizeJobRequestInput,
 } from "@remit/data-ports";
 import { eq } from "drizzle-orm";
-import type { Db } from "../db.js";
+import type { RepositoryDb } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { decodeToken, resultList } from "../pagination.js";
 import { organizeJobRequestTable } from "../schema/i4-organize-job-request.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 function rowToItem(
 	row: typeof organizeJobRequestTable.$inferSelect,

package/src/repos/i4-outbox-attachment.test.ts

@@ -1,7 +1,8 @@
 import assert from "node:assert";
 import { after, before, describe, test } from "node:test";
+import { createSqliteRepositories } from "../sqlite-repositories.js";
 import { createTestDb, randomId } from "../test-db.js";
-import { OutboxAttachmentRepo } from "./i4-outbox-attachment.js";
+import type { OutboxAttachmentRepo } from "./i4-outbox-attachment.js";
 
 const CAP = { maxTotalBytes: 1000, maxCount: 3, nowSeconds: 1_000_000 };
 
@@ -27,7 +28,11 @@ const input = (
 
 before(async () => {
 	harness = await createTestDb();
-	repo = new OutboxAttachmentRepo(harness.db);
+	repo = createSqliteRepositories({
+		app: harness.db,
+		mail: harness.db,
+		search: harness.db,
+	}).outboxAttachment;
 });
 
 after(async () => {

package/src/repos/i4-outbox-attachment.ts

@@ -6,13 +6,14 @@ import type {
 	ReserveOutboxAttachmentResult,
 } from "@remit/data-ports";
 import { holdsRoom } from "@remit/data-ports";
-import { and, eq, gt, gte, inArray, lt, or, sum } from "drizzle-orm";
-import { runBatch } from "../batch.js";
-import type { Db } from "../db.js";
+import { and, eq, gt, gte, lt, or, sum } from "drizzle-orm";
+import type { WriteBatch } from "../batch.js";
+import type { RepositoryDb, SqliteStore } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { outboxAttachmentTable } from "../schema/i4-outbox-attachment.js";
+import { inList } from "./in-list.js";
 
-type DB = Db<Record<string, unknown>>;
+type DB = RepositoryDb<Record<string, unknown>>;
 
 function rowToOutboxAttachment(
 	row: typeof outboxAttachmentTable.$inferSelect,
@@ -34,7 +35,13 @@ function rowToOutboxAttachment(
 }
 
 export class OutboxAttachmentRepo implements IOutboxAttachmentRepository {
-	constructor(private db: DB) {}
+	private readonly db: DB;
+	private readonly batch: WriteBatch;
+
+	constructor(store: SqliteStore<Record<string, unknown>>) {
+		this.db = store.db;
+		this.batch = store.batch;
+	}
 
 	/**
 	 * The per-message cap. The insert, the read of the draft's live rows and a
@@ -59,7 +66,7 @@ export class OutboxAttachmentRepo implements IOutboxAttachmentRepository {
 				gte(outboxAttachmentTable.reservationExpiresAt, cap.nowSeconds),
 			),
 		);
-		const [inserted, rows, removed] = await runBatch(this.db, [
+		const [inserted, rows, removed] = await this.batch([
 			this.db
 				.insert(outboxAttachmentTable)
 				.values({
@@ -218,10 +225,7 @@ export class OutboxAttachmentRepo implements IOutboxAttachmentRepository {
 			.where(
 				and(
 					eq(outboxAttachmentTable.accountConfigId, accountConfigId),
-					inArray(
-						outboxAttachmentTable.outboxAttachmentId,
-						outboxAttachmentIds,
-					),
+					inList(outboxAttachmentTable.outboxAttachmentId, outboxAttachmentIds),
 				),
 			);
 	}