@remit/drizzle-service 0.0.95 → 0.0.96

package/package.json

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

package/src/mailbox-path-dedupe.sqlite.test.ts

@@ -35,6 +35,16 @@ const filterAtDedupe = sqliteTable("filter", {
 	updatedAt: integer("updated_at").notNull(),
 });
 
+const organizeJobAtDedupe = sqliteTable("organize_job_request", {
+	organizeJobId: text("organize_job_id").primaryKey(),
+	accountConfigId: text("account_config_id").notNull(),
+	userId: text("user_id").notNull(),
+	actionMailboxId: text("action_mailbox_id").notNull(),
+	ttl: integer("ttl").notNull(),
+	createdAt: integer("created_at").notNull(),
+	updatedAt: integer("updated_at").notNull(),
+});
+
 type Handle = { sqlite: Database.Database; db: Db<Record<string, unknown>> };
 
 const atPredecessor = (): Handle => {
@@ -229,7 +239,7 @@ describe("(account_id, full_path) becomes unique", () => {
 			createdAt: 0,
 			updatedAt: 0,
 		});
-		await handle.db.insert(entities.organizeJobRequests).values({
+		await handle.db.insert(organizeJobAtDedupe).values({
 			organizeJobId: "job-1",
 			accountConfigId: CONFIG,
 			userId: "user",
@@ -272,7 +282,7 @@ describe("(account_id, full_path) becomes unique", () => {
 		assert.equal(child?.parent, "with-mail");
 		const [filter] = await handle.db.select().from(filterAtDedupe);
 		assert.equal(filter?.actionMailboxId, "with-mail");
-		const [job] = await handle.db.select().from(entities.organizeJobRequests);
+		const [job] = await handle.db.select().from(organizeJobAtDedupe);
 		assert.equal(job?.actionMailboxId, "with-mail");
 		const [copied] = await handle.db
 			.select({ original: entities.messages.originalMailboxId })

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

@@ -22,6 +22,7 @@ function rowToItem(
 		accountConfigId: row.accountConfigId,
 		userId: row.userId,
 		state: row.state as OrganizeJobRequestItem["state"],
+		filterId: row.filterId,
 		anchorMessageId: row.anchorMessageId,
 		matchOperator: row.matchOperator as OrganizeJobRequestItem["matchOperator"],
 		literalClauses:
@@ -53,6 +54,7 @@ export class OrganizeJobRequestRepo implements IOrganizeJobRequestRepository {
 				accountConfigId: input.accountConfigId,
 				userId: input.userId,
 				state: input.state ?? "Pending",
+				filterId: input.filterId,
 				anchorMessageId: input.anchorMessageId,
 				matchOperator: input.matchOperator,
 				literalClauses: input.literalClauses,

package/src/repos/thread-message.ts

@@ -664,6 +664,7 @@ export class DrizzleThreadMessageRepository
 			limit?: number;
 			continuationToken?: string;
 			excludeDeleted?: boolean;
+			mailboxIds?: readonly string[];
 		},
 	): Promise<ResultList<ThreadMessageItem>> {
 		const order = options?.order ?? "desc";
@@ -681,6 +682,9 @@ export class DrizzleThreadMessageRepository
 					options?.excludeDeleted
 						? eq(threadMessageTable.isDeleted, false)
 						: undefined,
+					options?.mailboxIds
+						? inArray(threadMessageTable.mailboxId, [...options.mailboxIds])
+						: undefined,
 					buildFieldTermCondition(terms, options?.operator ?? "and"),
 					sentDateCursorCond(order, cursor),
 				),