Add new emails

integrations/evaluations/app/actions/evaluate/actions.ts

@@ -3,7 +3,11 @@
 import { PubValues } from "@pubpub/sdk";
 import { revalidatePath } from "next/cache";
 import { expect } from "utils";
-import { sendSubmittedNotificationEmail, unscheduleNoSubmitNotificationEmail } from "~/lib/emails";
+import {
+	sendSubmittedNotificationEmail,
+	unscheduleAllDeadlineReminderEmails,
+	unscheduleNoSubmitNotificationEmail,
+} from "~/lib/emails";
 import { getInstanceConfig, getInstanceState, setInstanceState } from "~/lib/instance";
 import { client } from "~/lib/pubpub";
 import { cookie } from "~/lib/request";
@@ -37,8 +41,10 @@ export const submit = async (instanceId: string, pubId: string, values: PubValue
 			evaluationPubId: pub.id,
 		};
 		await setInstanceState(instanceId, pubId, instanceState);
-		// Unschedule no-submit notification email.
+		// Unschedule no-submit notification email for manager.
 		await unscheduleNoSubmitNotificationEmail(instanceId, pubId, evaluator);
+		// unschedule dealine reminder emails.
+		await unscheduleAllDeadlineReminderEmails(instanceId, pubId, evaluator);
 		// Immediately send submitted notification email.
 		await sendSubmittedNotificationEmail(instanceId, instanceConfig, pubId, evaluator);
 		revalidatePath("/");

integrations/evaluations/app/actions/evaluate/evaluate.tsx

@@ -101,15 +101,7 @@ export function Evaluate(props: Props) {
 	const submissionUrl = pub.values["unjournal:url"] as string;
 	const submissionTitle = pub.values[props.instanceConfig.titleFieldSlug] as string;
 	const submissionAbstract = pub.values["unjournal:description"] as string;
-	const deadline = props.evaluator.deadline
-		? new Date(props.evaluator.deadline)
-		: calculateDeadline(
-				{
-					deadlineLength: props.instanceConfig.deadlineLength,
-					deadlineUnit: props.instanceConfig.deadlineUnit,
-				},
-				new Date(props.evaluator.acceptedAt)
-		  );
+	const deadline = getDeadline(props.instanceConfig, props.evaluator);
 
 	return (
 		<>

integrations/evaluations/app/actions/manage/actions.ts

@@ -6,12 +6,20 @@ import { expect } from "utils";
 import { getInstanceConfig, getInstanceState, setInstanceState } from "~/lib/instance";
 import { client } from "~/lib/pubpub";
 import { cookie } from "~/lib/request";
-import { isInvited } from "~/lib/types";
 import {
+	EvaluatorWhoAccepted,
+	EvaluatorWithInvite,
+	assertHasAccepted,
+	assertIsInvited,
+	isInvited,
+} from "~/lib/types";
+import {
+	scheduleInvitationReminderEmail,
 	scheduleNoReplyNotificationEmail,
-	scheduleReminderEmail,
 	sendInviteEmail,
-} from "../../../lib/emails";
+	unscheduleAllDeadlineReminderEmails,
+	unscheduleAllManagerEmails,
+} from "~/lib/emails";
 import { InviteFormEvaluator } from "./types";
 
 export const save = async (
@@ -71,7 +79,7 @@ export const save = async (
 				// Immediately send the invite email.
 				await sendInviteEmail(instanceId, pubId, evaluator);
 				// Scehdule a reminder email to person who was invited to evaluate.
-				await scheduleReminderEmail(instanceId, instanceConfig, pubId, evaluator);
+				await scheduleInvitationReminderEmail(instanceId, instanceConfig, pubId, evaluator);
 				// Schedule no-reply notification email to person who invited the
 				// evaluator.
 				await scheduleNoReplyNotificationEmail(
@@ -118,15 +126,22 @@ export const remove = async (instanceId: string, pubId: string, userId: string)
 		const evaluation = pub.children.find(
 			(child) => child.values[instanceConfig.evaluatorFieldSlug] === userId
 		);
-		// TODO: When an evaluator is removed, we should unschedule reminder
-		// email and notification email(s).
+
 		if (evaluation !== undefined) {
 			await client.deletePub(instanceId, evaluation.id);
 		}
 		if (instanceState !== undefined) {
+			let evaluator = expect(
+				instanceState[userId],
+				`User was not invited to evaluate pub ${pubId}`
+			);
+			assertHasAccepted(evaluator);
+			await unscheduleAllDeadlineReminderEmails(instanceId, pubId, evaluator);
+			await unscheduleAllManagerEmails(instanceId, pubId, evaluator);
 			delete instanceState[userId];
 			await setInstanceState(instanceId, pubId, instanceState);
 		}
+
 		return { success: true };
 	} catch (error) {
 		return { error: error.message };

integrations/evaluations/app/actions/respond/actions.ts

@@ -8,8 +8,14 @@ import {
 	sendDeclinedNotificationEmail,
 	sendRequestedInfoNotification,
 	unscheduleNoReplyNotificationEmail,
-	unscheduleReminderEmail,
+	unscheduleInvitationReminderEmail,
 	calculateDeadline,
+	schedulePromptEvalBonusReminderEmail,
+	scheduleFinalPromptEvalBonusReminderEmail,
+	scheduleEvaluationReminderEmail,
+	scheduleFinalEvaluationReminderEmail,
+	scheduleFollowUpToFinalEvaluationReminderEmail,
+	sendNoticeOfNoSubmitEmail,
 } from "~/lib/emails";
 import { getInstanceConfig, getInstanceState, setInstanceState } from "~/lib/instance";
 import { cookie } from "~/lib/request";
@@ -39,7 +45,6 @@ export const accept = async (instanceId: string, pubId: string) => {
 			...evaluator,
 			status: "accepted",
 			acceptedAt: new Date().toString(),
-			deadline: new Date(Date.now()),
 		};
 		const deadline = calculateDeadline(
 			{
@@ -50,16 +55,40 @@ export const accept = async (instanceId: string, pubId: string) => {
 		);
 		evaluator.deadline = deadline;
 		await setInstanceState(instanceId, pubId, instanceState);
-		// Unschedule reminder email.
-		await unscheduleReminderEmail(instanceId, pubId, evaluator);
-		// Unschedule no-reply notification email.
+		// Unschedule reminder email to evaluator.
+		await unscheduleInvitationReminderEmail(instanceId, pubId, evaluator);
+		// Unschedule no-reply notification email to community manager.
 		await unscheduleNoReplyNotificationEmail(instanceId, pubId, evaluator);
-		// Immediately send accepted notification email.
+		// Immediately send accepted notification email to community manager.
 		await sendAcceptedNotificationEmail(instanceId, instanceConfig, pubId, evaluator);
 		// Immediately send accepted email to evaluator.
 		await sendAcceptedEmail(instanceId, instanceConfig, pubId, evaluator);
-		// Schedule no-submit notification email.
+		// Schedule no-submit notification email to community manager.
 		await scheduleNoSubmitNotificationEmail(instanceId, instanceConfig, pubId, evaluator);
+
+		// schedule prompt evaluation email to evaluator.
+		await schedulePromptEvalBonusReminderEmail(instanceId, instanceConfig, pubId, evaluator);
+		//schedule final prompt eval email to evaluator
+		await scheduleFinalPromptEvalBonusReminderEmail(
+			instanceId,
+			instanceConfig,
+			pubId,
+			evaluator
+		);
+		//schedule eval reminder email to evaluator
+		await scheduleEvaluationReminderEmail(instanceId, instanceConfig, pubId, evaluator);
+		//schedule final eval reminder email to evaluator
+		await scheduleFinalEvaluationReminderEmail(instanceId, instanceConfig, pubId, evaluator);
+		//schedule follow up to final eval reminder email to evaluator
+		await scheduleFollowUpToFinalEvaluationReminderEmail(
+			instanceId,
+			instanceConfig,
+			pubId,
+			evaluator
+		);
+		// schedule no-submit notification email to evalutaor
+		await sendNoticeOfNoSubmitEmail(instanceId, instanceConfig, pubId, evaluator);
+
 		return { success: true };
 	} catch (error) {
 		return { error: error.message };
@@ -85,7 +114,7 @@ export const decline = async (instanceId: string, pubId: string) => {
 		evaluator = instanceState[user.id] = { ...evaluator, status: "declined" };
 		await setInstanceState(instanceId, pubId, instanceState);
 		// Unschedule reminder email.
-		await unscheduleReminderEmail(instanceId, pubId, evaluator);
+		await unscheduleInvitationReminderEmail(instanceId, pubId, evaluator);
 		// Unschedule no-reply notification email.
 		await unscheduleNoReplyNotificationEmail(instanceId, pubId, evaluator);
 		// Immediately send declined notification email.