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, ]