@remit/backend 0.0.102 → 0.0.103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/backend",
-  "version": "0.0.102",
+  "version": "0.0.103",
   "description": "Remit Mail Inspector API backend",
   "license": "MIT",
   "author": "",

package/src/derive/enrichThreadRows.test.ts

@@ -8,6 +8,8 @@ import type {
 	ThreadMessageItem,
 } from "@remit/data-ports";
 import { deriveAddressId } from "@remit/data-ports/id";
+import { hasAbandonedDelete } from "@remit/data-ports/message-settlement";
+import { MessageStatus, MessageSyncStatus } from "@remit/domain-enums";
 import { type EnrichClient, enrichThreadRows } from "./enrichThreadRows.js";
 
 const threadRow = (
@@ -250,3 +252,80 @@ describe("enrichThreadRows — muted", () => {
 		assert.equal(result?.muted, false);
 	});
 });
+
+describe("enrichThreadRows — the mutation pair", () => {
+	const withMessage = (message: Partial<MessageItem>): EnrichClient => ({
+		message: {
+			get: async () =>
+				[{ messageId: "msg-1", ...message }] as unknown as MessageItem[],
+		},
+		address: { getAddress: async () => [] },
+		messageLabel: { listByMessageIds: async () => [] },
+		label: { listByAccountConfig: async () => [] },
+	});
+
+	const project = async (message: Partial<MessageItem>) => {
+		const [result] = await enrichThreadRows(
+			[threadRow("tm-1", "msg-1")],
+			withMessage(message),
+			"acc-1",
+		);
+		return result;
+	};
+
+	test("projects the pair an abandoned delete leaves behind", async () => {
+		const result = await project({
+			status: MessageStatus.active,
+			syncStatus: MessageSyncStatus.failed,
+		});
+		assert.equal(result?.status, MessageStatus.active);
+		assert.equal(result?.syncStatus, MessageSyncStatus.failed);
+		assert.equal(
+			hasAbandonedDelete({
+				status: result?.status,
+				syncStatus: result?.syncStatus,
+			}),
+			true,
+		);
+	});
+
+	test("projects a move mid-retry without calling it a give-up", async () => {
+		const result = await project({
+			status: MessageStatus.moving,
+			syncStatus: MessageSyncStatus.failed,
+		});
+		assert.equal(result?.status, MessageStatus.moving);
+		assert.equal(result?.syncStatus, MessageSyncStatus.failed);
+		assert.equal(
+			hasAbandonedDelete({
+				status: result?.status,
+				syncStatus: result?.syncStatus,
+			}),
+			false,
+		);
+	});
+
+	test("projects an ordinary inbound row", async () => {
+		const result = await project({
+			status: MessageStatus.active,
+			syncStatus: MessageSyncStatus.pending,
+		});
+		assert.equal(result?.status, MessageStatus.active);
+		assert.equal(result?.syncStatus, MessageSyncStatus.pending);
+	});
+
+	test("a row whose Message row is missing claims no mutation", async () => {
+		const [result] = await enrichThreadRows(
+			[threadRow("tm-1", "msg-1")],
+			buildClient([], []),
+			"acc-1",
+		);
+		assert.equal(
+			hasAbandonedDelete({
+				status: result?.status,
+				syncStatus: result?.syncStatus,
+			}),
+			false,
+		);
+	});
+});

package/src/derive/enrichThreadRows.ts

@@ -7,7 +7,12 @@ import type {
 	ThreadMessageItem,
 } from "@remit/data-ports";
 import { deriveAddressId } from "@remit/data-ports/id";
-import { SenderTrust, StarColor } from "@remit/domain-enums";
+import {
+	MessageStatus,
+	MessageSyncStatus,
+	SenderTrust,
+	StarColor,
+} from "@remit/domain-enums";
 import { deriveAutoMoved } from "./autoMoved.js";
 import { deriveMuted } from "./deriveMuted.js";
 import { deriveSenderTrust } from "./senderTrust.js";
@@ -56,6 +61,8 @@ const toResponse = (item: ThreadMessageItem): ThreadMessageResponse => ({
 	updatedAt: item.updatedAt,
 	senderTrust: SenderTrust.Unknown,
 	muted: false,
+	status: MessageStatus.active,
+	syncStatus: MessageSyncStatus.pending,
 });
 
 /**
@@ -102,8 +109,13 @@ export const planBatchFetch = (rows: ThreadMessageItem[]): BatchPlan => {
 /**
  * Enrich a page of ThreadMessage rows with `senderTrust` and `muted` (both
  * derived from the From Address's flags map), `authenticity`, `autoMoved` and
- * `spamReport` (all projected straight from the Message row — no ThreadMessage
- * column of their own, see `deriveAutoMoved`).
+ * `spamReport`, and the `status`/`syncStatus` pair an IMAP mutation leaves
+ * behind (all projected straight from the Message row — no ThreadMessage
+ * column of their own, see `deriveAutoMoved`). `toResponse` seeds that pair
+ * with the ordinary inbound values, which the projection then overwrites; a
+ * ThreadMessage row whose Message row is missing from the batch is broken in a
+ * way this read path cannot report, and claiming a mutation it has no evidence
+ * of would be worse.
  *
  * `category` is not enriched: it is denormalized onto the ThreadMessage row
  * (shared with `Message.category`'s write-once value, see body-sync.ts) and
@@ -174,6 +186,12 @@ export const enrichThreadRows = async (
 	const spamReportByMessageId = new Map(
 		messages.map((m) => [m.messageId, m.spamReport]),
 	);
+	const settlementByMessageId = new Map(
+		messages.map((m) => [
+			m.messageId,
+			{ status: m.status, syncStatus: m.syncStatus },
+		]),
+	);
 	const trustByAddressId = new Map(
 		addresses.map((a) => [a.addressId, deriveSenderTrust(a.flags)]),
 	);
@@ -194,8 +212,10 @@ export const enrichThreadRows = async (
 			? (mutedByAddressId.get(addressId) ?? false)
 			: false;
 		const labels = labelsByMessageId.get(row.messageId);
+		const settlement = settlementByMessageId.get(row.messageId);
 		return {
 			...base,
+			...(settlement ?? {}),
 			...(authenticity !== undefined ? { authenticity } : {}),
 			...(autoMoved !== undefined ? { autoMoved } : {}),
 			...(labels !== undefined ? { labels } : {}),

package/src/derive/filterThreadCriteria.test.ts

@@ -1,7 +1,13 @@
 import assert from "node:assert/strict";
 import { describe, it } from "node:test";
 import type { ThreadMessageResponse } from "@remit/api-openapi-types";
-import { MessageCategory, SenderTrust, StarColor } from "@remit/domain-enums";
+import {
+	MessageCategory,
+	MessageStatus,
+	MessageSyncStatus,
+	SenderTrust,
+	StarColor,
+} from "@remit/domain-enums";
 import {
 	filterByOffRowCriteria,
 	hasOffRowCriteria,
@@ -30,6 +36,8 @@ const row = (
 	updatedAt: 0,
 	senderTrust: SenderTrust.Unknown,
 	muted: false,
+	status: MessageStatus.active,
+	syncStatus: MessageSyncStatus.pending,
 	...overrides,
 });
 

package/src/handlers/message.ts

@@ -454,6 +454,8 @@ export const MessageOperations: Record<
 			internalDate: message.internalDate,
 			messageIdHeader: message.messageIdHeader,
 			authenticity: message.authenticity,
+			status: message.status,
+			syncStatus: message.syncStatus,
 			...(autoMoved ? { autoMoved } : {}),
 			...(labels.length > 0 ? { labels } : {}),
 			...(message.spamReport ? { spamReport: message.spamReport } : {}),