From 789fd4ec3e81b23b2e9c58464d21b679c315239a Mon Sep 17 00:00:00 2001 From: david Date: Sun, 14 Jun 2026 21:15:57 +0200 Subject: [PATCH] . --- .../express/payment-methods.routes.ts | 34 +++++++++------ .../express/payment-terms.routes.ts | 34 +++++++++------ .../express/tax-definitions.routes.ts | 20 ++++----- .../tax-regimes/express/tax-regimes.routes.ts | 43 +++++++++++++------ .../use-update-proforma-tax-controller.ts | 1 + 5 files changed, 81 insertions(+), 51 deletions(-) diff --git a/modules/catalogs/src/api/infrastructure/payment-methods/express/payment-methods.routes.ts b/modules/catalogs/src/api/infrastructure/payment-methods/express/payment-methods.routes.ts index 4f9c0194..34368d0d 100644 --- a/modules/catalogs/src/api/infrastructure/payment-methods/express/payment-methods.routes.ts +++ b/modules/catalogs/src/api/infrastructure/payment-methods/express/payment-methods.routes.ts @@ -48,20 +48,28 @@ export const paymentMethodsRouter = (params: StartParams) => { // ---------------------------------------------- - router.get("/", validateRequest(ListPaymentMethodsRequestSchema, "query"), (req, res, next) => { - const controller = new ListPaymentMethodsController(deps.useCases.listPaymentMethods()); - return controller.execute(req, res, next); - }); + router.get( + "/", + validateRequest(ListPaymentMethodsRequestSchema, "params"), + (req: Request, res: Response, next: NextFunction) => { + const controller = new ListPaymentMethodsController(deps.useCases.listPaymentMethods()); + return controller.execute(req, res, next); + } + ); - router.post("/", validateRequest(CreatePaymentMethodRequestSchema, "body"), (req, res, next) => { - const controller = new CreatePaymentMethodController(deps.useCases.createPaymentMethod()); - return controller.execute(req, res, next); - }); + router.post( + "/", + validateRequest(CreatePaymentMethodRequestSchema, "body"), + (req: Request, res: Response, next: NextFunction) => { + const controller = new CreatePaymentMethodController(deps.useCases.createPaymentMethod()); + return controller.execute(req, res, next); + } + ); router.get( "/:payment_method_id", validateRequest(GetPaymentMethodByIdRequestSchema, "params"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new GetPaymentMethodByIdController(deps.useCases.getPaymentMethodById()); return controller.execute(req, res, next); } @@ -70,7 +78,7 @@ export const paymentMethodsRouter = (params: StartParams) => { router.delete( "/:payment_method_id", validateRequest(DeletePaymentMethodByIdRequestSchema, "params"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new DeletePaymentMethodByIdController( deps.useCases.deletePaymentMethodById() ); @@ -82,7 +90,7 @@ export const paymentMethodsRouter = (params: StartParams) => { "/:payment_method_id", validateRequest(UpdatePaymentMethodByIdParamsRequestSchema, "params"), validateRequest(UpdatePaymentMethodByIdRequestSchema, "body"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new UpdatePaymentMethodByIdController( deps.useCases.updatePaymentMethodById() ); @@ -93,7 +101,7 @@ export const paymentMethodsRouter = (params: StartParams) => { router.patch( "/:payment_method_id/disable", validateRequest(GetPaymentMethodByIdRequestSchema, "params"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new DisablePaymentMethodByIdController( deps.useCases.disablePaymentMethodById() ); @@ -104,7 +112,7 @@ export const paymentMethodsRouter = (params: StartParams) => { router.patch( "/:payment_method_id/enable", validateRequest(GetPaymentMethodByIdRequestSchema, "params"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new EnablePaymentMethodByIdController( deps.useCases.enablePaymentMethodById() ); diff --git a/modules/catalogs/src/api/infrastructure/payment-terms/express/payment-terms.routes.ts b/modules/catalogs/src/api/infrastructure/payment-terms/express/payment-terms.routes.ts index 93e54b51..024e8a07 100644 --- a/modules/catalogs/src/api/infrastructure/payment-terms/express/payment-terms.routes.ts +++ b/modules/catalogs/src/api/infrastructure/payment-terms/express/payment-terms.routes.ts @@ -42,20 +42,28 @@ export const paymentTermsRouter = (params: StartParams) => { requireCompanyContext()(req as RequestWithAuth, res, next), ]); - router.get("/", validateRequest(ListPaymentTermsRequestSchema, "query"), (req, res, next) => { - const controller = new ListPaymentTermsController(deps.useCases.listPaymentTerms()); - return controller.execute(req, res, next); - }); + router.get( + "/", + validateRequest(ListPaymentTermsRequestSchema, "params"), + (req: Request, res: Response, next: NextFunction) => { + const controller = new ListPaymentTermsController(deps.useCases.listPaymentTerms()); + return controller.execute(req, res, next); + } + ); - router.post("/", validateRequest(CreatePaymentTermRequestSchema, "body"), (req, res, next) => { - const controller = new CreatePaymentTermController(deps.useCases.createPaymentTerm()); - return controller.execute(req, res, next); - }); + router.post( + "/", + validateRequest(CreatePaymentTermRequestSchema, "body"), + (req: Request, res: Response, next: NextFunction) => { + const controller = new CreatePaymentTermController(deps.useCases.createPaymentTerm()); + return controller.execute(req, res, next); + } + ); router.get( "/:payment_term_id", validateRequest(GetPaymentTermByIdRequestSchema, "params"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new GetPaymentTermByIdController(deps.useCases.getPaymentTermById()); return controller.execute(req, res, next); } @@ -64,7 +72,7 @@ export const paymentTermsRouter = (params: StartParams) => { router.delete( "/:payment_term_id", validateRequest(DeletePaymentTermByIdRequestSchema, "params"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new DeletePaymentTermByIdController(deps.useCases.deletePaymentTermById()); return controller.execute(req, res, next); } @@ -74,7 +82,7 @@ export const paymentTermsRouter = (params: StartParams) => { "/:payment_term_id", validateRequest(UpdatePaymentTermByIdParamsRequestSchema, "params"), validateRequest(UpdatePaymentTermByIdRequestSchema, "body"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new UpdatePaymentTermByIdController(deps.useCases.updatePaymentTermById()); return controller.execute(req, res, next); } @@ -83,7 +91,7 @@ export const paymentTermsRouter = (params: StartParams) => { router.patch( "/:payment_term_id/disable", validateRequest(GetPaymentTermByIdRequestSchema, "params"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new DisablePaymentTermByIdController( deps.useCases.disablePaymentTermById() ); @@ -94,7 +102,7 @@ export const paymentTermsRouter = (params: StartParams) => { router.patch( "/:payment_term_id/enable", validateRequest(GetPaymentTermByIdRequestSchema, "params"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new EnablePaymentTermByIdController(deps.useCases.enablePaymentTermById()); return controller.execute(req, res, next); } diff --git a/modules/catalogs/src/api/infrastructure/tax-definitions/express/tax-definitions.routes.ts b/modules/catalogs/src/api/infrastructure/tax-definitions/express/tax-definitions.routes.ts index 186de34e..329678d1 100644 --- a/modules/catalogs/src/api/infrastructure/tax-definitions/express/tax-definitions.routes.ts +++ b/modules/catalogs/src/api/infrastructure/tax-definitions/express/tax-definitions.routes.ts @@ -44,8 +44,8 @@ export const taxDefinitionsRouter = (params: StartParams) => { router.get( "/", - validateRequest(ListTaxDefinitionsRequestSchema, "query"), - (req, res, next) => { + validateRequest(ListTaxDefinitionsRequestSchema, "params"), + (req: Request, res: Response, next: NextFunction) => { const controller = new ListTaxDefinitionsController(deps.useCases.listTaxDefinitions()); return controller.execute(req, res, next); } @@ -54,7 +54,7 @@ export const taxDefinitionsRouter = (params: StartParams) => { router.post( "/", validateRequest(CreateTaxDefinitionRequestSchema, "body"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new CreateTaxDefinitionController(deps.useCases.createTaxDefinition()); return controller.execute(req, res, next); } @@ -63,10 +63,8 @@ export const taxDefinitionsRouter = (params: StartParams) => { router.get( "/:tax_definition_id", validateRequest(GetTaxDefinitionByIdRequestSchema, "params"), - (req, res, next) => { - const controller = new GetTaxDefinitionByIdController( - deps.useCases.getTaxDefinitionById() - ); + (req: Request, res: Response, next: NextFunction) => { + const controller = new GetTaxDefinitionByIdController(deps.useCases.getTaxDefinitionById()); return controller.execute(req, res, next); } ); @@ -74,7 +72,7 @@ export const taxDefinitionsRouter = (params: StartParams) => { router.delete( "/:tax_definition_id", validateRequest(DeleteTaxDefinitionByIdRequestSchema, "params"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new DeleteTaxDefinitionByIdController( deps.useCases.deleteTaxDefinitionById() ); @@ -86,7 +84,7 @@ export const taxDefinitionsRouter = (params: StartParams) => { "/:tax_definition_id", validateRequest(UpdateTaxDefinitionByIdParamsRequestSchema, "params"), validateRequest(UpdateTaxDefinitionByIdRequestSchema, "body"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new UpdateTaxDefinitionByIdController( deps.useCases.updateTaxDefinitionById() ); @@ -97,7 +95,7 @@ export const taxDefinitionsRouter = (params: StartParams) => { router.patch( "/:tax_definition_id/disable", validateRequest(GetTaxDefinitionByIdRequestSchema, "params"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new DisableTaxDefinitionByIdController( deps.useCases.disableTaxDefinitionById() ); @@ -108,7 +106,7 @@ export const taxDefinitionsRouter = (params: StartParams) => { router.patch( "/:tax_definition_id/enable", validateRequest(GetTaxDefinitionByIdRequestSchema, "params"), - (req, res, next) => { + (req: Request, res: Response, next: NextFunction) => { const controller = new EnableTaxDefinitionByIdController( deps.useCases.enableTaxDefinitionById() ); diff --git a/modules/catalogs/src/api/infrastructure/tax-regimes/express/tax-regimes.routes.ts b/modules/catalogs/src/api/infrastructure/tax-regimes/express/tax-regimes.routes.ts index 2d4d95ad..f1f4f577 100644 --- a/modules/catalogs/src/api/infrastructure/tax-regimes/express/tax-regimes.routes.ts +++ b/modules/catalogs/src/api/infrastructure/tax-regimes/express/tax-regimes.routes.ts @@ -42,29 +42,41 @@ export const taxRegimesRouter = (params: StartParams) => { requireCompanyContext()(req as RequestWithAuth, res, next), ]); - router.get("/", validateRequest(ListTaxRegimesRequestSchema, "query"), (req, res, next) => { - const controller = new ListTaxRegimesController(deps.useCases.listTaxRegimes()); - return controller.execute(req, res, next); - }); - - router.post("/", validateRequest(CreateTaxRegimeRequestSchema, "body"), (req, res, next) => { - const controller = new CreateTaxRegimeController(deps.useCases.createTaxRegime()); - return controller.execute(req, res, next); - }); + router.get( + "/", + //checkTabContext, + validateRequest(ListTaxRegimesRequestSchema, "params"), + async (req: Request, res: Response, next: NextFunction) => { + const controller = new ListTaxRegimesController(deps.useCases.listTaxRegimes()); + return controller.execute(req, res, next); + } + ); router.get( "/:tax_regime_id", + //checkTabContext, validateRequest(GetTaxRegimeByIdRequestSchema, "params"), - (req, res, next) => { + async (req: Request, res: Response, next: NextFunction) => { const controller = new GetTaxRegimeByIdController(deps.useCases.getTaxRegimeById()); return controller.execute(req, res, next); } ); + router.post( + "/", + //checkTabContext, + validateRequest(CreateTaxRegimeRequestSchema, "body"), + async (req: Request, res: Response, next: NextFunction) => { + const controller = new CreateTaxRegimeController(deps.useCases.createTaxRegime()); + return controller.execute(req, res, next); + } + ); + router.delete( "/:tax_regime_id", + //checkTabContext, validateRequest(DeleteTaxRegimeByIdRequestSchema, "params"), - (req, res, next) => { + async (req: Request, res: Response, next: NextFunction) => { const controller = new DeleteTaxRegimeByIdController(deps.useCases.deleteTaxRegimeById()); return controller.execute(req, res, next); } @@ -72,9 +84,10 @@ export const taxRegimesRouter = (params: StartParams) => { router.put( "/:tax_regime_id", + //checkTabContext, validateRequest(UpdateTaxRegimeByIdParamsRequestSchema, "params"), validateRequest(UpdateTaxRegimeByIdRequestSchema, "body"), - (req, res, next) => { + async (req: Request, res: Response, next: NextFunction) => { const controller = new UpdateTaxRegimeByIdController(deps.useCases.updateTaxRegimeById()); return controller.execute(req, res, next); } @@ -82,8 +95,9 @@ export const taxRegimesRouter = (params: StartParams) => { router.patch( "/:tax_regime_id/disable", + //checkTabContext, validateRequest(GetTaxRegimeByIdRequestSchema, "params"), - (req, res, next) => { + async (req: Request, res: Response, next: NextFunction) => { const controller = new DisableTaxRegimeByIdController(deps.useCases.disableTaxRegimeById()); return controller.execute(req, res, next); } @@ -91,8 +105,9 @@ export const taxRegimesRouter = (params: StartParams) => { router.patch( "/:tax_regime_id/enable", + //checkTabContext, validateRequest(GetTaxRegimeByIdRequestSchema, "params"), - (req, res, next) => { + async (req: Request, res: Response, next: NextFunction) => { const controller = new EnableTaxRegimeByIdController(deps.useCases.enableTaxRegimeById()); return controller.execute(req, res, next); } diff --git a/modules/customer-invoices/src/web/proformas/update/controllers/use-update-proforma-tax-controller.ts b/modules/customer-invoices/src/web/proformas/update/controllers/use-update-proforma-tax-controller.ts index 8c3f4d43..55df794f 100644 --- a/modules/customer-invoices/src/web/proformas/update/controllers/use-update-proforma-tax-controller.ts +++ b/modules/customer-invoices/src/web/proformas/update/controllers/use-update-proforma-tax-controller.ts @@ -46,6 +46,7 @@ export const useUpdateProformaTaxController = ({ form }: UseUpdateProformaTaxCon const taxRegimesQuery = useTaxRegimesListQuery({ criteria: { + pageSize: 999, filters: [ { field: "isActive",