refactor(mail): derive text body from html and move CSE receipt to upload

- Templates now return only { subject, html }. sendMail uses
  html-to-text to produce the plain-text alternative at send time,
  removing the duplication between the two representations.
- CSE opinion receipt is now triggered by a successful POST on
  /api/upload (flowType=cse_opinion) instead of cseOpinion.saveOpinions,
  so the acknowledgement matches the moment the document is actually
  deposited.

Author: Viczei

maildev-all-3-emails.png

@@ -45,6 +45,7 @@
 		"@trpc/server": "^11.16.0",
 		"drizzle-orm": "^0.45.2",
 		"exceljs": "^4.4.0",
+		"html-to-text": "^9.0.5",
 		"next": "^16.2.3",
 		"next-auth": "4.24.13",
 		"nodemailer": "^7.0.13",
@@ -66,6 +67,7 @@
 		"@testing-library/jest-dom": "^6.9.1",
 		"@testing-library/react": "^16.3.2",
 		"@testing-library/user-event": "^14.6.1",
+		"@types/html-to-text": "^9.0.4",
 		"@types/node": "^25.6.0",
 		"@types/nodemailer": "^8.0.0",
 		"@types/react": "^19.2.14",

maildev-email.png

@@ -207,6 +207,19 @@ export async function POST(request: Request): Promise<Response> {
 			userAgent: requestContext.userAgent,
 			durationMs: Date.now() - startedAt,
 		});
+		if (flowType === "cse_opinion" && userEmail) {
+			void (async () => {
+				const { sendReceipt } = await import("~/modules/mail/server");
+				await sendReceipt({
+					kind: "cseOpinion",
+					to: userEmail,
+					siren,
+					year,
+					userId,
+					isResend: false,
+				});
+			})();
+		}
 		return Response.json({
 			fileId: result.fileId,
 			fileName: result.fileName,

maildev-seconde-declaration.png

@@ -34,32 +34,29 @@ describe("sendMail", () => {
 		const result = await sendMail({
 			to: "a@b.fr",
 			subject: "s",
-			text: "t",
 			html: "<p>t</p>",
 		});
 		expect(result).toEqual({ status: "disabled" });
 		expect(sendMailMock).not.toHaveBeenCalled();
 	});
 
-	it("sends the email when enabled", async () => {
+	it("sends the email with text derived from html", async () => {
 		mockEnv(true);
 		sendMailMock.mockResolvedValue({ messageId: "msg-1" });
 		const { sendMail } = await import("../sendMail");
 		const result = await sendMail({
 			to: "a@b.fr",
 			subject: "s",
-			text: "t",
-			html: "<p>t</p>",
+			html: "<p>Bonjour <strong>Egapro</strong></p>",
 		});
 		expect(result).toEqual({ status: "sent", messageId: "msg-1" });
-		expect(sendMailMock).toHaveBeenCalledWith({
-			from: "no-reply@test",
-			to: "a@b.fr",
-			subject: "s",
-			text: "t",
-			html: "<p>t</p>",
-			attachments: undefined,
-		});
+		const payload = sendMailMock.mock.calls[0]?.[0];
+		expect(payload.from).toBe("no-reply@test");
+		expect(payload.to).toBe("a@b.fr");
+		expect(payload.html).toBe("<p>Bonjour <strong>Egapro</strong></p>");
+		expect(payload.text).toContain("Bonjour");
+		expect(payload.text).toContain("Egapro");
+		expect(payload.text).not.toContain("<");
 	});
 
 	it("returns error status when transporter throws", async () => {
@@ -69,7 +66,6 @@ describe("sendMail", () => {
 		const result = await sendMail({
 			to: "a@b.fr",
 			subject: "s",
-			text: "t",
 			html: "<p>t</p>",
 		});
 		expect(result).toEqual({ status: "error", error: "smtp down" });
@@ -82,7 +78,6 @@ describe("sendMail", () => {
 		await sendMail({
 			to: "a@b.fr",
 			subject: "s",
-			text: "t",
 			html: "<p>t</p>",
 			attachments: [
 				{

packages/app/package.json

@@ -9,8 +9,6 @@ describe("mail templates", () => {
 		const t = buildDeclarationReceipt({ siren: "552100554", year: 2024 });
 		expect(t.subject).toContain("2024");
 		expect(t.html).toContain("552 100 554");
-		expect(t.text).toContain("552 100 554");
-		expect(t.text).toContain("2024");
 	});
 
 	it("builds a second declaration receipt", () => {

packages/app/src/app/api/upload/route.ts

@@ -1,12 +1,12 @@
 import "server-only";
+import { convert as htmlToText } from "html-to-text";
 import { env } from "~/env.js";
 import { getTransporter } from "./transporter";
 import type { MailAttachment } from "./types";
 
 export type SendMailInput = {
 	to: string;
 	subject: string;
-	text: string;
 	html: string;
 	attachments?: MailAttachment[];
 };
@@ -26,7 +26,7 @@ export async function sendMail(input: SendMailInput): Promise<SendMailResult> {
 			from: env.MAIL_FROM,
 			to: input.to,
 			subject: input.subject,
-			text: input.text,
+			text: htmlToText(input.html, { wordwrap: 80 }),
 			html: input.html,
 			attachments: input.attachments?.map((a) => ({
 				filename: a.filename,

packages/app/src/modules/mail/__tests__/sendMail.test.ts

@@ -33,7 +33,6 @@ export async function sendReceipt(input: SendReceiptInput): Promise<void> {
 		const result = await sendMail({
 			to,
 			subject: template.subject,
-			text: template.text,
 			html: template.html,
 			attachments,
 		});

packages/app/src/modules/mail/__tests__/templates.test.ts

@@ -5,18 +5,6 @@ import { escapeHtml, wrapEmail } from "./shell";
 export function buildCseOpinionReceipt({ siren, year }: ReceiptContext) {
 	const subject = `Accusé de réception — Avis du CSE ${year}`;
 	const prettySiren = formatSiren(siren);
-	const text = `Bonjour,
-
-Nous accusons réception du dépôt de l'avis du CSE sur les indicateurs de l'égalité professionnelle pour l'année ${year}.
-
-Entreprise (SIREN) : ${prettySiren}
-Année de déclaration : ${year}
-
-Le récapitulatif de votre dépôt est joint à cet e-mail.
-
-Cordialement,
-L'équipe Egapro`;
-
 	const html = wrapEmail(
 		subject,
 		`<p>Bonjour,</p>
@@ -25,9 +13,8 @@ L'équipe Egapro`;
 <li><strong>Entreprise (SIREN)&nbsp;:</strong> ${escapeHtml(prettySiren)}</li>
 <li><strong>Année de déclaration&nbsp;:</strong> ${year}</li>
 </ul>
-<p>Le récapitulatif de votre dépôt est joint à cet e-mail.</p>
 <p>Cordialement,<br>L'équipe Egapro</p>`,
 	);
 
-	return { subject, text, html };
+	return { subject, html };
 }