@remit/drizzle-service 0.0.24 → 0.0.26

package/package.json

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

package/src/repos/message.sqlite.test.ts

@@ -74,6 +74,52 @@ describe("DrizzleMessageRepository (sqlite)", () => {
 		assert.deepEqual(item.authenticity, { spf: "pass" });
 	});
 
+	test("filterMove and placementVerdict JSONB columns round-trip through create and update", async () => {
+		// The auto-moved badge for a standing-filter move depends on this
+		// round-trip: body-sync writes `filterMove`, and both read paths project it
+		// back through `toMessageItem` for `deriveAutoMoved` (issue #223).
+		const AUTO_MOVED_ID = "00000000-0000-0000-2222-000000000003";
+		const filterMove = {
+			filterId: "00000000-0000-0000-2222-0000000000f1",
+			sourceMailboxId: "00000000-0000-0000-2222-0000000000f2",
+			destinationMailboxId: "00000000-0000-0000-2222-0000000000f3",
+			decidedAt: NOW,
+		};
+
+		const created = await repo.create({
+			...BASE_INPUT,
+			messageId: AUTO_MOVED_ID,
+			envelopeId: deriveEnvelopeId(AUTO_MOVED_ID),
+			rootBodyPartId: deriveRootBodyPartId(AUTO_MOVED_ID),
+			movedByRemit: true,
+			filterMove: filterMove as unknown as never,
+		});
+		assert.deepEqual(created.filterMove, filterMove);
+
+		const afterCreate = await repo.get(AUTO_MOVED_ID);
+		assert.equal(afterCreate.movedByRemit, true);
+		assert.deepEqual(afterCreate.filterMove, filterMove);
+
+		// A later placement update must not disturb the marker, and a new marker
+		// must overwrite the old one — the same JSONB-set path body-sync uses.
+		const nextFilterMove = { ...filterMove, destinationMailboxId: "mb-other" };
+		await repo.update(AUTO_MOVED_ID, {
+			filterMove: nextFilterMove as unknown as never,
+			placementVerdict: {
+				action: "MoveToInbox",
+				confidence: "Confident",
+				fromPlacement: "junk",
+				reasons: ["provider=spam"],
+				dryRun: false,
+				decidedAt: NOW,
+			} as unknown as never,
+		});
+
+		const afterUpdate = await repo.get(AUTO_MOVED_ID);
+		assert.deepEqual(afterUpdate.filterMove, nextFilterMove);
+		assert.equal(afterUpdate.placementVerdict?.action, "MoveToInbox");
+	});
+
 	test("duplicate messageId throws CreateFailedConflictError and rolls back the outbox row", async () => {
 		const before = await db
 			.select()

package/src/repos/message.ts

@@ -88,6 +88,9 @@ function toMessageItem(row: typeof messageTable.$inferSelect): MessageItem {
 						row.placementVerdict as MessageItem["placementVerdict"],
 				}
 			: {}),
+		...(row.filterMove !== null
+			? { filterMove: row.filterMove as MessageItem["filterMove"] }
+			: {}),
 	};
 }
 
@@ -188,6 +191,7 @@ export class DrizzleMessageRepository implements IMessageRepository {
 			authResult: input.authResult ?? null,
 			providerSpam: input.providerSpam ?? null,
 			placementVerdict: input.placementVerdict ?? null,
+			filterMove: input.filterMove ?? null,
 			createdAt: now,
 			updatedAt: now,
 		};
@@ -374,6 +378,9 @@ export class DrizzleMessageRepository implements IMessageRepository {
 			...(input.placementVerdict !== undefined
 				? { placementVerdict: input.placementVerdict }
 				: {}),
+			...(input.filterMove !== undefined
+				? { filterMove: input.filterMove }
+				: {}),
 			...(input.messageIdHeader !== undefined
 				? { messageIdHeader: input.messageIdHeader }
 				: {}),

package/src/repos/thread-message.ts

@@ -122,6 +122,7 @@ function toItem(row: Row): ThreadMessageItem {
 		...(row.fromName !== null ? { fromName: row.fromName } : {}),
 		...(row.subject !== null ? { subject: row.subject } : {}),
 		...(row.snippet !== null ? { snippet: row.snippet } : {}),
+		...(row.listId !== null ? { listId: row.listId } : {}),
 	};
 }
 
@@ -237,6 +238,7 @@ export class DrizzleThreadMessageRepository
 			fromName: input.fromName ?? null,
 			subject: input.subject ?? null,
 			snippet: input.snippet ?? null,
+			listId: input.listId ?? null,
 			createdAt: now,
 			updatedAt: now,
 		};
@@ -321,6 +323,7 @@ export class DrizzleThreadMessageRepository
 		if (input.star !== undefined) set.star = input.star;
 		if (input.category !== undefined) set.category = input.category;
 		if (input.subject !== undefined) set.subject = input.subject;
+		if (input.listId !== undefined) set.listId = input.listId;
 		if (input.fromEmail !== undefined) set.fromEmail = input.fromEmail;
 		if (input.fromName !== undefined) set.fromName = input.fromName;
 		if (input.snippet !== undefined) set.snippet = input.snippet;