fix(avis-cse): track CSE opinion finalization with dedicated timestamp (#3271)

Author: LucasCharrier

packages/app/drizzle/0028_add_cse_opinion_completed_at.sql

@@ -0,0 +1,6 @@
+-- Track when a CSE opinion deposit (avis CSE) is finalized by the declarant.
+-- A NULL value means the flow is still in progress. The side panel uses this
+-- column (rather than "any cseOpinions row exists") to decide whether the
+-- declaration should be shown as "clôturée".
+ALTER TABLE "app_declaration"
+  ADD COLUMN IF NOT EXISTS "cse_opinion_completed_at" timestamp with time zone;

packages/app/drizzle/meta/_journal.json

@@ -197,6 +197,13 @@
 			"when": 1775900000000,
 			"tag": "0027_add_global_settings",
 			"breakpoints": true
+		},
+		{
+			"idx": 28,
+			"version": "7",
+			"when": 1776000000000,
+			"tag": "0028_add_cse_opinion_completed_at",
+			"breakpoints": true
 		}
 	]
 }

packages/app/src/e2e/campaign-deadlines-gating.e2e.ts

@@ -45,15 +45,20 @@ test.describe("Campaign deadlines gating", () => {
 	// shared auth.setup project handles.
 	async function seedSubmittedCompliance() {
 		await resetDeclarationToDraft();
-		await setCompanyHasCse(true);
-		await setUserPhone("0122334455");
 		await setDeclarationComplianceState({
 			status: "submitted",
 			currentStep: 6,
 			compliancePath: "corrective_action",
 		});
 	}
 
+	// Phone + CSE flags must be set before login so the JWT picks them up and
+	// the missing-info-modal does not intercept clicks on /mon-espace.
+	async function seedUserProfile() {
+		await setUserPhone("0122334455");
+		await setCompanyHasCse(true);
+	}
+
 	test.afterAll(async () => {
 		await deleteCampaignDeadlines(testDeclarationYear);
 		await resetDeclarationToDraft();
@@ -68,6 +73,7 @@ test.describe("Campaign deadlines gating", () => {
 		test("panel shows Modifier link and 'Modifiable jusqu'au' text", async ({
 			page,
 		}) => {
+			await seedUserProfile();
 			await page.context().clearCookies();
 			await loginWithProConnect(page);
 			// The declaration row is only created by getOrCreate() when visiting a
@@ -99,6 +105,7 @@ test.describe("Campaign deadlines gating", () => {
 		test("submitted declaration can re-enter a non-recap step", async ({
 			page,
 		}) => {
+			await seedUserProfile();
 			await page.context().clearCookies();
 			await loginWithProConnect(page);
 			await page.goto("/declaration-remuneration");
@@ -117,6 +124,7 @@ test.describe("Campaign deadlines gating", () => {
 		test("panel hides Modifier link and shows 'Modification close depuis'", async ({
 			page,
 		}) => {
+			await seedUserProfile();
 			await page.context().clearCookies();
 			await loginWithProConnect(page);
 			await page.goto("/declaration-remuneration");
@@ -143,6 +151,7 @@ test.describe("Campaign deadlines gating", () => {
 		test("submitted declaration non-recap step redirects to recap", async ({
 			page,
 		}) => {
+			await seedUserProfile();
 			await page.context().clearCookies();
 			await loginWithProConnect(page);
 			await page.goto("/declaration-remuneration");

packages/app/src/e2e/declaration-process-panel.e2e.ts

@@ -155,11 +155,46 @@ test.describe("Declaration process panel", () => {
 		});
 	});
 
+	test.describe("Variant: cse with opinions saved but not finalized", () => {
+		test.beforeAll(async () => {
+			await setDeclarationComplianceState({
+				compliancePath: "joint_evaluation",
+				complianceCompletedAt: new Date(),
+				cseOpinionCompletedAt: null,
+			});
+			await insertJointEvaluationFile(CURRENT_YEAR);
+			await insertCseOpinion(CURRENT_YEAR);
+		});
+
+		test("keeps CSE step current while finalization has not been done", async ({
+			page,
+		}) => {
+			await page.context().clearCookies();
+			await loginWithProConnect(page);
+			await waitForDsfrModal(page, PANEL_ID);
+
+			const panel = page.locator(`#${PANEL_ID}`);
+			const remuButton = page.getByRole("button", { name: "Rémunération" });
+			await expect(remuButton.first()).toBeVisible();
+			await clickAndExpectDialogOpen(page, remuButton.first(), PANEL_ID);
+
+			await expect(panel.getByText("Démarche close")).not.toBeVisible();
+			await expect(
+				panel.getByText("Déposer le ou les avis du CSE"),
+			).toBeVisible();
+			const ctaLink = panel.getByRole("link", {
+				name: "Continuer la déclaration",
+			});
+			await expect(ctaLink).toHaveAttribute("href", /avis-cse/);
+		});
+	});
+
 	test.describe("Variant: closed (compliance completed + CSE deposited)", () => {
 		test.beforeAll(async () => {
 			await setDeclarationComplianceState({
 				compliancePath: "joint_evaluation",
 				complianceCompletedAt: new Date(),
+				cseOpinionCompletedAt: new Date(),
 			});
 			await insertJointEvaluationFile(CURRENT_YEAR);
 			await insertCseOpinion(CURRENT_YEAR);
@@ -180,7 +215,7 @@ test.describe("Declaration process panel", () => {
 			await expect(panel.getByText("Démarche close")).toBeVisible();
 			await expect(
 				panel.getByText(
-					"Cette démarche est terminée, aucune modification n'est possible.",
+					"Cette démarche est terminée. Les avis du CSE restent modifiables jusqu'à l'échéance.",
 				),
 			).toBeVisible();
 		});

packages/app/src/e2e/helpers/db.ts

@@ -94,6 +94,7 @@ export async function setDeclarationComplianceState(state: {
 	compliancePath?: string | null;
 	secondDeclarationStatus?: string | null;
 	complianceCompletedAt?: Date | null;
+	cseOpinionCompletedAt?: Date | null;
 }) {
 	const sql = createConnection();
 	try {
@@ -103,7 +104,8 @@ export async function setDeclarationComplianceState(state: {
 			    current_step = ${state.currentStep ?? 6},
 			    compliance_path = ${state.compliancePath ?? null},
 			    second_declaration_status = ${state.secondDeclarationStatus ?? null},
-			    compliance_completed_at = ${state.complianceCompletedAt ?? null}
+			    compliance_completed_at = ${state.complianceCompletedAt ?? null},
+			    cse_opinion_completed_at = ${state.cseOpinionCompletedAt ?? null}
 			WHERE siren = ${TEST_SIREN}
 		`;
 	} finally {

packages/app/src/modules/audit/shared/actionKeys.ts

@@ -30,6 +30,7 @@ export const AUDIT_ACTIONS = {
 	CSE_OPINION_SAVE: "cse_opinion.save",
 	CSE_OPINION_UPLOAD_FILE: "cse_opinion.upload_file",
 	CSE_OPINION_DELETE_FILE: "cse_opinion.delete_file",
+	CSE_OPINION_FINALIZE: "cse_opinion.finalize",
 
 	// ── Joint evaluation mutations ─────────────────────────
 	JOINT_EVALUATION_UPLOAD_FILE: "joint_evaluation.upload_file",
@@ -104,6 +105,7 @@ export const AUDIT_ACTION_CATEGORIES: Record<AuditActionKey, AuditCategory> = {
 	[AUDIT_ACTIONS.CSE_OPINION_SAVE]: "mutation",
 	[AUDIT_ACTIONS.CSE_OPINION_UPLOAD_FILE]: "mutation",
 	[AUDIT_ACTIONS.CSE_OPINION_DELETE_FILE]: "mutation",
+	[AUDIT_ACTIONS.CSE_OPINION_FINALIZE]: "mutation",
 
 	[AUDIT_ACTIONS.JOINT_EVALUATION_UPLOAD_FILE]: "mutation",
 

packages/app/src/modules/cseOpinion/Step2Upload.tsx

@@ -6,7 +6,7 @@ import { useCallback, useState } from "react";
 
 import { useReadOnlyGuard } from "~/modules/auth";
 import { NewTabNotice } from "~/modules/layout/shared/NewTabNotice";
-import { FileUpload, useFileUploadForm } from "~/modules/shared";
+import { FileUpload, getDsfrModal, useFileUploadForm } from "~/modules/shared";
 import { api } from "~/trpc/react";
 
 import { CseStepIndicator } from "./components/CseStepIndicator";
@@ -29,6 +29,7 @@ export function Step2Upload({
 	const router = useRouter();
 	const utils = api.useUtils();
 	const [deletingFileId, setDeletingFileId] = useState<string | null>(null);
+	const [finalizeError, setFinalizeError] = useState<string | null>(null);
 	const readOnlyGuard = useReadOnlyGuard();
 
 	const refreshFileList = useCallback(() => {
@@ -44,6 +45,21 @@ export function Step2Upload({
 		onError: () => setDeletingFileId(null),
 	});
 
+	const finalizeMutation = api.cseOpinion.finalize.useMutation();
+
+	const finalizeAndRedirect = useCallback(async () => {
+		try {
+			await finalizeMutation.mutateAsync();
+			router.push("/avis-cse/confirmation");
+		} catch (error) {
+			setFinalizeError(
+				error instanceof Error
+					? error.message
+					: "Erreur lors de la validation du dépôt.",
+			);
+		}
+	}, [finalizeMutation, router]);
+
 	const {
 		closeModal,
 		handleConfirm,
@@ -56,14 +72,44 @@ export function Step2Upload({
 	} = useFileUploadForm({
 		flowType: "cse_opinion",
 		onUploaded: refreshFileList,
-		onAllUploaded: () => router.push("/avis-cse/confirmation"),
+		onAllUploaded: () => {
+			void finalizeAndRedirect();
+		},
 	});
 
+	const skipUploadSubmit = useCallback(
+		(event: React.FormEvent) => {
+			event.preventDefault();
+			setFinalizeError(null);
+			const dialog = modalRef.current;
+			if (!dialog) return;
+			const modal = getDsfrModal(dialog);
+			if (modal) {
+				modal.disclose();
+			} else {
+				dialog.showModal();
+			}
+		},
+		[modalRef],
+	);
+
+	const hasExistingFiles = existingFiles.length > 0;
+	const hasSelectedFiles = selectedFiles.length > 0;
+	const formSubmit =
+		!hasSelectedFiles && hasExistingFiles ? skipUploadSubmit : handleSubmit;
+	const confirmAction = hasSelectedFiles
+		? handleConfirm
+		: () => {
+				closeModal();
+				void finalizeAndRedirect();
+			};
+
 	const remainingSlots = MAX_CSE_FILES - existingFiles.length;
+	const isSubmitting = isPending || finalizeMutation.isPending;
 
 	return (
 		<>
-			<form onSubmit={handleSubmit}>
+			<form onSubmit={formSubmit}>
 				<div className="fr-grid-row fr-grid-row--middle fr-mb-3w">
 					<div className="fr-col">
 						<h1 className="fr-h4 fr-mb-0">
@@ -118,6 +164,12 @@ export function Step2Upload({
 					/>
 				</div>
 
+				{finalizeError && (
+					<p className="fr-error-text fr-mt-2w" role="alert">
+						{finalizeError}
+					</p>
+				)}
+
 				<div className={`fr-mt-4w ${formStyles.actions}`}>
 					<Link
 						className="fr-btn fr-btn--tertiary fr-icon-arrow-left-line fr-btn--icon-left"
@@ -129,10 +181,10 @@ export function Step2Upload({
 						<button
 							{...readOnlyGuard.buttonProps}
 							className="fr-btn fr-icon-arrow-right-line fr-btn--icon-right"
-							disabled={isPending || readOnlyGuard.isReadOnly}
+							disabled={isSubmitting || readOnlyGuard.isReadOnly}
 							type="submit"
 						>
-							{isPending ? "Envoi en cours\u2026" : "Soumettre"}
+							{isSubmitting ? "Envoi en cours\u2026" : "Soumettre"}
 						</button>
 						{readOnlyGuard.tooltip}
 					</span>
@@ -143,7 +195,7 @@ export function Step2Upload({
 				declarationYear={declarationYear}
 				modalRef={modalRef}
 				onClose={closeModal}
-				onSubmit={handleConfirm}
+				onSubmit={confirmAction}
 			/>
 		</>
 	);

packages/app/src/modules/cseOpinion/__tests__/Step2Upload.test.tsx

@@ -17,6 +17,7 @@ let deleteMutationOptions: {
 	onError?: () => void;
 } = {};
 const deleteMutateMock = vi.fn();
+const finalizeMutateAsyncMock = vi.fn();
 
 vi.mock("next/navigation", () => ({
 	useRouter: () => ({
@@ -47,6 +48,13 @@ vi.mock("~/trpc/react", () => ({
 					};
 				},
 			},
+			finalize: {
+				useMutation: () => ({
+					mutateAsync: finalizeMutateAsyncMock,
+					isPending: false,
+					error: null,
+				}),
+			},
 		},
 		useUtils: () => ({
 			cseOpinion: {
@@ -74,6 +82,8 @@ describe("Step2Upload", () => {
 		refreshMock.mockReset();
 		invalidateMock.mockReset();
 		deleteMutateMock.mockReset();
+		finalizeMutateAsyncMock.mockReset();
+		finalizeMutateAsyncMock.mockResolvedValue({ success: true });
 		uploadFileMock.mockReset();
 		deleteMutationOptions = {};
 		// jsdom doesn't implement <dialog>; stub showModal/close so the dialog
@@ -337,7 +347,7 @@ describe("Step2Upload", () => {
 		).toBeInTheDocument();
 	});
 
-	it("uploads the file then refreshes the list and redirects on success", async () => {
+	it("uploads the file then finalizes and redirects on success", async () => {
 		const user = userEvent.setup();
 		uploadFileMock.mockResolvedValue({
 			ok: true,
@@ -367,11 +377,63 @@ describe("Step2Upload", () => {
 			expect(invalidateMock).toHaveBeenCalled();
 		});
 		expect(refreshMock).toHaveBeenCalled();
+		await waitFor(() => {
+			expect(finalizeMutateAsyncMock).toHaveBeenCalled();
+		});
 		await waitFor(() => {
 			expect(pushMock).toHaveBeenCalledWith("/avis-cse/confirmation");
 		});
 	});
 
+	it("finalizes without uploading when only existing files are present", async () => {
+		const user = userEvent.setup();
+		render(
+			<Step2Upload
+				declarationYear={2025}
+				existingFiles={[makeFile("avis-1.pdf", "file-1")]}
+			/>,
+		);
+
+		await user.click(screen.getByRole("button", { name: /Soumettre/ }));
+
+		const certifyCheckbox = screen.getByRole("checkbox");
+		await user.click(certifyCheckbox);
+		await user.click(screen.getByRole("button", { name: "Valider" }));
+
+		await waitFor(() => {
+			expect(finalizeMutateAsyncMock).toHaveBeenCalled();
+		});
+		expect(uploadFileMock).not.toHaveBeenCalled();
+		await waitFor(() => {
+			expect(pushMock).toHaveBeenCalledWith("/avis-cse/confirmation");
+		});
+	});
+
+	it("shows an error and does not redirect when finalize fails", async () => {
+		const user = userEvent.setup();
+		finalizeMutateAsyncMock.mockRejectedValueOnce(
+			new Error("Au moins un fichier d'avis CSE doit être transmis."),
+		);
+
+		render(
+			<Step2Upload
+				declarationYear={2025}
+				existingFiles={[makeFile("avis-1.pdf", "file-1")]}
+			/>,
+		);
+
+		await user.click(screen.getByRole("button", { name: /Soumettre/ }));
+		await user.click(screen.getByRole("checkbox"));
+		await user.click(screen.getByRole("button", { name: "Valider" }));
+
+		await waitFor(() => {
+			expect(
+				screen.getByText("Au moins un fichier d'avis CSE doit être transmis."),
+			).toBeInTheDocument();
+		});
+		expect(pushMock).not.toHaveBeenCalled();
+	});
+
 	it("invalidates the file list and clears the deleting state on delete success", () => {
 		render(
 			<Step2Upload