From 67997dc9c722f4b6730dc7abbcc59ec9f37b970b Mon Sep 17 00:00:00 2001 From: &mile Date: Thu, 9 Jul 2026 15:45:39 +0200 Subject: [PATCH] =?UTF-8?q?fix(api):=20route=20ordering=20=E2=80=94=20lite?= =?UTF-8?q?ral=20paths=20before=20param=20paths?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - entries: entryLinesRoutes (.../entries/lines) registered before (.../entries/:idEntry) so requests to /entries/lines are not greedily caught by /entries/:idEntry with idEntry='lines' - computations: computationIncomeStatementsRoutes (.../computations/income-statements) registered before readOneComputationRoute (.../computations/:idComputation) for the same reason --- .../$idOrganization/years/$idYear/entries/entriesRoutes.ts | 4 +++- .../computations/$idComputation/$idComputationRoutes.ts | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/api/src/routes/auth/organizations/$idOrganization/years/$idYear/entries/entriesRoutes.ts b/packages/api/src/routes/auth/organizations/$idOrganization/years/$idYear/entries/entriesRoutes.ts index aa893573..81ad476f 100644 --- a/packages/api/src/routes/auth/organizations/$idOrganization/years/$idYear/entries/entriesRoutes.ts +++ b/packages/api/src/routes/auth/organizations/$idOrganization/years/$idYear/entries/entriesRoutes.ts @@ -12,7 +12,9 @@ export const entriesRoutes = [ readAllEntriesRoute, readAllEntryTagsRoute, - ...$idEntryRoutes, + // entryLinesRoutes must come before $idEntryRoutes so that + // .../entries/lines matches before .../entries/:idEntry ...entryLinesRoutes, + ...$idEntryRoutes, ...entryTagsRoutes, ] diff --git a/packages/api/src/routes/auth/organizations/$idOrganization/years/$idYear/yearSettings/computations/$idComputation/$idComputationRoutes.ts b/packages/api/src/routes/auth/organizations/$idOrganization/years/$idYear/yearSettings/computations/$idComputation/$idComputationRoutes.ts index 3295d003..472e69a8 100644 --- a/packages/api/src/routes/auth/organizations/$idOrganization/years/$idYear/yearSettings/computations/$idComputation/$idComputationRoutes.ts +++ b/packages/api/src/routes/auth/organizations/$idOrganization/years/$idYear/yearSettings/computations/$idComputation/$idComputationRoutes.ts @@ -5,8 +5,11 @@ import { updateOneComputationRoute } from "./updateOneComputation.js" export const $idComputationRoutes = [ deleteOneComputationRoute, - readOneComputationRoute, updateOneComputationRoute, + // computationIncomeStatementsRoutes must come before readOneComputation so that + // .../computations/income-statements matches before .../computations/:idComputation ...computationIncomeStatementsRoutes, + + readOneComputationRoute, ]