fix(declaration): prefill step 5 from last declaration containing indicator 7 (#3246)

Previously, the catégories d'emploi prefill on step 5 only looked at year
N-1. If the company skipped that year or submitted without indicator 7
(no job categories), nothing was prefilled even when earlier declarations
had usable data.

fetchPreviousYearJobCategories now walks all previous submitted
declarations for the SIREN ordered by year DESC and returns the first
one with job categories, regardless of how many years back.

Author: Viczei

packages/app/src/server/api/routers/__tests__/declarationHelpers.test.ts

@@ -199,51 +199,74 @@ describe("fetchAllCategories", () => {
 });
 
 describe("fetchPreviousYearJobCategories", () => {
-	it("returns null when no submitted declaration exists for previous year", async () => {
+	type PreviousDeclarationRow = { id: string };
+	type JobCategoryRow = {
+		name: string;
+		detail: string | null;
+		source: string;
+		categoryIndex: number;
+	};
+
+	/**
+	 * Builds a mocked Drizzle `tx` where:
+	 *   - the first `select()` chain (declarations query) resolves to
+	 *     `previousDeclarations` after `.orderBy()`
+	 *   - each subsequent `select()` chain (jobCategories query per declaration)
+	 *     resolves to the next entry in `jobsPerDeclaration` after `.where()`
+	 */
+	const makeTx = (
+		previousDeclarations: PreviousDeclarationRow[],
+		jobsPerDeclaration: JobCategoryRow[][],
+	) => {
+		let selectCallCount = 0;
+		const queuedJobs = [...jobsPerDeclaration];
+
+		const mockSelect = vi.fn().mockImplementation(() => {
+			selectCallCount++;
+			if (selectCallCount === 1) {
+				const mockOrderBy = vi.fn().mockResolvedValue(previousDeclarations);
+				const mockWhere = vi.fn().mockReturnValue({ orderBy: mockOrderBy });
+				const mockFrom = vi.fn().mockReturnValue({ where: mockWhere });
+				return { from: mockFrom };
+			}
+			const mockWhere = vi.fn().mockResolvedValue(queuedJobs.shift() ?? []);
+			const mockFrom = vi.fn().mockReturnValue({ where: mockWhere });
+			return { from: mockFrom };
+		});
+
+		return { select: mockSelect } as never;
+	};
+
+	it("returns null when no submitted previous declaration exists", 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 tx = makeTx([], []);
 
 		const result = await fetchPreviousYearJobCategories(tx, "123456789", 2026);
 
 		expect(result).toBeNull();
 	});
 
-	it("returns null when declaration exists but has no job categories", async () => {
+	it("returns null when no previous declaration contains 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 tx = makeTx([{ id: "decl-2025" }, { id: "decl-2024" }], [[], []]);
 
 		const result = await fetchPreviousYearJobCategories(tx, "123456789", 2026);
 
 		expect(result).toBeNull();
 	});
 
-	it("returns categories sorted by index with source from previous year", async () => {
+	it("returns categories from the most recent previous declaration", async () => {
 		const { fetchPreviousYearJobCategories } = await import(
 			"../declarationHelpers"
 		);
 
-		const mockJobs = [
+		const mostRecentJobs: JobCategoryRow[] = [
 			{
 				name: "Employés",
 				detail: "Support",
@@ -258,17 +281,7 @@ describe("fetchPreviousYearJobCategories", () => {
 			},
 		];
 
-		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 tx = makeTx([{ id: "decl-2025" }], [mostRecentJobs]);
 
 		const result = await fetchPreviousYearJobCategories(tx, "123456789", 2026);
 
@@ -281,31 +294,48 @@ describe("fetchPreviousYearJobCategories", () => {
 		});
 	});
 
-	it("uses empty string for null detail", async () => {
+	it("falls back to an earlier year when N-1 has no job categories", async () => {
 		const { fetchPreviousYearJobCategories } = await import(
 			"../declarationHelpers"
 		);
 
-		const mockJobs = [
+		const olderJobs: JobCategoryRow[] = [
 			{
 				name: "Cadres",
-				detail: null,
+				detail: "Managers",
 				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 tx = makeTx(
+			[{ id: "decl-2025" }, { id: "decl-2023" }],
+			[[], olderJobs],
+		);
+
+		const result = await fetchPreviousYearJobCategories(tx, "123456789", 2026);
+
+		expect(result).toEqual({
+			source: "autre",
+			categories: [{ name: "Cadres", detail: "Managers" }],
 		});
-		const mockFrom = vi.fn().mockReturnValue({ where: mockWhere });
-		const mockSelect = vi.fn().mockReturnValue({ from: mockFrom });
+	});
 
-		const tx = { select: mockSelect } as never;
+	it("uses empty string for null detail", async () => {
+		const { fetchPreviousYearJobCategories } = await import(
+			"../declarationHelpers"
+		);
+
+		const jobs: JobCategoryRow[] = [
+			{
+				name: "Cadres",
+				detail: null,
+				source: "autre",
+				categoryIndex: 0,
+			},
+		];
+
+		const tx = makeTx([{ id: "decl-2025" }], [jobs]);
 
 		const result = await fetchPreviousYearJobCategories(tx, "123456789", 2026);
 

packages/app/src/server/api/routers/declaration.ts

@@ -114,7 +114,8 @@ export const declarationRouter = createTRPCRouter({
 
 		const gipPrefillData = gipRow[0] ? mapGipToFormData(gipRow[0]) : null;
 
-		// Fetch N-1 categories for automatic prefilling when step 5 is empty
+		// Fetch job categories from the most recent previous declaration that
+		// contains indicator 7, for automatic prefilling when step 5 is empty.
 		const hasCurrentCategories = (result.jobCategories ?? []).length > 0;
 		const previousYearCategories = hasCurrentCategories
 			? null

packages/app/src/server/api/routers/declarationHelpers.ts

@@ -1,4 +1,4 @@
-import { and, eq } from "drizzle-orm";
+import { and, desc, eq, lt } from "drizzle-orm";
 
 import {
 	declarations,
@@ -97,44 +97,48 @@ export async function fetchPreviousYearJobCategories(
 	siren: string,
 	currentYear: number,
 ) {
-	const previousYear = currentYear - 1;
-
-	const [previousDeclaration] = await tx
+	// Walk previous submitted declarations from most recent down and pick the
+	// first one that actually contains indicator 7 (i.e. has job categories).
+	// A company may skip year N-1 or submit without indicator 7, in which case
+	// we fall back to earlier years.
+	const previousDeclarations = await tx
 		.select({ id: declarations.id })
 		.from(declarations)
 		.where(
 			and(
 				eq(declarations.siren, siren),
-				eq(declarations.year, previousYear),
+				lt(declarations.year, currentYear),
 				eq(declarations.status, "submitted"),
 			),
 		)
-		.limit(1);
-
-	if (!previousDeclaration) return null;
-
-	const jobs = await tx
-		.select({
-			name: jobCategories.name,
-			detail: jobCategories.detail,
-			source: jobCategories.source,
-			categoryIndex: jobCategories.categoryIndex,
-		})
-		.from(jobCategories)
-		.where(eq(jobCategories.declarationId, previousDeclaration.id));
-
-	if (jobs.length === 0) return null;
-
-	const sorted = [...jobs].sort((a, b) => a.categoryIndex - b.categoryIndex);
-	const source = sorted[0]?.source ?? "";
+		.orderBy(desc(declarations.year));
+
+	for (const { id } of previousDeclarations) {
+		const jobs = await tx
+			.select({
+				name: jobCategories.name,
+				detail: jobCategories.detail,
+				source: jobCategories.source,
+				categoryIndex: jobCategories.categoryIndex,
+			})
+			.from(jobCategories)
+			.where(eq(jobCategories.declarationId, id));
+
+		if (jobs.length === 0) continue;
+
+		const sorted = [...jobs].sort((a, b) => a.categoryIndex - b.categoryIndex);
+		const source = sorted[0]?.source ?? "";
+
+		return {
+			source,
+			categories: sorted.map((j) => ({
+				name: j.name,
+				detail: j.detail ?? "",
+			})),
+		};
+	}
 
-	return {
-		source,
-		categories: sorted.map((j) => ({
-			name: j.name,
-			detail: j.detail ?? "",
-		})),
-	};
+	return null;
 }
 
 type JobCategoryRow = typeof jobCategories.$inferSelect;