@remit/calendar-service 0.0.12 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/calendar-service",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "iCalendar (RFC 5545) parsing, projection and recurrence expansion over the calendar store",
   "type": "module",
   "main": "src/index.ts",
@@ -20,6 +20,7 @@
     "test:run": "node $NODE_TEST_FLAGS --import tsx --experimental-test-coverage --test-coverage-include='src/**' --test-coverage-exclude='src/**/*.test.ts' --test-coverage-exclude='src/memory-store.ts' --test-coverage-lines=90 --test 'src/**/*.test.ts'"
   },
   "dependencies": {
+    "@remit/api-openapi-types": "*",
     "@remit/data-ports": "*",
     "@remit/domain-enums": "*",
     "ical.js": "^2.2.1"

package/src/accept.test.ts

@@ -2,6 +2,7 @@ import assert from "node:assert/strict";
 import { describe, it } from "node:test";
 import type { CalendarSuggestionItem } from "@remit/data-ports";
 import {
+	CalendarInviteAnswer,
 	CalendarSuggestionSource,
 	CalendarSuggestionState,
 } from "@remit/domain-enums";
@@ -99,6 +100,7 @@ describe("buildAcceptedCalendar", () => {
 		const built = await buildAcceptedCalendar(
 			suggestionOf(invitation({ sequence: 3 })),
 			ATTENDEE,
+			CalendarInviteAnswer.Accepted,
 		);
 
 		assert.ok(built.ok);
@@ -110,6 +112,7 @@ describe("buildAcceptedCalendar", () => {
 		const built = await buildAcceptedCalendar(
 			suggestionOf(invitation({})),
 			ATTENDEE,
+			CalendarInviteAnswer.Accepted,
 		);
 
 		assert.ok(built.ok);
@@ -122,6 +125,7 @@ describe("buildAcceptedCalendar", () => {
 		const built = await buildAcceptedCalendar(
 			suggestionOf(invitation({ attendees: [] })),
 			ATTENDEE,
+			CalendarInviteAnswer.Accepted,
 		);
 
 		assert.ok(built.ok);
@@ -137,6 +141,7 @@ describe("buildAcceptedCalendar", () => {
 		const built = await buildAcceptedCalendar(
 			suggestionOf(invitation({})),
 			ATTENDEE,
+			CalendarInviteAnswer.Accepted,
 		);
 
 		assert.ok(built.ok);
@@ -147,6 +152,7 @@ describe("buildAcceptedCalendar", () => {
 		const built = await buildAcceptedCalendar(
 			suggestionOf(invitation({})),
 			ATTENDEE,
+			CalendarInviteAnswer.Accepted,
 		);
 
 		assert.ok(built.ok);
@@ -157,6 +163,7 @@ describe("buildAcceptedCalendar", () => {
 		const built = await buildAcceptedCalendar(
 			suggestionOf(invitation({ method: "CANCEL" }), { method: "Cancel" }),
 			ATTENDEE,
+			CalendarInviteAnswer.Accepted,
 		);
 
 		assert.ok(built.ok);
@@ -167,6 +174,7 @@ describe("buildAcceptedCalendar", () => {
 		const built = await buildAcceptedCalendar(
 			suggestionOf("", { source: CalendarSuggestionSource.TextHeuristic }),
 			ATTENDEE,
+			CalendarInviteAnswer.Accepted,
 		);
 
 		assert.equal(built.ok, false);
@@ -183,6 +191,7 @@ describe("acceptCalendarSuggestion", () => {
 			calendarId,
 			suggestion,
 			attendee: ATTENDEE,
+			answer: CalendarInviteAnswer.Accepted,
 		});
 
 		assert.ok(accepted.ok);
@@ -198,6 +207,32 @@ describe("acceptCalendarSuggestion", () => {
 		assert.equal(store.objects.size, 1);
 	});
 
+	it("a maybe writes the resource as tentative and settles the card Tentative", async () => {
+		const { store, calendarId } = await provisioned();
+		const suggestion = await recorded(store, invitation({}), "message-1");
+
+		const answered = await acceptCalendarSuggestion(store, {
+			accountConfigId: ACCOUNT_CONFIG_ID,
+			calendarId,
+			suggestion,
+			attendee: ATTENDEE,
+			answer: CalendarInviteAnswer.Tentative,
+		});
+
+		assert.ok(answered.ok);
+		assert.equal(
+			answered.value.suggestion.state,
+			CalendarSuggestionState.Tentative,
+		);
+		assert.equal(
+			answered.value.suggestion.acceptedCalendarObjectId,
+			answered.value.object?.calendarObjectId,
+		);
+		assert.match(answered.value.object?.icalData ?? "", /PARTSTAT=TENTATIVE/);
+		assert.doesNotMatch(answered.value.object?.icalData ?? "", /ACCEPTED/);
+		assert.equal(store.objects.size, 1);
+	});
+
 	it("expands the accepted event into the occurrence index", async () => {
 		const { store, calendarId } = await provisioned();
 		const suggestion = await recorded(store, invitation({}), "message-1");
@@ -207,6 +242,7 @@ describe("acceptCalendarSuggestion", () => {
 			calendarId,
 			suggestion,
 			attendee: ATTENDEE,
+			answer: CalendarInviteAnswer.Accepted,
 		});
 
 		assert.ok(accepted.ok);
@@ -226,12 +262,14 @@ describe("acceptCalendarSuggestion", () => {
 			calendarId,
 			suggestion,
 			attendee: ATTENDEE,
+			answer: CalendarInviteAnswer.Accepted,
 		});
 		const second = await acceptCalendarSuggestion(store, {
 			accountConfigId: ACCOUNT_CONFIG_ID,
 			calendarId,
 			suggestion,
 			attendee: ATTENDEE,
+			answer: CalendarInviteAnswer.Accepted,
 		});
 
 		assert.ok(first.ok);
@@ -255,6 +293,7 @@ describe("acceptCalendarSuggestion", () => {
 			calendarId,
 			suggestion: first,
 			attendee: ATTENDEE,
+			answer: CalendarInviteAnswer.Accepted,
 		});
 
 		const revision = await recorded(
@@ -267,6 +306,7 @@ describe("acceptCalendarSuggestion", () => {
 			calendarId,
 			suggestion: revision,
 			attendee: ATTENDEE,
+			answer: CalendarInviteAnswer.Accepted,
 		});
 
 		assert.ok(accepted.ok);
@@ -292,6 +332,7 @@ describe("acceptCalendarSuggestion", () => {
 			calendarId,
 			suggestion: cancel,
 			attendee: ATTENDEE,
+			answer: CalendarInviteAnswer.Accepted,
 		});
 
 		assert.ok(accepted.ok);
@@ -319,6 +360,7 @@ describe("acceptCalendarSuggestion", () => {
 			calendarId,
 			suggestion: request,
 			attendee: ATTENDEE,
+			answer: CalendarInviteAnswer.Accepted,
 		});
 
 		const cancel = await recorded(
@@ -334,6 +376,7 @@ describe("acceptCalendarSuggestion", () => {
 			calendarId,
 			suggestion: cancel,
 			attendee: ATTENDEE,
+			answer: CalendarInviteAnswer.Accepted,
 		});
 
 		assert.ok(accepted.ok);
@@ -349,6 +392,7 @@ describe("acceptCalendarSuggestion", () => {
 			calendarId,
 			suggestion: suggestionOf("BEGIN:VCALENDAR"),
 			attendee: ATTENDEE,
+			answer: CalendarInviteAnswer.Accepted,
 		});
 
 		assert.equal(accepted.ok, false);

package/src/accept.ts

@@ -1,9 +1,11 @@
+import type { CalendarInviteAnswer as CalendarInviteAnswerValue } from "@remit/api-openapi-types";
 import type {
 	CalendarObjectItem,
 	CalendarSuggestionItem,
 	ICalendarUnitOfWork,
 } from "@remit/data-ports";
 import {
+	CalendarInviteAnswer,
 	CalendarInviteMethod,
 	CalendarSuggestionState,
 } from "@remit/domain-enums";
@@ -16,15 +18,32 @@ import { mailAddressOf } from "./suggest.js";
 const eventsOf = (component: ICAL.Component): ICAL.Component[] =>
 	component.getAllSubcomponents("vevent");
 
+const partstatOf: Record<CalendarInviteAnswerValue, string> = {
+	[CalendarInviteAnswer.Accepted]: "ACCEPTED",
+	[CalendarInviteAnswer.Tentative]: "TENTATIVE",
+};
+
+const stateOf: Record<
+	CalendarInviteAnswerValue,
+	CalendarSuggestionItem["state"]
+> = {
+	[CalendarInviteAnswer.Accepted]: CalendarSuggestionState.Accepted,
+	[CalendarInviteAnswer.Tentative]: CalendarSuggestionState.Tentative,
+};
+
 /**
- * Marks one address as having accepted, on every VEVENT of the resource — the
+ * Marks one address with its answer, on every VEVENT of the resource — the
  * master and each override alike, since an attendee's answer is to the series.
  *
  * An ATTENDEE line already naming the user has its PARTSTAT rewritten rather
  * than a second one appended: two ATTENDEE lines for one person is a resource
  * every other client reads as two people.
  */
-const markAccepted = (component: ICAL.Component, attendee: string): void => {
+const markAnswered = (
+	component: ICAL.Component,
+	attendee: string,
+	answer: CalendarInviteAnswerValue,
+): void => {
 	const wanted = attendee.toLowerCase();
 	for (const event of eventsOf(component)) {
 		const existing = event
@@ -36,7 +55,7 @@ const markAccepted = (component: ICAL.Component, attendee: string): void => {
 			);
 		const property =
 			existing ?? new ICAL.Property("attendee", event as ICAL.Component);
-		property.setParameter("partstat", "ACCEPTED");
+		property.setParameter("partstat", partstatOf[answer]);
 		if (!existing) {
 			property.setValue(`mailto:${attendee}`);
 			event.addProperty(property);
@@ -69,13 +88,14 @@ const markCancelled = (component: ICAL.Component): void => {
 export const buildAcceptedCalendar = async (
 	suggestion: Pick<CalendarSuggestionItem, "icalData" | "method">,
 	attendee: string,
+	answer: CalendarInviteAnswerValue,
 ): Promise<CalendarResult<string>> => {
 	const parsed = await parseCalendar(suggestion.icalData);
 	if (!parsed.ok) return parsed;
 
 	const { component } = parsed.value;
 	component.removeAllProperties("method");
-	markAccepted(component, attendee);
+	markAnswered(component, attendee, answer);
 	if (suggestion.method === CalendarInviteMethod.Cancel) {
 		markCancelled(component);
 	}
@@ -89,6 +109,7 @@ export interface AcceptCalendarSuggestionInput {
 	suggestion: CalendarSuggestionItem;
 	/** Mail address of the person accepting — the account the message arrived on. */
 	attendee: string;
+	answer: CalendarInviteAnswerValue;
 }
 
 /**
@@ -142,6 +163,7 @@ export const acceptCalendarSuggestion = async (
 	const icalData = await buildAcceptedCalendar(
 		input.suggestion,
 		input.attendee,
+		input.answer,
 	);
 	if (!icalData.ok) return icalData;
 
@@ -190,7 +212,7 @@ export const acceptCalendarSuggestion = async (
 			input.accountConfigId,
 			input.suggestion.suggestionId,
 			{
-				state: CalendarSuggestionState.Accepted,
+				state: stateOf[input.answer],
 				acceptedCalendarObjectId: written.value.calendarObjectId,
 			},
 		);