ba4cdcee7a
## Summary
First implementation PR for [ADR-0027](docs/decisions/0027-portal-side-organisational-hierarchy.md) (`Region` / `Delegation` / `Structure` portal-side organisational hierarchy). **Schema + seed + drift-gate extension only** — no consumer code yet (the `PrismaScopeResolver` that dereferences `Structure.code` from `UserScope.value` lives in ADR-0026 PR 2, which depends on this PR landing first).
Independent of ADR-0026 PR 1 at the schema level — both can ship in parallel; ADR-0026 PR 2 depends on both.
## What lands
| File | Change |
| --- | --- |
| `apps/portal-bff/prisma/schema.prisma` | **+3 models**. `Region` (INSEE code PK + name + delegations[]). `Delegation` (dept code PK + name + regionCode FK + structures[]). `Structure` (portal code PK + name + kind discriminator + nullable unique finess/siret/codePaie + nullable delegationCode FK). All in the `public` schema; matches the ADR-0027 schema sketch verbatim. |
| `apps/portal-bff/prisma/migrations/20260526143000_add_org_hierarchy/migration.sql` | **New** hand-written migration. DDL for the 3 tables. `CHECK ("kind" IN (...))` constraint mirroring `STRUCTURE_KINDS`. Indexes (FK columns + kind + uniques). Inline INSERT seed: Région Nouvelle-Aquitaine (75), Délégation Gironde (33), structures `0330800013` + `0330800021` (médico-social, FINESS = code) + `siege` (APF national, no delegation/finess). |
| `apps/portal-bff/src/structures/structure-kind.ts` | **New**. Closed-set catalogue: `STRUCTURE_KINDS = [medico_social, antenne, dispositif, entreprise_adaptee, mouvement, administratif, siege] as const`. `type StructureKind` derived from the union, `isStructureKind` type guard. |
| `apps/portal-bff/src/structures/structure-kind.spec.ts` | **New**. Jest spec — catalogue content, no duplicates, type guard true for catalogue values + false for typos / cascade-only values / empty, type narrowing at call site. |
| `scripts/check-catalogue-drift.mjs` | **Extend**. New `extractStructureKinds(path)` + `findStructureKindViolationsInFile(path, validKinds, sourceText?)`. Property-literal scanner: detects `kind: 'X'` in object literals, restricted to files that import from `structure-kind.ts` (cheap text pre-filter — `kind` is a common property name on unrelated objects and we'd false-positive everywhere otherwise). Integrated into `scanWorkspace`. Error-message formatter switched on callee shape (`@Foo('x')` for decorators, `kind: 'x'` for property literals). Closing hint updated to reference both ADR-0025 and ADR-0027 catalogue locations. |
| `scripts/check-catalogue-drift.spec.mjs` | **Extend**. Fixture writes a synthesised `structure-kind.ts` alongside `authorization.types.ts`. New tests: extract STRUCTURE_KINDS, throw on missing constant, skip files without the import, no-violation on catalogue values, flag off-catalogue values, skip non-literal initialisers, line/column tracking, scanWorkspace aggregation (decorator + Structure.kind together), scanWorkspace exposes the structureKinds set. **22 tests total, all passing.** |
## Defense in depth
Three layers stack for `Structure.kind`, deliberately:
1. **TypeScript type union** `StructureKind` — compile-time check at every typed assignment.
2. **Postgres `CHECK` constraint** in the migration — runtime enforcement at INSERT / UPDATE, defends raw SQL / casts / untrusted API input.
3. **`scripts/check-catalogue-drift.mjs`** — CI gate asserting every `kind: 'X'` literal in structure-context files is in the catalogue.
The `Privilege` / `FunctionalRole` catalogues from ADR-0025 only have layer 1 + layer 3 (no DB enforcement — those values aren't persisted as schema-checked columns). ADR-0027's `Structure.kind` is persisted, so layer 2 was practical to add — bulletproof against any code path that bypasses the type system.
## Seed scope (and what's deliberately NOT in it)
Just what the 19 test-tenant personas reference per `notes/test-tenant-role-assignments.md`:
- `Region` 75 Nouvelle-Aquitaine (only region the personas exercise)
- `Delegation` 33 Gironde (only delegation)
- `Structure` 0330800013 (APF Bordeaux, medico-social, FINESS = code)
- `Structure` 0330800021 (Complexe Mérignac, medico-social)
- `Structure` `siege` (APF national, kind=siege, no FK to a delegation, no FINESS)
**No** placeholder `entreprise_adaptee`, `antenne`, or `dispositif` row — those kinds are valid per the catalogue but the test tenant doesn't exercise them, and adding gold-plate seed data would be misleading ("what is this row used for?"). The full APF inventory lands with [ADR-0029](#)'s cascade sync; this seed is **superseded** (not extended) by that sync.
## Notes for the reviewer
- **Naming conflict with the existing `User` model.** The current `schema.prisma` already has a `User` model — but it's the ADR-0020 user-directory cache (Entra `oid` as PK, written by `UserDirectoryService.recordSignIn`). ADR-0026 PR 1 introduces a different `User` (UUID PK, FK to `Person`, `lastSignInAt`). **Out of scope here** — ADR-0027 PR 1 doesn't touch `User`. Flagging now so ADR-0026 PR 1 can plan the migration path (likely: rename the existing `User` to `UserDirectoryEntry` or fold it into the new Person + User pair).
- **Migration is hand-written**, matching the style of the two existing migrations (`init_audit_schema`, `users_directory`). Timestamp `20260526143000` chosen so it sorts after the existing `20260514192014_users_directory`.
- **`@@schema("public")`** required on every new model because the audit log uses `multiSchema` (per ADR-0013) — the public/audit split is configured at the datasource.
- **Drift gate error-message formatter** now switches on callee shape — decorator violations still print as `@Foo('x')`, property-literal violations print as `kind: 'x'` to match the offending code shape.
- **No `pnpm ci:check` impact expected** at the bff level beyond the new spec; `pnpm ci:catalogue-drift` continues to report clean (`catalogues: 4 privileges, 24 roles, 7 structure kinds`).
## Test plan
- [x] `node scripts/check-catalogue-drift.mjs` — clean (4 / 24 / 7).
- [x] `node --test scripts/check-catalogue-drift.spec.mjs` — 22 tests passing.
- [x] `pnpm exec prettier --check` clean on the touched files.
- [ ] **On the dev VM**: `pnpm prisma migrate dev` applies the migration cleanly against a fresh `infra/local/dev.compose.yml` postgres. `pnpm prisma studio` shows the seeded Region / Delegation / Structure rows.
- [ ] **On the dev VM**: `pnpm exec nx test portal-bff` runs the new `structure-kind.spec.ts` green.
- [ ] **Review focus** — the `Structure` model shape (kind discriminator, nullable unique columns, FK to Delegation), the inline seed values vs `notes/test-tenant-role-assignments.md`, the drift-gate property-literal scanner's restriction to files importing from `structure-kind.ts`.
## What's next
Per [ADR-0027 §"Phasing"](docs/decisions/0027-portal-side-organisational-hierarchy.md):
1. **This PR** — Region / Delegation / Structure schema + seed + drift gate. ✅
2. **ADR-0026 PR 1** — `Person` / `User` / `UserScope` schema + `PersonAndUserProvisioner` + drift gate extension for `Person.source` + updated `PrincipalBuilder`. Independent of (1), can ship in parallel. **Needs to resolve the existing-`User`-name collision.**
3. **ADR-0026 PR 2** — `PrismaScopeResolver` replacing `StubScopeResolver` + `/admin/users/:id/scopes` admin screen + `prisma/seed.ts` populating the 19 personas' `user_scopes` rows pointing at this PR's `Structure.code` values. **Depends on both (1) and (2).**
4. **ADR-0029** (future) — Pléiades + Acteurs+ + cascade syncs + facet schemas + `Pole` / `Service` / per-source enrichment extensions to this PR's hierarchy.
---------
Co-authored-by: Julien Gautier <julien.gautier@apf.asso.fr>
Reviewed-on: #228
358 lines
12 KiB
JavaScript
358 lines
12 KiB
JavaScript
/**
|
|
* Tests for `check-catalogue-drift.mjs`. Run via:
|
|
* node --test scripts/check-catalogue-drift.spec.mjs
|
|
*
|
|
* Uses Node's built-in test runner (no Vitest / Jest dependency)
|
|
* because the script itself has no per-app project hosting it;
|
|
* shipping a third test runner just for this one file would be
|
|
* overkill.
|
|
*/
|
|
|
|
import { describe, it } from 'node:test';
|
|
import assert from 'node:assert/strict';
|
|
import { mkdirSync, mkdtempSync, writeFileSync } from 'node:fs';
|
|
import { tmpdir } from 'node:os';
|
|
import { join } from 'node:path';
|
|
import {
|
|
extractCatalogues,
|
|
extractStructureKinds,
|
|
findStructureKindViolationsInFile,
|
|
findViolationsInFile,
|
|
scanWorkspace,
|
|
} from './check-catalogue-drift.mjs';
|
|
|
|
/**
|
|
* Build a self-contained workspace fixture with:
|
|
* - a synthesised authorization.types.ts file mirroring the real
|
|
* catalogue declarations,
|
|
* - a bag of .ts files under apps/ + libs/ exercising the
|
|
* decorators with whichever values the caller asks for.
|
|
*/
|
|
function makeFixture({ files }) {
|
|
const root = mkdtempSync(join(tmpdir(), 'drift-fixture-'));
|
|
mkdirSync(join(root, 'libs/shared/auth/src/lib'), { recursive: true });
|
|
writeFileSync(
|
|
join(root, 'libs/shared/auth/src/lib/authorization.types.ts'),
|
|
`export const PRIVILEGES = [
|
|
'Portal.Admin',
|
|
'Portal.Auditor',
|
|
] as const;
|
|
export const FUNCTIONAL_ROLES = [
|
|
'collaborateur',
|
|
'rh',
|
|
'dpo',
|
|
] as const;
|
|
export const SCOPE_KINDS = [
|
|
'self',
|
|
'unrestricted',
|
|
] as const;
|
|
`,
|
|
);
|
|
mkdirSync(join(root, 'apps/portal-bff/src/structures'), { recursive: true });
|
|
writeFileSync(
|
|
join(root, 'apps/portal-bff/src/structures/structure-kind.ts'),
|
|
`export const STRUCTURE_KINDS = [
|
|
'medico_social',
|
|
'antenne',
|
|
'siege',
|
|
] as const;
|
|
export type StructureKind = (typeof STRUCTURE_KINDS)[number];
|
|
`,
|
|
);
|
|
for (const [relativePath, contents] of Object.entries(files)) {
|
|
const full = join(root, relativePath);
|
|
mkdirSync(join(full, '..'), { recursive: true });
|
|
writeFileSync(full, contents);
|
|
}
|
|
return root;
|
|
}
|
|
|
|
describe('extractCatalogues', () => {
|
|
it('reads the three closed catalogues from authorization.types.ts', () => {
|
|
const root = makeFixture({ files: {} });
|
|
const cataloguePath = join(root, 'libs/shared/auth/src/lib/authorization.types.ts');
|
|
const cats = extractCatalogues(cataloguePath);
|
|
assert.deepEqual([...cats.PRIVILEGES].sort(), ['Portal.Admin', 'Portal.Auditor']);
|
|
assert.deepEqual([...cats.FUNCTIONAL_ROLES].sort(), ['collaborateur', 'dpo', 'rh']);
|
|
});
|
|
|
|
it('throws when the catalogue file omits an expected declaration', () => {
|
|
const root = mkdtempSync(join(tmpdir(), 'drift-fixture-'));
|
|
mkdirSync(join(root, 'libs/shared/auth/src/lib'), { recursive: true });
|
|
writeFileSync(
|
|
join(root, 'libs/shared/auth/src/lib/authorization.types.ts'),
|
|
`export const PRIVILEGES = ['Portal.Admin'] as const;\n`,
|
|
);
|
|
assert.throws(
|
|
() => extractCatalogues(join(root, 'libs/shared/auth/src/lib/authorization.types.ts')),
|
|
/FUNCTIONAL_ROLES/,
|
|
);
|
|
});
|
|
});
|
|
|
|
describe('findViolationsInFile', () => {
|
|
const catalogues = {
|
|
PRIVILEGES: new Set(['Portal.Admin', 'Portal.Auditor']),
|
|
FUNCTIONAL_ROLES: new Set(['collaborateur', 'rh', 'dpo']),
|
|
};
|
|
|
|
it('returns no violations on a file that uses only catalogue values', () => {
|
|
const text = `
|
|
class Foo {
|
|
@RequirePrivilege('Portal.Admin')
|
|
@RequireRole('rh', 'collaborateur')
|
|
method() {}
|
|
}
|
|
`;
|
|
const violations = findViolationsInFile('virtual.ts', catalogues, text);
|
|
assert.equal(violations.length, 0);
|
|
});
|
|
|
|
it('flags every off-catalogue privilege value', () => {
|
|
const text = `
|
|
class Foo {
|
|
@RequirePrivilege('Portal.Admin', 'Portal.Bogus')
|
|
method() {}
|
|
}
|
|
`;
|
|
const violations = findViolationsInFile('virtual.ts', catalogues, text);
|
|
assert.equal(violations.length, 1);
|
|
assert.equal(violations[0].callee, 'RequirePrivilege');
|
|
assert.equal(violations[0].value, 'Portal.Bogus');
|
|
assert.equal(violations[0].catalogue, 'PRIVILEGES');
|
|
});
|
|
|
|
it('flags every off-catalogue role value', () => {
|
|
const text = `
|
|
class Foo {
|
|
@RequireRole('rh', 'rogue-role')
|
|
method() {}
|
|
}
|
|
`;
|
|
const violations = findViolationsInFile('virtual.ts', catalogues, text);
|
|
assert.equal(violations.length, 1);
|
|
assert.equal(violations[0].callee, 'RequireRole');
|
|
assert.equal(violations[0].value, 'rogue-role');
|
|
assert.equal(violations[0].catalogue, 'FUNCTIONAL_ROLES');
|
|
});
|
|
|
|
it('skips non-literal arguments (variable indirection)', () => {
|
|
// A real-world escape hatch — TypeScript catches this at
|
|
// compile time via the decorator signature, the drift gate is
|
|
// best-effort here.
|
|
const text = `
|
|
const slug = 'rogue-role';
|
|
class Foo {
|
|
@RequireRole(slug)
|
|
method() {}
|
|
}
|
|
`;
|
|
const violations = findViolationsInFile('virtual.ts', catalogues, text);
|
|
assert.equal(violations.length, 0);
|
|
});
|
|
|
|
it('also detects the literal when the decorator is invoked as a function call (non-decorator usage)', () => {
|
|
// A test fixture might call RequirePrivilege as a function to
|
|
// produce a decorator value for a manual UseGuards pattern; the
|
|
// call site shape is identical so the script catches it.
|
|
const text = `
|
|
const dec = RequirePrivilege('Portal.Bogus');
|
|
`;
|
|
const violations = findViolationsInFile('virtual.ts', catalogues, text);
|
|
assert.equal(violations.length, 1);
|
|
assert.equal(violations[0].value, 'Portal.Bogus');
|
|
});
|
|
|
|
it('reports line and column of the offending literal', () => {
|
|
const text = ['line1', 'line2', " @RequireRole('rogue-role')"].join('\n');
|
|
const violations = findViolationsInFile('virtual.ts', catalogues, text);
|
|
assert.equal(violations.length, 1);
|
|
assert.equal(violations[0].line, 3);
|
|
// The literal starts at column 16 (0-indexed 15, +1 in the report).
|
|
assert.equal(violations[0].column, 16);
|
|
});
|
|
});
|
|
|
|
describe('extractStructureKinds', () => {
|
|
it('reads the STRUCTURE_KINDS catalogue from structure-kind.ts', () => {
|
|
const root = makeFixture({ files: {} });
|
|
const kinds = extractStructureKinds(
|
|
join(root, 'apps/portal-bff/src/structures/structure-kind.ts'),
|
|
);
|
|
assert.deepEqual([...kinds].sort(), ['antenne', 'medico_social', 'siege']);
|
|
});
|
|
|
|
it('throws when the constant is missing', () => {
|
|
const root = mkdtempSync(join(tmpdir(), 'drift-fixture-'));
|
|
mkdirSync(join(root, 'apps/portal-bff/src/structures'), { recursive: true });
|
|
writeFileSync(
|
|
join(root, 'apps/portal-bff/src/structures/structure-kind.ts'),
|
|
`export const NOT_STRUCTURE_KINDS = ['foo'] as const;\n`,
|
|
);
|
|
assert.throws(
|
|
() =>
|
|
extractStructureKinds(join(root, 'apps/portal-bff/src/structures/structure-kind.ts')),
|
|
/STRUCTURE_KINDS/,
|
|
);
|
|
});
|
|
});
|
|
|
|
describe('findStructureKindViolationsInFile', () => {
|
|
const validKinds = new Set(['medico_social', 'antenne', 'siege']);
|
|
|
|
it('skips files that do not import structure-kind (would false-positive)', () => {
|
|
// `kind: 'whatever'` is a common pattern on unrelated objects.
|
|
// Without the import filter, every such literal would be flagged.
|
|
const text = `
|
|
const event = { kind: 'somenoise', payload: {} };
|
|
`;
|
|
const violations = findStructureKindViolationsInFile('virtual.ts', validKinds, text);
|
|
assert.equal(violations.length, 0);
|
|
});
|
|
|
|
it('returns no violations when every kind literal is in the catalogue', () => {
|
|
const text = `
|
|
import type { StructureKind } from '../structures/structure-kind';
|
|
const a = { kind: 'medico_social' as StructureKind };
|
|
const b = { kind: 'siege' as StructureKind };
|
|
`;
|
|
const violations = findStructureKindViolationsInFile('virtual.ts', validKinds, text);
|
|
assert.equal(violations.length, 0);
|
|
});
|
|
|
|
it('flags every kind literal not in the catalogue', () => {
|
|
const text = `
|
|
import { STRUCTURE_KINDS } from '../structures/structure-kind';
|
|
const a = { kind: 'medico_social' };
|
|
const b = { kind: 'medical_social' };
|
|
const c = { kind: 'sanitaire' };
|
|
`;
|
|
const violations = findStructureKindViolationsInFile('virtual.ts', validKinds, text);
|
|
assert.equal(violations.length, 2);
|
|
const values = violations.map((v) => v.value).sort();
|
|
assert.deepEqual(values, ['medical_social', 'sanitaire']);
|
|
assert.equal(violations[0].callee, 'Structure.kind');
|
|
assert.equal(violations[0].catalogue, 'STRUCTURE_KINDS');
|
|
});
|
|
|
|
it('skips non-literal initialisers (variable indirection)', () => {
|
|
// The TypeScript signature catches this at compile time when the
|
|
// target type is `StructureKind` — the gate is best-effort here.
|
|
const text = `
|
|
import { STRUCTURE_KINDS } from '../structures/structure-kind';
|
|
const k = 'something';
|
|
const a = { kind: k };
|
|
`;
|
|
const violations = findStructureKindViolationsInFile('virtual.ts', validKinds, text);
|
|
assert.equal(violations.length, 0);
|
|
});
|
|
|
|
it('reports line and column of the offending literal', () => {
|
|
const text = [
|
|
`import { STRUCTURE_KINDS } from '../structures/structure-kind';`,
|
|
`const x = {`,
|
|
` kind: 'rogue-kind',`,
|
|
`};`,
|
|
].join('\n');
|
|
const violations = findStructureKindViolationsInFile('virtual.ts', validKinds, text);
|
|
assert.equal(violations.length, 1);
|
|
assert.equal(violations[0].line, 3);
|
|
// 'rogue-kind' literal starts at column 9 (0-indexed 8, +1 in the report).
|
|
assert.equal(violations[0].column, 9);
|
|
});
|
|
});
|
|
|
|
describe('scanWorkspace', () => {
|
|
it('returns 0 violations on a clean fixture', () => {
|
|
const root = makeFixture({
|
|
files: {
|
|
'apps/x/src/main.ts': `
|
|
class Foo {
|
|
@RequirePrivilege('Portal.Admin')
|
|
@RequireRole('rh', 'collaborateur')
|
|
m() {}
|
|
}
|
|
`,
|
|
},
|
|
});
|
|
const { violations } = scanWorkspace(root);
|
|
assert.equal(violations.length, 0);
|
|
});
|
|
|
|
it('aggregates violations across multiple files', () => {
|
|
const root = makeFixture({
|
|
files: {
|
|
'apps/x/src/a.ts': `
|
|
@RequirePrivilege('Portal.Ghost') class A {}
|
|
`,
|
|
'libs/y/src/b.ts': `
|
|
@RequireRole('phantom-role') class B {}
|
|
`,
|
|
},
|
|
});
|
|
const { violations } = scanWorkspace(root);
|
|
assert.equal(violations.length, 2);
|
|
const values = violations.map((v) => v.value).sort();
|
|
assert.deepEqual(values, ['Portal.Ghost', 'phantom-role']);
|
|
});
|
|
|
|
it('skips dist/ and node_modules/ folders even when they contain decorator calls', () => {
|
|
const root = makeFixture({
|
|
files: {
|
|
'apps/x/dist/built.ts': `@RequireRole('rogue-role') class X {}`,
|
|
'apps/x/node_modules/whatever/foo.ts': `@RequireRole('also-rogue') class Y {}`,
|
|
},
|
|
});
|
|
const { violations } = scanWorkspace(root);
|
|
assert.equal(violations.length, 0);
|
|
});
|
|
|
|
it('skips the generated gRPC stubs (different `roles` semantics)', () => {
|
|
const root = makeFixture({
|
|
files: {
|
|
'apps/portal-bff/src/grpc/gen/apf-ai/common.ts': `
|
|
// Codegen output: this is NOT an ADR-0025 decorator call,
|
|
// it just happens to share an identifier.
|
|
@RequireRole('not-a-real-role') class FromGen {}
|
|
`,
|
|
},
|
|
});
|
|
const { violations } = scanWorkspace(root);
|
|
assert.equal(violations.length, 0);
|
|
});
|
|
|
|
it('does NOT skip spec files (deliberate decorator usage in tests must stay in sync)', () => {
|
|
const root = makeFixture({
|
|
files: {
|
|
'libs/y/src/y.spec.ts': `
|
|
@RequireRole('rogue-role') class TestSubject {}
|
|
`,
|
|
},
|
|
});
|
|
const { violations } = scanWorkspace(root);
|
|
assert.equal(violations.length, 1);
|
|
});
|
|
|
|
it('aggregates decorator + Structure.kind violations together', () => {
|
|
const root = makeFixture({
|
|
files: {
|
|
'apps/portal-bff/src/foo.ts': `
|
|
import { STRUCTURE_KINDS } from './structures/structure-kind';
|
|
@RequirePrivilege('Portal.Ghost') class Bad {}
|
|
const s = { kind: 'phantom_kind' };
|
|
`,
|
|
},
|
|
});
|
|
const { violations } = scanWorkspace(root);
|
|
assert.equal(violations.length, 2);
|
|
const values = violations.map((v) => v.value).sort();
|
|
assert.deepEqual(values, ['Portal.Ghost', 'phantom_kind']);
|
|
});
|
|
|
|
it('returns the structureKinds set alongside catalogues', () => {
|
|
const root = makeFixture({ files: {} });
|
|
const { structureKinds } = scanWorkspace(root);
|
|
assert.deepEqual([...structureKinds].sort(), ['antenne', 'medico_social', 'siege']);
|
|
});
|
|
});
|