@remit/backend 0.0.135 → 0.0.136

package/package.json

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

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

@@ -597,3 +597,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,8 +1,12 @@
 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,
@@ -30,6 +34,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
@@ -255,10 +260,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,
 		});