@remit/backend 0.0.74 → 0.0.75

package/package.json

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

package/src/handlers/mailbox.test.ts

@@ -1,8 +1,17 @@
 import assert from "node:assert/strict";
-import { describe, it } from "node:test";
+import { afterEach, describe, it } from "node:test";
 import type { MailboxItem } from "@remit/data-ports";
 import { MailboxSyncStatus } from "@remit/domain-enums";
-import { excludeDeletingMailboxes } from "./mailbox.js";
+import { UnconfirmedTrashMailboxError } from "@remit/mailbox-service";
+import type { APIGatewayProxyEvent } from "aws-lambda";
+import type { Context } from "openapi-backend";
+import { deriveAccountConfigId } from "../auth.js";
+import {
+	_resetForTest,
+	type RemitClient,
+	setClient,
+} from "../service/data-client.js";
+import { excludeDeletingMailboxes, TrashOperations } from "./mailbox.js";
 
 const mailbox = (
 	over: Partial<MailboxItem> & { mailboxId: string },
@@ -32,3 +41,58 @@ describe("excludeDeletingMailboxes", () => {
 		);
 	});
 });
+
+const SUB = "cognito-sub-887";
+const ACCOUNT_ID = "acc-887";
+
+const emptyTrash = TrashOperations.TrashOperations_emptyTrash as unknown as (
+	context: Context,
+	event: APIGatewayProxyEvent,
+) => Promise<{ deletedCount: number }>;
+
+const callEmptyTrash = (
+	serviceEmptyTrash: () => Promise<{ deletedCount: number }>,
+): Promise<{ deletedCount: number }> => {
+	setClient({
+		account: {
+			get: async () => ({
+				accountId: ACCOUNT_ID,
+				accountConfigId: deriveAccountConfigId(SUB),
+			}),
+		},
+		messageMove: { emptyTrash: serviceEmptyTrash },
+	} as unknown as RemitClient);
+
+	return emptyTrash(
+		{ request: { params: { accountId: ACCOUNT_ID } } } as unknown as Context,
+		{
+			requestContext: { authorizer: { claims: { sub: SUB } } },
+		} as unknown as APIGatewayProxyEvent,
+	);
+};
+
+describe("TrashOperations_emptyTrash", () => {
+	afterEach(() => {
+		_resetForTest();
+	});
+
+	it("reports the service's count rather than one of its own", async () => {
+		// The handler resolves no folder and counts no rows: a second read would
+		// be free to disagree with the one that actually marked them.
+		const response = await callEmptyTrash(async () => ({ deletedCount: 7 }));
+
+		assert.deepEqual(response, { deletedCount: 7 });
+	});
+
+	it("lets the service's coded refusal through untouched", async () => {
+		await assert.rejects(
+			callEmptyTrash(async () => {
+				throw new UnconfirmedTrashMailboxError(ACCOUNT_ID);
+			}),
+			(error: unknown) =>
+				error instanceof UnconfirmedTrashMailboxError &&
+				error.statusCode === 409 &&
+				error.publicApiError?.details?.reason === "unconfirmed",
+		);
+	});
+});

package/src/handlers/mailbox.ts

@@ -5,7 +5,6 @@ import type {
 import type { IAccountSettingRepository, MailboxItem } from "@remit/data-ports";
 import { ForbiddenError, NotFoundError } from "@remit/data-ports/errors";
 import { MailboxSyncStatus, MessageSystemFlag } from "@remit/domain-enums";
-import { NoTrashMailboxError } from "@remit/mailbox-service";
 import type { APIGatewayProxyEvent } from "aws-lambda";
 import { getAccountConfigIdFromEvent } from "../auth.js";
 import {
@@ -412,26 +411,10 @@ export const TrashOperations: Record<
 		const account = await client.account.get(accountId);
 		assertAccountOwnership(account, accountConfigId, "act");
 
-		// The same confirmed resolution `emptyTrash` expunges through, so the
-		// count reported is the count of the folder that gets emptied. It
-		// refuses rather than returning zero when no folder is appointed and
-		// none is flagged: "0 deleted" reads as success, and the user goes on
-		// believing their Trash is empty.
-		const trashMailbox =
-			await client.mailboxSpecialUse.findConfirmedTrashMailbox(accountId);
-
-		if (!trashMailbox) {
-			throw new NoTrashMailboxError(accountId);
-		}
-
-		const messages = await client.message.listAllByMailbox(
-			trashMailbox.mailboxId,
-		);
-		const deletedCount = messages.length;
-
-		// MessageMoveService handles: Message status updates + SQS event
-		await client.messageMove.emptyTrash(accountConfigId, accountId);
-
-		return { deletedCount };
+		// The service resolves Trash, marks the rows and counts them, all off one
+		// read, and refuses with a coded 409 when the role is unresolved. Counting
+		// here as well would be a second answer free to disagree with the one that
+		// acts, and "0 deleted" reads as success to a user whose Trash is untouched.
+		return client.messageMove.emptyTrash(accountConfigId, accountId);
 	},
 };