feat(declaration): récupérer catégories d'emplois N-1 (indicateur G) (#3146)

Viczei · web-flow · commit c0967bdd5413 · 2026-04-13T10:07:44.000+02:00
diff --git a/packages/app/src/app/declaration-remuneration/etape/[step]/page.tsx b/packages/app/src/app/declaration-remuneration/etape/[step]/page.tsx
@@ -115,13 +115,32 @@ export default async function StepPage({ params }: StepPageProps) {
 		],
 	};
 
-	const step5Categories = mapToEmployeeCategoryRows(
-		data.jobCategories,
-		data.employeeCategories,
-		"initial",
-	);
+	const hasCurrentYearCategories = data.jobCategories.length > 0;
+
+	const step5Categories = hasCurrentYearCategories
+		? mapToEmployeeCategoryRows(
+				data.jobCategories,
+				data.employeeCategories,
+				"initial",
+			)
+		: (data.previousYearCategories?.categories.map((cat) => ({
+				name: cat.name,
+				detail: cat.detail,
+				womenCount: null,
+				menCount: null,
+				annualBaseWomen: null,
+				annualBaseMen: null,
+				annualVariableWomen: null,
+				annualVariableMen: null,
+				hourlyBaseWomen: null,
+				hourlyBaseMen: null,
+				hourlyVariableWomen: null,
+				hourlyVariableMen: null,
+			})) ?? []);
 
-	const initialSource = data.jobCategories[0]?.source;
+	const initialSource = hasCurrentYearCategories
+		? data.jobCategories[0]?.source
+		: (data.previousYearCategories?.source ?? undefined);
 
 	return (
 		<HydrateClient>
diff --git a/packages/app/src/e2e/helpers/db.ts b/packages/app/src/e2e/helpers/db.ts
@@ -167,6 +167,111 @@ export async function deleteCseOpinions() {
 	}
 }
 
+/**
+ * Insert a submitted declaration for the previous year (N-1) with job categories,
+ * so the "Reprendre les catégories de l'année précédente" button appears.
+ */
+export async function insertPreviousYearDeclaration() {
+	const sql = createConnection();
+	const yearResult =
+		await sql`SELECT EXTRACT(YEAR FROM CURRENT_DATE)::int - 1 AS previous_year`;
+	const previousYear = yearResult[0]?.previous_year as number;
+	const declId = "e2e-prev-year-decl-0000-000000000000";
+
+	try {
+		// Get test user id
+		const users = await sql`
+			SELECT user_id FROM app_user_company WHERE siren = ${TEST_SIREN} LIMIT 1
+		`;
+		const userId = users[0]?.user_id;
+		if (!userId) return;
+
+		// Insert submitted declaration for previous year
+		await sql`
+			INSERT INTO app_declaration (id, siren, year, declarant_id, total_women, total_men, current_step, status, created_at, updated_at)
+			VALUES (${declId}, ${TEST_SIREN}, ${previousYear}, ${userId}, 150, 200, 6, 'submitted', NOW(), NOW())
+			ON CONFLICT DO NOTHING
+		`;
+
+		// Insert 3 job categories
+		const categories = [
+			{
+				id: "e2e-jobcat-1111-0000-000000000000",
+				index: 0,
+				name: "Cadres dirigeants",
+				detail: "Directeurs et cadres supérieurs",
+			},
+			{
+				id: "e2e-jobcat-2222-0000-000000000000",
+				index: 1,
+				name: "Ingénieurs et cadres",
+				detail: "Ingénieurs, chefs de projet, managers",
+			},
+			{
+				id: "e2e-jobcat-3333-0000-000000000000",
+				index: 2,
+				name: "Techniciens",
+				detail: "Techniciens qualifiés",
+			},
+		];
+
+		for (const cat of categories) {
+			await sql`
+				INSERT INTO app_job_category (id, declaration_id, category_index, name, detail, source)
+				VALUES (${cat.id}, ${declId}, ${cat.index}, ${cat.name}, ${cat.detail}, 'convention-collective')
+				ON CONFLICT DO NOTHING
+			`;
+		}
+	} finally {
+		await sql.end();
+	}
+}
+
+/** Remove the previous year test declaration and its job categories. */
+export async function deletePreviousYearDeclaration() {
+	const sql = createConnection();
+	const declId = "e2e-prev-year-decl-0000-000000000000";
+
+	try {
+		const jobIds = [
+			"e2e-jobcat-1111-0000-000000000000",
+			"e2e-jobcat-2222-0000-000000000000",
+			"e2e-jobcat-3333-0000-000000000000",
+		];
+		await sql`DELETE FROM app_employee_category WHERE job_category_id = ANY(${jobIds})`;
+		await sql`DELETE FROM app_job_category WHERE declaration_id = ${declId}`;
+		await sql`DELETE FROM app_declaration WHERE id = ${declId}`;
+	} finally {
+		await sql.end();
+	}
+}
+
+/** Delete all job categories and employee categories for the test SIREN's current year declaration. */
+export async function deleteCurrentYearCategories() {
+	const sql = createConnection();
+	try {
+		await sql`
+			DELETE FROM app_employee_category
+			WHERE job_category_id IN (
+				SELECT jc.id FROM app_job_category jc
+				INNER JOIN app_declaration d ON d.id = jc.declaration_id
+				WHERE d.siren = ${TEST_SIREN}
+				  AND d.year = EXTRACT(YEAR FROM CURRENT_DATE)::int
+			)
+		`;
+		await sql`
+			DELETE FROM app_job_category
+			WHERE declaration_id IN (
+				SELECT id FROM app_declaration
+				WHERE siren = ${TEST_SIREN}
+				  AND year = EXTRACT(YEAR FROM CURRENT_DATE)::int
+			)
+		`;
+	} finally {
+		await sql.end();
+	}
+}
+
 type CampaignDeadlineDates = {
 	decl1ModificationDeadline: string;
 	decl1JustificationDeadline: string;
diff --git a/packages/app/src/e2e/previous-year-categories.e2e.ts b/packages/app/src/e2e/previous-year-categories.e2e.ts
@@ -0,0 +1,64 @@
+import { expect, type Page, test } from "@playwright/test";
+import {
+	deleteCurrentYearCategories,
+	deletePreviousYearDeclaration,
+	insertPreviousYearDeclaration,
+	resetDeclarationToDraft,
+} from "./helpers/db";
+
+async function goToStep5(page: Page) {
+	await page.goto("/declaration-remuneration");
+	await page.waitForURL("**/declaration-remuneration/etape/**");
+	await page.goto("/declaration-remuneration/etape/5");
+	await page.waitForURL("**/declaration-remuneration/etape/5");
+	await expect(page.getByText("Étape 5 sur 6")).toBeVisible();
+}
+
+test.describe("Previous year categories prefill", () => {
+	test.beforeAll(async () => {
+		await resetDeclarationToDraft();
+		await deleteCurrentYearCategories();
+		await insertPreviousYearDeclaration();
+	});
+
+	test.afterAll(async () => {
+		await deletePreviousYearDeclaration();
+	});
+
+	test("pre-fills N-1 category names, details and source with empty numeric fields", async ({
+		page,
+	}) => {
+		await goToStep5(page);
+
+		// Source pre-filled from N-1
+		await expect(
+			page.getByRole("combobox", { name: /source utilisée/i }),
+		).toHaveValue("convention-collective");
+
+		// 3 categories pre-filled
+		await expect(page.getByText("Nombre de catégories : 3")).toBeVisible();
+		await expect(
+			page.getByRole("button", { name: /Cadres dirigeants/ }),
+		).toBeVisible();
+		await expect(
+			page.getByRole("button", { name: /Ingénieurs et cadres/ }),
+		).toBeVisible();
+		await expect(
+			page.getByRole("button", { name: /Techniciens/ }),
+		).toBeVisible();
+
+		// Detail pre-filled, numeric fields empty
+		await page.getByRole("button", { name: /Cadres dirigeants/ }).click();
+		await expect(page.locator("#cat-0-detail")).toHaveValue(
+			"Directeurs et cadres supérieurs",
+		);
+		await expect(
+			page.getByRole("textbox", { name: "Effectif femmes, catégorie 1" }),
+		).toHaveValue("");
+		await expect(
+			page.getByRole("textbox", {
+				name: "Salaire de base annuel femmes, catégorie 1",
+			}),
+		).toHaveValue("");
+	});
+});
diff --git a/packages/app/src/server/api/routers/__tests__/declaration.test.ts b/packages/app/src/server/api/routers/__tests__/declaration.test.ts
@@ -18,6 +18,7 @@ vi.mock("../declarationHelpers", async (importOriginal) => {
 			employeeCategories: [],
 		}),
 		deleteJobAndEmployeeCategories: vi.fn().mockResolvedValue(undefined),
+		fetchPreviousYearJobCategories: vi.fn().mockResolvedValue(null),
 	};
 });
 
diff --git a/packages/app/src/server/api/routers/__tests__/declarationHelpers.test.ts b/packages/app/src/server/api/routers/__tests__/declarationHelpers.test.ts
@@ -198,6 +198,121 @@ describe("fetchAllCategories", () => {
 	});
 });
 
+describe("fetchPreviousYearJobCategories", () => {
+	it("returns null when no submitted declaration exists for previous year", async () => {
+		const { fetchPreviousYearJobCategories } = await import(
+			"../declarationHelpers"
+		);
+
+		const mockLimit = vi.fn().mockResolvedValue([]);
+		const mockWhere = vi.fn().mockReturnValue({ limit: mockLimit });
+		const mockFrom = vi.fn().mockReturnValue({ where: mockWhere });
+		const mockSelect = vi.fn().mockReturnValue({ from: mockFrom });
+
+		const tx = { select: mockSelect } as never;
+
+		const result = await fetchPreviousYearJobCategories(tx, "123456789", 2026);
+
+		expect(result).toBeNull();
+	});
+
+	it("returns null when declaration exists but has no job categories", async () => {
+		const { fetchPreviousYearJobCategories } = await import(
+			"../declarationHelpers"
+		);
+
+		let selectCallCount = 0;
+		const mockLimit = vi.fn().mockResolvedValue([{ id: "decl-prev" }]);
+		const mockWhere = vi.fn().mockImplementation(() => {
+			selectCallCount++;
+			if (selectCallCount === 1) return { limit: mockLimit };
+			return Promise.resolve([]);
+		});
+		const mockFrom = vi.fn().mockReturnValue({ where: mockWhere });
+		const mockSelect = vi.fn().mockReturnValue({ from: mockFrom });
+
+		const tx = { select: mockSelect } as never;
+
+		const result = await fetchPreviousYearJobCategories(tx, "123456789", 2026);
+
+		expect(result).toBeNull();
+	});
+
+	it("returns categories sorted by index with source from previous year", async () => {
+		const { fetchPreviousYearJobCategories } = await import(
+			"../declarationHelpers"
+		);
+
+		const mockJobs = [
+			{
+				name: "Employés",
+				detail: "Support",
+				source: "convention-collective",
+				categoryIndex: 1,
+			},
+			{
+				name: "Cadres",
+				detail: "Managers",
+				source: "convention-collective",
+				categoryIndex: 0,
+			},
+		];
+
+		let selectCallCount = 0;
+		const mockLimit = vi.fn().mockResolvedValue([{ id: "decl-prev" }]);
+		const mockWhere = vi.fn().mockImplementation(() => {
+			selectCallCount++;
+			if (selectCallCount === 1) return { limit: mockLimit };
+			return Promise.resolve(mockJobs);
+		});
+		const mockFrom = vi.fn().mockReturnValue({ where: mockWhere });
+		const mockSelect = vi.fn().mockReturnValue({ from: mockFrom });
+
+		const tx = { select: mockSelect } as never;
+
+		const result = await fetchPreviousYearJobCategories(tx, "123456789", 2026);
+
+		expect(result).toEqual({
+			source: "convention-collective",
+			categories: [
+				{ name: "Cadres", detail: "Managers" },
+				{ name: "Employés", detail: "Support" },
+			],
+		});
+	});
+
+	it("uses empty string for null detail", async () => {
+		const { fetchPreviousYearJobCategories } = await import(
+			"../declarationHelpers"
+		);
+
+		const mockJobs = [
+			{
+				name: "Cadres",
+				detail: null,
+				source: "autre",
+				categoryIndex: 0,
+			},
+		];
+
+		let selectCallCount = 0;
+		const mockLimit = vi.fn().mockResolvedValue([{ id: "decl-prev" }]);
+		const mockWhere = vi.fn().mockImplementation(() => {
+			selectCallCount++;
+			if (selectCallCount === 1) return { limit: mockLimit };
+			return Promise.resolve(mockJobs);
+		});
+		const mockFrom = vi.fn().mockReturnValue({ where: mockWhere });
+		const mockSelect = vi.fn().mockReturnValue({ from: mockFrom });
+
+		const tx = { select: mockSelect } as never;
+
+		const result = await fetchPreviousYearJobCategories(tx, "123456789", 2026);
+
+		expect(result?.categories[0]?.detail).toBe("");
+	});
+});
+
 describe("deleteJobAndEmployeeCategories", () => {
 	it("deletes employee categories then job categories", async () => {
 		const { deleteJobAndEmployeeCategories } = await import(
diff --git a/packages/app/src/server/api/routers/declaration.ts b/packages/app/src/server/api/routers/declaration.ts
@@ -21,6 +21,7 @@ import {
 	buildEmployeeCategoryValues,
 	deleteJobAndEmployeeCategories,
 	fetchAllCategories,
+	fetchPreviousYearJobCategories,
 } from "./declarationHelpers";
 
 export const declarationRouter = createTRPCRouter({
@@ -103,9 +104,16 @@ export const declarationRouter = createTRPCRouter({
 
 		const gipPrefillData = gipRow[0] ? mapGipToFormData(gipRow[0]) : null;
 
+		// Fetch N-1 categories for automatic prefilling when step 5 is empty
+		const hasCurrentCategories = (result.jobCategories ?? []).length > 0;
+		const previousYearCategories = hasCurrentCategories
+			? null
+			: await fetchPreviousYearJobCategories(ctx.db, siren, year);
+
 		return {
 			...result,
 			gipPrefillData,
+			previousYearCategories,
 		};
 	}),
 
diff --git a/packages/app/src/server/api/routers/declarationHelpers.ts b/packages/app/src/server/api/routers/declarationHelpers.ts
