@remit/backend 0.0.135 → 0.0.137

package/package.json

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

package/src/handlers/calendar-suggestion.test.ts

@@ -29,6 +29,7 @@ import {
 	assertSettleable,
 	CalendarSuggestionActionOperations,
 	CalendarSuggestionOperations,
+	MessageCalendarSuggestionOperations,
 	type MuteSenderDeps,
 	muteSender,
 	settleSuggestion,
@@ -58,6 +59,7 @@ const suggestion = (
 	zoneCertainty: "Explicit",
 	icalData: "BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n",
 	acceptedCalendarObjectId: "",
+	supersededByMessageId: "",
 	createdAt: 1,
 	updatedAt: 1,
 	...overrides,
@@ -308,12 +310,38 @@ const acceptSuggestion =
 	CalendarSuggestionActionOperations.CalendarSuggestionActionOperations_acceptCalendarSuggestion as Handler;
 const dismissSuggestion =
 	CalendarSuggestionActionOperations.CalendarSuggestionActionOperations_dismissCalendarSuggestion as Handler;
+const listMessageSuggestions =
+	MessageCalendarSuggestionOperations.MessageCalendarSuggestionOperations_listMessageCalendarSuggestions as Handler;
 
 interface Card {
 	suggestionId: string;
 	state: string;
+	supersededByMessageId: string;
+	supersededByThreadId: string;
 }
 
+const fileInThread = async (
+	accountConfigId: string,
+	messageId: string,
+	threadId: string,
+): Promise<void> => {
+	await client.threadMessage.create({
+		accountConfigId,
+		threadId,
+		messageId,
+		mailboxId: "mbx-inbox",
+		uid: 1,
+		referenceOrder: 0,
+		internalDate: 1,
+		sentDate: 1,
+		subject: "Invitation: Quarterly review",
+		isRead: false,
+		isDeleted: false,
+		hasAttachment: false,
+		hasStars: false,
+	});
+};
+
 let client: RemitClient;
 let cleanup: () => void;
 let mintedSubs = 0;
@@ -473,6 +501,74 @@ describe("GET /calendar-suggestions", () => {
 	});
 });
 
+describe("GET /messages/{messageId}/calendar-suggestions", () => {
+	test("names the conversation of the revision that retired a card", async () => {
+		const { accountConfigId, event } = anAccount();
+		const older = await putSuggestion(accountConfigId, "msg-revision-0");
+		await client.calendarSuggestion.supersedeIfPending(
+			accountConfigId,
+			older.suggestionId,
+			"msg-revision-1",
+		);
+		await fileInThread(accountConfigId, "msg-revision-1", "thread-revision-1");
+
+		const listed = (await listMessageSuggestions(
+			contextOf({ params: { messageId: "msg-revision-0" } }),
+			event,
+		)) as unknown as { items: Card[] };
+
+		assert.deepEqual(
+			listed.items.map((card) => [
+				card.state,
+				card.supersededByMessageId,
+				card.supersededByThreadId,
+			]),
+			[
+				[
+					CalendarSuggestionState.Superseded,
+					"msg-revision-1",
+					"thread-revision-1",
+				],
+			],
+		);
+	});
+
+	test("names no conversation when the newer message sits in none", async () => {
+		const { accountConfigId, event } = anAccount();
+		const older = await putSuggestion(accountConfigId, "msg-orphan-0");
+		await client.calendarSuggestion.supersedeIfPending(
+			accountConfigId,
+			older.suggestionId,
+			"msg-orphan-1",
+		);
+
+		const listed = (await listMessageSuggestions(
+			contextOf({ params: { messageId: "msg-orphan-0" } }),
+			event,
+		)) as unknown as { items: Card[] };
+
+		assert.equal(listed.items[0]?.supersededByThreadId, "");
+	});
+
+	test("names no conversation for a card nothing retired", async () => {
+		const { accountConfigId, event } = anAccount();
+		await putSuggestion(accountConfigId, "msg-current");
+
+		const listed = (await listMessageSuggestions(
+			contextOf({ params: { messageId: "msg-current" } }),
+			event,
+		)) as unknown as { items: Card[] };
+
+		assert.deepEqual(
+			listed.items.map((card) => [
+				card.supersededByMessageId,
+				card.supersededByThreadId,
+			]),
+			[["", ""]],
+		);
+	});
+});
+
 describe("POST /calendar-suggestions/{suggestionId}/accept", () => {
 	test("answers not-found for a calendar on another account, before writing anything", async () => {
 		const stranger = anAccount();
@@ -597,3 +693,74 @@ describe("POST /calendar-suggestions/{suggestionId}/dismiss", () => {
 		);
 	});
 });
+
+describe("POST /calendar-suggestions/{suggestionId}/accept with corrections", () => {
+	test("answers not-found for a calendar on another account, before writing anything", async () => {
+		const stranger = anAccount();
+		const strangersCalendar = await client.calendarCollection.create({
+			accountConfigId: stranger.accountConfigId,
+			urlSegment: "default",
+			displayName: "Calendar",
+		});
+		const { accountConfigId, event } = anAccount();
+		const card = await putSuggestion(accountConfigId, "msg-edited-cross");
+
+		await assert.rejects(
+			() =>
+				acceptSuggestion(
+					contextOf({
+						params: { suggestionId: card.suggestionId },
+						requestBody: {
+							calendarId: strangersCalendar.calendarId,
+							event: { summary: "Quarterly review, moved" },
+						},
+					}),
+					event,
+				),
+			(error: unknown) => (error as { statusCode?: number }).statusCode === 404,
+		);
+
+		assert.deepEqual(
+			await client.calendarObject.listByCalendar(strangersCalendar.calendarId),
+			[],
+		);
+		const untouched = await client.calendarSuggestion.get(
+			accountConfigId,
+			card.suggestionId,
+		);
+		assert.equal(untouched.state, CalendarSuggestionState.Pending);
+	});
+
+	test("refuses a card the reader already declined", async () => {
+		const { accountConfigId, event } = anAccount();
+		const calendar = await client.calendarCollection.create({
+			accountConfigId,
+			urlSegment: "default",
+			displayName: "Calendar",
+		});
+		const card = await putSuggestion(accountConfigId, "msg-edited-declined");
+		await client.calendarSuggestion.settle(accountConfigId, card.suggestionId, {
+			state: CalendarSuggestionState.Declined,
+			acceptedCalendarObjectId: "",
+		});
+
+		await assert.rejects(
+			() =>
+				acceptSuggestion(
+					contextOf({
+						params: { suggestionId: card.suggestionId },
+						requestBody: {
+							calendarId: calendar.calendarId,
+							event: { summary: "Quarterly review, moved" },
+						},
+					}),
+					event,
+				),
+			(error: unknown) => (error as { statusCode?: number }).statusCode === 400,
+		);
+		assert.deepEqual(
+			await client.calendarObject.listByCalendar(calendar.calendarId),
+			[],
+		);
+	});
+});

package/src/handlers/calendar-suggestion.ts

@@ -1,13 +1,18 @@
 import type {
 	CalendarInviteAnswer as CalendarInviteAnswerValue,
 	CalendarSuggestionResponse,
+	UpdateCalendarEventInput,
 } from "@remit/api-openapi-types";
-import { acceptCalendarSuggestion } from "@remit/calendar-service";
+import {
+	acceptCalendarSuggestion,
+	correctCalendarSuggestion,
+} from "@remit/calendar-service";
 import {
 	type CalendarSuggestionItem,
 	type ICalendarSuggestionRepository,
 	type IEnvelopeRepository,
 	type IFilterRepository,
+	type IThreadMessageRepository,
 	isSenderMuted,
 } from "@remit/data-ports";
 import { BadRequestError } from "@remit/data-ports/errors";
@@ -30,6 +35,7 @@ import type {
 	MessageCalendarSuggestionOperationIds,
 	OperationHandler,
 } from "../types.js";
+import { pickEventUpdate } from "./calendar-event.js";
 
 /**
  * The raw invitation bytes stay on the server. A client renders the projected
@@ -40,9 +46,26 @@ export const toCalendarSuggestionResponse = (
 	item: CalendarSuggestionItem,
 ): CalendarSuggestionResponse => {
 	const { icalData: _icalData, ...response } = item;
-	return response;
+	return { ...response, supersededByThreadId: "" };
 };
 
+export const toCalendarSuggestionResponses = (
+	threads: Pick<IThreadMessageRepository, "findByMessageId">,
+	accountConfigId: string,
+	items: CalendarSuggestionItem[],
+): Promise<CalendarSuggestionResponse[]> =>
+	Promise.all(
+		items.map(async (item) => {
+			const response = toCalendarSuggestionResponse(item);
+			if (item.supersededByMessageId === "") return response;
+			const newer = await threads.findByMessageId(
+				accountConfigId,
+				item.supersededByMessageId,
+			);
+			return { ...response, supersededByThreadId: newer?.threadId ?? "" };
+		}),
+	);
+
 /**
  * The states a person can move a pending card into. `Superseded` is the
  * producer's alone — a revision retires a card, a person never does — and the
@@ -172,7 +195,11 @@ export const CalendarSuggestionOperations: Record<
 		);
 
 		return {
-			items: page.items.map(toCalendarSuggestionResponse),
+			items: await toCalendarSuggestionResponses(
+				client.threadMessage,
+				accountConfigId,
+				page.items,
+			),
 			continuationToken: page.continuationToken,
 		};
 	},
@@ -197,7 +224,11 @@ export const MessageCalendarSuggestionOperations: Record<
 		);
 
 		return {
-			items: items.map(toCalendarSuggestionResponse),
+			items: await toCalendarSuggestionResponses(
+				client.threadMessage,
+				accountConfigId,
+				items,
+			),
 			continuationToken: undefined,
 		};
 	},
@@ -255,10 +286,25 @@ export const CalendarSuggestionActionOperations: Record<
 			);
 		}
 
+		const { event: corrections } = context.request.requestBody as {
+			event?: UpdateCalendarEventInput;
+		};
+		const corrected =
+			corrections === undefined
+				? { ok: true as const, value: suggestion }
+				: await correctCalendarSuggestion(
+						suggestion,
+						pickEventUpdate(corrections),
+						collection.timezone,
+					);
+		if (!corrected.ok) {
+			throw new BadRequestError(corrected.error.message);
+		}
+
 		const accepted = await acceptCalendarSuggestion(client.calendarUnitOfWork, {
 			accountConfigId,
 			calendarId,
-			suggestion,
+			suggestion: corrected.value,
 			attendee: await accountEmailForMessage(client, suggestion.messageId),
 			answer,
 		});