@remit/drizzle-service 0.0.28 → 0.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "description": "Drizzle ORM service parameterized by dialect (Postgres / SQLite)",
   "type": "module",
   "main": "src/index.ts",

package/src/repos/label.ts

@@ -2,12 +2,14 @@ import type {
 	CreateLabelInput,
 	ILabelRepository,
 	LabelItem,
+	ResultList,
 	UpdateLabelInput,
 } from "@remit/data-ports";
-import { and, eq } from "drizzle-orm";
+import { and, asc, eq, gt, or } from "drizzle-orm";
 import type { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
+import { decodeToken, resultList } from "../pagination.js";
 import { labelTable } from "../schema.js";
 
 type DB = NodePgDatabase<Record<string, unknown>>;
@@ -107,6 +109,58 @@ export class LabelRepo implements ILabelRepository {
 		return rows.map(rowToLabel);
 	}
 
+	/**
+	 * A single signed page of an account config's labels (issue #26), mirroring
+	 * `FilterRepo.listPageByAccountConfig`: a `(createdAt, labelId)` keyset
+	 * cursor that round-trips through `continuationToken`.
+	 */
+	async listPageByAccountConfig(
+		accountConfigId: string,
+		options?: { limit?: number; continuationToken?: string },
+	): Promise<ResultList<LabelItem>> {
+		const limit = options?.limit ?? 100;
+		const cursor = options?.continuationToken
+			? decodeToken(options.continuationToken)
+			: undefined;
+		const after = cursor
+			? {
+					createdAt: cursor.createdAt as number,
+					labelId: cursor.labelId as string,
+				}
+			: undefined;
+
+		const rows = await this.db
+			.select()
+			.from(labelTable)
+			.where(
+				and(
+					eq(labelTable.accountConfigId, accountConfigId),
+					after
+						? or(
+								gt(labelTable.createdAt, after.createdAt),
+								and(
+									eq(labelTable.createdAt, after.createdAt),
+									gt(labelTable.labelId, after.labelId),
+								),
+							)
+						: undefined,
+				),
+			)
+			.orderBy(asc(labelTable.createdAt), asc(labelTable.labelId))
+			.limit(limit + 1);
+
+		const hasMore = rows.length > limit;
+		const items = rows.slice(0, limit).map(rowToLabel);
+		const lastItem = items[items.length - 1];
+		return resultList(
+			items,
+			limit,
+			hasMore && lastItem
+				? { createdAt: lastItem.createdAt, labelId: lastItem.labelId }
+				: undefined,
+		);
+	}
+
 	async findByNormalizedName(
 		accountConfigId: string,
 		normalizedName: string,

package/src/repos/message-label.test.ts

@@ -107,4 +107,55 @@ describe("MessageLabelRepo", () => {
 		const messageIds = rows.map((r) => r.messageId).sort();
 		assert.deepEqual(messageIds, [messageIdA, messageIdB].sort());
 	});
+
+	test("listByMessageIds batch-fetches across several messages in one call", async () => {
+		const accountConfigId = randomId();
+		const messageIdA = randomId();
+		const messageIdB = randomId();
+		const messageIdC = randomId();
+		const labelId = randomId();
+
+		await repo.apply({ accountConfigId, messageId: messageIdA, labelId });
+		await repo.apply({ accountConfigId, messageId: messageIdB, labelId });
+
+		const rows = await repo.listByMessageIds([
+			messageIdA,
+			messageIdB,
+			messageIdC,
+		]);
+		const messageIds = rows.map((r) => r.messageId).sort();
+		assert.deepEqual(messageIds, [messageIdA, messageIdB].sort());
+	});
+
+	test("listByMessageIds returns nothing for an empty list", async () => {
+		const rows = await repo.listByMessageIds([]);
+		assert.deepEqual(rows, []);
+	});
+
+	test("removeAllByLabelId clears every MessageLabel row for the label, scoped to the account", async () => {
+		const accountConfigId = randomId();
+		const labelId = randomId();
+		const messageIdA = randomId();
+		const messageIdB = randomId();
+		const foreignAccountConfigId = randomId();
+		const foreignMessageId = randomId();
+
+		await repo.apply({ accountConfigId, messageId: messageIdA, labelId });
+		await repo.apply({ accountConfigId, messageId: messageIdB, labelId });
+		await repo.apply({
+			accountConfigId: foreignAccountConfigId,
+			messageId: foreignMessageId,
+			labelId,
+		});
+
+		await repo.removeAllByLabelId(accountConfigId, labelId);
+
+		assert.deepEqual(await repo.listByMessageId(messageIdA), []);
+		assert.deepEqual(await repo.listByMessageId(messageIdB), []);
+		const foreignRows = await repo.listByLabelId(
+			foreignAccountConfigId,
+			labelId,
+		);
+		assert.equal(foreignRows.length, 1);
+	});
 });

package/src/repos/message-label.ts

@@ -3,7 +3,7 @@ import type {
 	IMessageLabelRepository,
 	MessageLabelItem,
 } from "@remit/data-ports";
-import { and, desc, eq } from "drizzle-orm";
+import { and, desc, eq, inArray } from "drizzle-orm";
 import type { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { deterministicBase36Id } from "../id.js";
 import { messageLabelTable } from "../schema.js";
@@ -77,6 +77,15 @@ export class MessageLabelRepo implements IMessageLabelRepository {
 		return rows.map(rowToMessageLabel);
 	}
 
+	async listByMessageIds(messageIds: string[]): Promise<MessageLabelItem[]> {
+		if (messageIds.length === 0) return [];
+		const rows = await this.db
+			.select()
+			.from(messageLabelTable)
+			.where(inArray(messageLabelTable.messageId, messageIds));
+		return rows.map(rowToMessageLabel);
+	}
+
 	async listByLabelId(
 		accountConfigId: string,
 		labelId: string,
@@ -93,4 +102,18 @@ export class MessageLabelRepo implements IMessageLabelRepository {
 			.orderBy(desc(messageLabelTable.createdAt));
 		return rows.map(rowToMessageLabel);
 	}
+
+	async removeAllByLabelId(
+		accountConfigId: string,
+		labelId: string,
+	): Promise<void> {
+		await this.db
+			.delete(messageLabelTable)
+			.where(
+				and(
+					eq(messageLabelTable.accountConfigId, accountConfigId),
+					eq(messageLabelTable.labelId, labelId),
+				),
+			);
+	}
 }