From 12331c8c48841215dd5a6a291fef6a945b57ecf0 Mon Sep 17 00:00:00 2001 From: David Arranz Date: Sun, 8 Sep 2024 18:46:17 +0200 Subject: [PATCH] . --- .../express/controllers/profileMiddleware.ts | 10 ++--- .../express/ExpressController.ts | 14 +++---- .../express/ExpressErrorResponse.ts | 8 ++-- .../infrastructure/express/middlewares.ts | 16 ++++---- .../sales/application/Dealer/index.ts | 7 ++-- .../controllers/dealers/createDealer/index.ts | 8 +--- .../controllers/dealers/deleteDealer/index.ts | 1 - .../controllers/dealers/getDealer/index.ts | 8 +--- .../dealers/getDealerByUser/index.ts | 8 +--- .../controllers/dealers/listDealers/index.ts | 8 +--- .../controllers/dealers/updateDealer/index.ts | 1 - .../controllers/quotes/createQuote/index.ts | 8 +--- .../controllers/quotes/deleteQuote/index.ts | 8 +--- .../controllers/quotes/getQuote/index.ts | 8 +--- .../controllers/quotes/listQuotes/index.ts | 8 +--- .../controllers/quotes/reportQuote/index.ts | 8 +--- .../quotes/setStatusQuote/index.ts | 8 +--- .../controllers/quotes/updateQuote/index.ts | 8 +--- .../express/api/routes/catalog.routes.ts | 13 +++--- .../express/api/routes/dealers.routes.ts | 6 +-- .../express/api/routes/profile.routes.ts | 20 ++++----- .../express/api/routes/quote.routes.ts | 6 +-- .../express/api/routes/users.routes.ts | 41 ++++++------------- server/src/infrastructure/express/api/v1.ts | 6 +-- server/tsconfig.eslint.json | 2 +- server/tsconfig.json | 10 ++++- 26 files changed, 92 insertions(+), 157 deletions(-) diff --git a/server/src/contexts/auth/infrastructure/express/controllers/profileMiddleware.ts b/server/src/contexts/auth/infrastructure/express/controllers/profileMiddleware.ts index 901553d..f1e7ca7 100644 --- a/server/src/contexts/auth/infrastructure/express/controllers/profileMiddleware.ts +++ b/server/src/contexts/auth/infrastructure/express/controllers/profileMiddleware.ts @@ -1,17 +1,13 @@ import { AuthUser } from "@/contexts/auth/domain"; import { generateExpressError } from "@/contexts/common/infrastructure/express"; -import * as express from "express"; +import { NextFunction, Request, Response } from "express"; import httpStatus from "http-status"; -interface AuthenticatedRequest extends express.Request { +interface AuthenticatedRequest extends Request { user?: AuthUser; } -const profileMiddleware = ( - req: express.Request, - res: express.Response, - next: express.NextFunction -) => { +const profileMiddleware = (req: Request, res: Response, next: NextFunction) => { const _req = req as AuthenticatedRequest; const user = _req.user; diff --git a/server/src/contexts/common/infrastructure/express/ExpressController.ts b/server/src/contexts/common/infrastructure/express/ExpressController.ts index 7636366..97d0d25 100644 --- a/server/src/contexts/common/infrastructure/express/ExpressController.ts +++ b/server/src/contexts/common/infrastructure/express/ExpressController.ts @@ -1,5 +1,5 @@ import { IError_Response_DTO } from "@shared/contexts"; -import Express from "express"; +import { NextFunction, Request, Response } from "express"; import httpStatus from "http-status"; import { URL } from "url"; import { IServerError } from "../../domain/errors"; @@ -8,16 +8,16 @@ import { InfrastructureError } from "../InfrastructureError"; import { generateExpressError } from "./ExpressErrorResponse"; export abstract class ExpressController implements IController { - protected req: Express.Request; - protected res: Express.Response; - protected next: Express.NextFunction; + protected req: Request; + protected res: Response; + protected next: NextFunction; protected serverURL: string = ""; protected file: any; protected abstract executeImpl(): Promise; - public execute(req: Express.Request, res: Express.Response, next: Express.NextFunction): void { + public execute(req: Request, res: Response, next: NextFunction): void { this.req = req; this.res = res; this.next = next; @@ -109,7 +109,7 @@ export abstract class ExpressController implements IController { return this._errorResponse(httpStatus.SERVICE_UNAVAILABLE, message); } - private _jsonResponse(statusCode: number, jsonPayload: any): Express.Response { + private _jsonResponse(statusCode: number, jsonPayload: any): Response { return this.res.status(statusCode).json(jsonPayload).send(); } @@ -117,7 +117,7 @@ export abstract class ExpressController implements IController { statusCode: number, message?: string, error?: Error | InfrastructureError - ): Express.Response { + ): Response { return generateExpressError(this.req, this.res, statusCode, message, error); } diff --git a/server/src/contexts/common/infrastructure/express/ExpressErrorResponse.ts b/server/src/contexts/common/infrastructure/express/ExpressErrorResponse.ts index 19d1e24..0c7b1dd 100644 --- a/server/src/contexts/common/infrastructure/express/ExpressErrorResponse.ts +++ b/server/src/contexts/common/infrastructure/express/ExpressErrorResponse.ts @@ -1,16 +1,16 @@ import { IErrorExtra_Response_DTO, IError_Response_DTO } from "@shared/contexts"; -import Express from "express"; +import { Request, Response } from "express"; import { UseCaseError } from "../../application"; import { InfrastructureError } from "../InfrastructureError"; import { ProblemDocument, ProblemDocumentExtension } from "./ProblemDocument"; export const generateExpressError = ( - req: Express.Request, - res: Express.Response, + req: Request, + res: Response, statusCode: number, message?: string, error?: Error | InfrastructureError -): Express.Response => { +): Response => { const context = { user: res.locals.user || undefined, params: req.params || undefined, diff --git a/server/src/contexts/common/infrastructure/express/middlewares.ts b/server/src/contexts/common/infrastructure/express/middlewares.ts index 90d1518..944ae16 100644 --- a/server/src/contexts/common/infrastructure/express/middlewares.ts +++ b/server/src/contexts/common/infrastructure/express/middlewares.ts @@ -1,9 +1,9 @@ -import Express from "express"; +import { NextFunction, Request, RequestHandler, Response } from "express"; -const registeredMiddlewares: Record = {}; +const registeredMiddlewares: Record = {}; -function registerMiddleware(name: string, middleware: Express.RequestHandler) { - return (req: Express.Request, res: Express.Response, next: Express.NextFunction) => { +function registerMiddleware(name: string, middleware: RequestHandler) { + return (req: Request, res: Response, next: NextFunction) => { registeredMiddlewares[name] = middleware; next(); }; @@ -12,7 +12,7 @@ function registerMiddleware(name: string, middleware: Express.RequestHandler) { function applyMiddleware(middlewares: string | Array) { const middlewareNames = typeof middlewares === "string" ? [middlewares] : middlewares; - return (req: Express.Request, res: Express.Response, next: Express.NextFunction) => { + return (req: Request, res: Response, next: NextFunction) => { middlewareNames.forEach((name) => { const middleware = registeredMiddlewares[name]; if (middleware) { @@ -25,12 +25,12 @@ function applyMiddleware(middlewares: string | Array) { } function createMiddlewareMap() { - return new Map(); + return new Map(); } function composeMiddleware(middlewareArray: any[]) { if (!middlewareArray.length) { - return function (req: Express.Request, res: Express.Response, next: Express.NextFunction) { + return function (req: Request, res: Response, next: NextFunction) { next(); }; } @@ -38,7 +38,7 @@ function composeMiddleware(middlewareArray: any[]) { const head = middlewareArray[0]; const tail = middlewareArray.slice(1); - return function (req: Express.Request, res: Express.Response, next: Express.NextFunction) { + return function (req: Request, res: Response, next: NextFunction) { head(req, res, function (err: unknown) { if (err) return next(err); composeMiddleware(tail)(req, res, next); diff --git a/server/src/contexts/sales/application/Dealer/index.ts b/server/src/contexts/sales/application/Dealer/index.ts index f72c002..c0ffc36 100644 --- a/server/src/contexts/sales/application/Dealer/index.ts +++ b/server/src/contexts/sales/application/Dealer/index.ts @@ -1,8 +1,9 @@ -//export * from "./CreateDealer.useCase"; -//export * from "./DeleteDealer.useCase"; export * from "./GetDealer.useCase"; export * from "./GetDealerByUser.useCase"; export * from "./ListDealers.useCase"; -//export * from "./UpdateDealer.useCase"; + +/*export * from "./CreateDealer.useCase"; +export * from "./DeleteDealer.useCase"; +export * from "./UpdateDealer.useCase";*/ export * from "./dealerServices"; diff --git a/server/src/contexts/sales/infrastructure/express/controllers/dealers/createDealer/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/dealers/createDealer/index.ts index b9866e2..b71aefa 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/dealers/createDealer/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/dealers/createDealer/index.ts @@ -1,15 +1,11 @@ import { CreateDealerUseCase } from "@/contexts/sales/application"; -import Express from "express"; +import { NextFunction, Request, Response } from "express"; import { registerDealerRepository } from "../../../../Dealer.repository"; import { ISalesContext } from "../../../../Sales.context"; import { CreateDealerController } from "./CreateDealer.controller"; import { CreateDealerPresenter } from "./presenter"; -export const createDealerController = ( - req: Express.Request, - res: Express.Response, - next: Express.NextFunction -) => { +export const createDealerController = (req: Request, res: Response, next: NextFunction) => { const context: ISalesContext = res.locals.context; registerDealerRepository(context); diff --git a/server/src/contexts/sales/infrastructure/express/controllers/dealers/deleteDealer/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/dealers/deleteDealer/index.ts index cb4caf0..f7b8315 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/dealers/deleteDealer/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/dealers/deleteDealer/index.ts @@ -1,5 +1,4 @@ import { DeleteDealerUseCase } from "@/contexts/sales/application"; -import Express from "express"; import { registerDealerRepository } from "../../../../Dealer.repository"; import { ISalesContext } from "../../../../Sales.context"; import { DeleteDealerController } from "./DeleteDealer.controller"; diff --git a/server/src/contexts/sales/infrastructure/express/controllers/dealers/getDealer/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/dealers/getDealer/index.ts index 79f8e81..8882cd7 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/dealers/getDealer/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/dealers/getDealer/index.ts @@ -1,15 +1,11 @@ import { GetDealerUseCase } from "@/contexts/sales/application"; -import Express from "express"; +import { NextFunction, Request, Response } from "express"; import { registerDealerRepository } from "../../../../Dealer.repository"; import { ISalesContext } from "../../../../Sales.context"; import { GetDealerController } from "./GetDealer.controller"; import { GetDealerPresenter } from "./presenter"; -export const getDealerController = ( - req: Express.Request, - res: Express.Response, - next: Express.NextFunction -) => { +export const getDealerController = (req: Request, res: Response, next: NextFunction) => { const context: ISalesContext = res.locals.context; registerDealerRepository(context); diff --git a/server/src/contexts/sales/infrastructure/express/controllers/dealers/getDealerByUser/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/dealers/getDealerByUser/index.ts index ed34c57..8507b60 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/dealers/getDealerByUser/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/dealers/getDealerByUser/index.ts @@ -1,15 +1,11 @@ import { GetDealerByUserUseCase } from "@/contexts/sales/application"; -import Express from "express"; +import { NextFunction, Request, Response } from "express"; import { registerDealerRepository } from "../../../../Dealer.repository"; import { ISalesContext } from "../../../../Sales.context"; import { GetDealerByUserController } from "./GetDealerByUser.controller"; import { GetDealerByUserPresenter } from "./presenter"; -export const getDealerByUserController = ( - req: Express.Request, - res: Express.Response, - next: Express.NextFunction -) => { +export const getDealerByUserController = (req: Request, res: Response, next: NextFunction) => { const context: ISalesContext = res.locals.context; registerDealerRepository(context); diff --git a/server/src/contexts/sales/infrastructure/express/controllers/dealers/listDealers/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/dealers/listDealers/index.ts index 0cd4b69..107cf3b 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/dealers/listDealers/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/dealers/listDealers/index.ts @@ -1,15 +1,11 @@ import { ListDealersUseCase } from "@/contexts/sales/application"; -import Express from "express"; +import { NextFunction, Request, Response } from "express"; import { registerDealerRepository } from "../../../../Dealer.repository"; import { ISalesContext } from "../../../../Sales.context"; import { ListDealersController } from "./ListDealers.controller"; import { listDealersPresenter } from "./presenter/ListDealers.presenter"; -export const listDealersController = ( - req: Express.Request, - res: Express.Response, - next: Express.NextFunction -) => { +export const listDealersController = (req: Request, res: Response, next: NextFunction) => { const context: ISalesContext = res.locals.context; registerDealerRepository(context); diff --git a/server/src/contexts/sales/infrastructure/express/controllers/dealers/updateDealer/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/dealers/updateDealer/index.ts index f29256e..57445b5 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/dealers/updateDealer/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/dealers/updateDealer/index.ts @@ -1,5 +1,4 @@ import { UpdateDealerUseCase } from "@/contexts/sales/application"; -import Express from "express"; import { registerDealerRepository } from "../../../../Dealer.repository"; import { ISalesContext } from "../../../../Sales.context"; import { UpdateDealerController } from "./UpdateDealer.controller"; diff --git a/server/src/contexts/sales/infrastructure/express/controllers/quotes/createQuote/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/quotes/createQuote/index.ts index 4567764..210ff2a 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/quotes/createQuote/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/quotes/createQuote/index.ts @@ -1,15 +1,11 @@ import { CreateQuoteUseCase } from "@/contexts/sales/application"; -import Express from "express"; +import { NextFunction, Request, Response } from "express"; import { registerQuoteRepository } from "../../../../Quote.repository"; import { ISalesContext } from "../../../../Sales.context"; import { CreateQuoteController } from "./CreateQuote.controller"; import { CreateQuotePresenter } from "./presenter"; -export const createQuoteController = ( - req: Express.Request, - res: Express.Response, - next: Express.NextFunction -) => { +export const createQuoteController = (req: Request, res: Response, next: NextFunction) => { const context: ISalesContext = res.locals.context; registerQuoteRepository(context); diff --git a/server/src/contexts/sales/infrastructure/express/controllers/quotes/deleteQuote/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/quotes/deleteQuote/index.ts index 1b7063c..126d97b 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/quotes/deleteQuote/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/quotes/deleteQuote/index.ts @@ -1,14 +1,10 @@ import { DeleteQuoteUseCase } from "@/contexts/sales/application"; -import Express from "express"; +import { NextFunction, Request, Response } from "express"; import { registerQuoteRepository } from "../../../../Quote.repository"; import { ISalesContext } from "../../../../Sales.context"; import { DeleteQuoteController } from "./DeleteQuote.controller"; -export const deleteQuoteController = ( - req: Express.Request, - res: Express.Response, - next: Express.NextFunction -) => { +export const deleteQuoteController = (req: Request, res: Response, next: NextFunction) => { const context: ISalesContext = res.locals.context; registerQuoteRepository(context); diff --git a/server/src/contexts/sales/infrastructure/express/controllers/quotes/getQuote/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/quotes/getQuote/index.ts index 63f4bdf..fe9b796 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/quotes/getQuote/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/quotes/getQuote/index.ts @@ -1,15 +1,11 @@ import { GetQuoteUseCase } from "@/contexts/sales/application"; -import Express from "express"; +import { NextFunction, Request, Response } from "express"; import { registerQuoteRepository } from "../../../../Quote.repository"; import { ISalesContext } from "../../../../Sales.context"; import { GetQuoteController } from "./GetQuote.controller"; import { GetQuotePresenter } from "./presenter"; -export const getQuoteController = ( - req: Express.Request, - res: Express.Response, - next: Express.NextFunction -) => { +export const getQuoteController = (req: Request, res: Response, next: NextFunction) => { const context: ISalesContext = res.locals.context; registerQuoteRepository(context); diff --git a/server/src/contexts/sales/infrastructure/express/controllers/quotes/listQuotes/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/quotes/listQuotes/index.ts index 33b59ce..59f94d6 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/quotes/listQuotes/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/quotes/listQuotes/index.ts @@ -1,15 +1,11 @@ import { ListQuotesUseCase } from "@/contexts/sales/application"; import { registerQuoteRepository } from "@/contexts/sales/infrastructure/Quote.repository"; import { ISalesContext } from "@/contexts/sales/infrastructure/Sales.context"; -import Express from "express"; +import { NextFunction, Request, Response } from "express"; import { ListQuotesController } from "./ListQuotes.controller"; import { ListQuotesPresenter } from "./presenter"; -export const listQuotesController = ( - req: Express.Request, - res: Express.Response, - next: Express.NextFunction -) => { +export const listQuotesController = (req: Request, res: Response, next: NextFunction) => { const context: ISalesContext = res.locals.context; registerQuoteRepository(context); diff --git a/server/src/contexts/sales/infrastructure/express/controllers/quotes/reportQuote/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/quotes/reportQuote/index.ts index 6de3eca..8e33696 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/quotes/reportQuote/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/quotes/reportQuote/index.ts @@ -1,15 +1,11 @@ import { GetQuoteUseCase } from "@/contexts/sales/application"; -import Express from "express"; +import { NextFunction, Request, Response } from "express"; import { registerQuoteRepository } from "../../../../Quote.repository"; import { ISalesContext } from "../../../../Sales.context"; import { ReportQuotePresenter } from "./reporter/ReportQuote.reporter"; import { ReportQuoteController } from "./ReportQuote.controller"; -export const reportQuoteController = ( - req: Express.Request, - res: Express.Response, - next: Express.NextFunction -) => { +export const reportQuoteController = (req: Request, res: Response, next: NextFunction) => { const context: ISalesContext = res.locals.context; registerQuoteRepository(context); diff --git a/server/src/contexts/sales/infrastructure/express/controllers/quotes/setStatusQuote/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/quotes/setStatusQuote/index.ts index 26cbdee..a442fa3 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/quotes/setStatusQuote/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/quotes/setStatusQuote/index.ts @@ -1,14 +1,10 @@ import { SetStatusQuoteUseCase } from "@/contexts/sales/application"; -import Express from "express"; +import { NextFunction, Request, Response } from "express"; import { registerQuoteRepository } from "../../../../Quote.repository"; import { ISalesContext } from "../../../../Sales.context"; import { SetStatusQuoteController } from "./SetStatusQuote.controller"; -export const setStatusQuoteController = ( - req: Express.Request, - res: Express.Response, - next: Express.NextFunction -) => { +export const setStatusQuoteController = (req: Request, res: Response, next: NextFunction) => { const context: ISalesContext = res.locals.context; registerQuoteRepository(context); diff --git a/server/src/contexts/sales/infrastructure/express/controllers/quotes/updateQuote/index.ts b/server/src/contexts/sales/infrastructure/express/controllers/quotes/updateQuote/index.ts index d072440..9faefce 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/quotes/updateQuote/index.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/quotes/updateQuote/index.ts @@ -1,15 +1,11 @@ import { UpdateQuoteUseCase } from "@/contexts/sales/application"; -import Express from "express"; +import { NextFunction, Request, Response } from "express"; import { registerQuoteRepository } from "../../../../Quote.repository"; import { ISalesContext } from "../../../../Sales.context"; import { UpdateQuoteController } from "./UpdateQuote.controller"; import { UpdateQuotePresenter } from "./presenter/UpdateQuote.presenter"; -export const updateQuoteController = ( - req: Express.Request, - res: Express.Response, - next: Express.NextFunction -) => { +export const updateQuoteController = (req: Request, res: Response, next: NextFunction) => { const context: ISalesContext = res.locals.context; registerQuoteRepository(context); diff --git a/server/src/infrastructure/express/api/routes/catalog.routes.ts b/server/src/infrastructure/express/api/routes/catalog.routes.ts index 0f12e29..59084f9 100644 --- a/server/src/infrastructure/express/api/routes/catalog.routes.ts +++ b/server/src/infrastructure/express/api/routes/catalog.routes.ts @@ -1,15 +1,12 @@ import { checkUser } from "@/contexts/auth"; -import Express from "express"; +import { NextFunction, Request, Response, Router } from "express"; import { listArticlesController } from "../../../../contexts/catalog/infrastructure/express/controllers"; -export const catalogRouter = (appRouter: Express.Router) => { - const catalogRoutes: Express.Router = Express.Router({ mergeParams: true }); +export const catalogRouter = (appRouter: Router) => { + const catalogRoutes: Router = Router({ mergeParams: true }); - catalogRoutes.get( - "/", - checkUser, - (req: Express.Request, res: Express.Response, next: Express.NextFunction) => - listArticlesController(res.locals["context"]).execute(req, res, next) + catalogRoutes.get("/", checkUser, (req: Request, res: Response, next: NextFunction) => + listArticlesController(res.locals["context"]).execute(req, res, next) ); appRouter.use("/catalog", catalogRoutes); diff --git a/server/src/infrastructure/express/api/routes/dealers.routes.ts b/server/src/infrastructure/express/api/routes/dealers.routes.ts index cfd21e5..0020c70 100644 --- a/server/src/infrastructure/express/api/routes/dealers.routes.ts +++ b/server/src/infrastructure/express/api/routes/dealers.routes.ts @@ -4,10 +4,10 @@ import { listDealersController, } from "@/contexts/sales/infrastructure/express/controllers/dealers"; import { getDealerMiddleware } from "@/contexts/sales/infrastructure/express/middlewares/dealerMiddleware"; -import Express from "express"; +import { Router } from "express"; -export const DealerRouter = (appRouter: Express.Router) => { - const dealerRoutes: Express.Router = Express.Router({ mergeParams: true }); +export const DealerRouter = (appRouter: Router) => { + const dealerRoutes: Router = Router({ mergeParams: true }); dealerRoutes.get("/", checkisAdmin, listDealersController); dealerRoutes.get("/:dealerId", checkUser, getDealerMiddleware, getDealerController); diff --git a/server/src/infrastructure/express/api/routes/profile.routes.ts b/server/src/infrastructure/express/api/routes/profile.routes.ts index 482840e..2d311ea 100644 --- a/server/src/infrastructure/express/api/routes/profile.routes.ts +++ b/server/src/infrastructure/express/api/routes/profile.routes.ts @@ -3,23 +3,17 @@ import { createGetProfileController, createUpdateProfileController, } from "@/contexts/profile/infrastructure"; -import Express from "express"; +import { NextFunction, Request, Response, Router } from "express"; -export const profileRouter = (appRouter: Express.Router) => { - const profileRoutes: Express.Router = Express.Router({ mergeParams: true }); +export const profileRouter = (appRouter: Router) => { + const profileRoutes: Router = Router({ mergeParams: true }); - profileRoutes.get( - "/", - checkUser, - (req: Express.Request, res: Express.Response, next: Express.NextFunction) => - createGetProfileController(res.locals["context"]).execute(req, res, next) + profileRoutes.get("/", checkUser, (req: Request, res: Response, next: NextFunction) => + createGetProfileController(res.locals["context"]).execute(req, res, next) ); - profileRoutes.put( - "/", - checkUser, - (req: Express.Request, res: Express.Response, next: Express.NextFunction) => - createUpdateProfileController(res.locals["context"]).execute(req, res, next) + profileRoutes.put("/", checkUser, (req: Request, res: Response, next: NextFunction) => + createUpdateProfileController(res.locals["context"]).execute(req, res, next) ); appRouter.use("/profile", profileRoutes); diff --git a/server/src/infrastructure/express/api/routes/quote.routes.ts b/server/src/infrastructure/express/api/routes/quote.routes.ts index eccb78c..8e2d868 100644 --- a/server/src/infrastructure/express/api/routes/quote.routes.ts +++ b/server/src/infrastructure/express/api/routes/quote.routes.ts @@ -8,10 +8,10 @@ import { updateQuoteController, } from "@/contexts/sales/infrastructure/express/controllers"; import { getDealerMiddleware } from "@/contexts/sales/infrastructure/express/middlewares/dealerMiddleware"; -import Express from "express"; +import { Router } from "express"; -export const QuoteRouter = (appRouter: Express.Router) => { - const quoteRoutes: Express.Router = Express.Router({ mergeParams: true }); +export const QuoteRouter = (appRouter: Router) => { + const quoteRoutes: Router = Router({ mergeParams: true }); // Users CRUD quoteRoutes.get("/", checkUser, getDealerMiddleware, listQuotesController); diff --git a/server/src/infrastructure/express/api/routes/users.routes.ts b/server/src/infrastructure/express/api/routes/users.routes.ts index f32126e..e9dc776 100644 --- a/server/src/infrastructure/express/api/routes/users.routes.ts +++ b/server/src/infrastructure/express/api/routes/users.routes.ts @@ -1,5 +1,5 @@ import { checkAdminOrSelf, checkisAdmin } from "@/contexts/auth"; -import Express from "express"; +import { NextFunction, Request, Response, Router } from "express"; import { createCreateUserController, createDeleteUserController, @@ -8,42 +8,27 @@ import { createUpdateUserController, } from "../../../../contexts/users/infrastructure/express/controllers"; -export const usersRouter = (appRouter: Express.Router) => { - const userRoutes: Express.Router = Express.Router({ mergeParams: true }); +export const usersRouter = (appRouter: Router) => { + const userRoutes: Router = Router({ mergeParams: true }); - userRoutes.get( - "/", - checkisAdmin, - (req: Express.Request, res: Express.Response, next: Express.NextFunction) => - createListUsersController(res.locals["context"]).execute(req, res, next) + userRoutes.get("/", checkisAdmin, (req: Request, res: Response, next: NextFunction) => + createListUsersController(res.locals["context"]).execute(req, res, next) ); - userRoutes.get( - "/:userId", - checkAdminOrSelf, - (req: Express.Request, res: Express.Response, next: Express.NextFunction) => - createGetUserController(res.locals["context"]).execute(req, res, next) + userRoutes.get("/:userId", checkAdminOrSelf, (req: Request, res: Response, next: NextFunction) => + createGetUserController(res.locals["context"]).execute(req, res, next) ); - userRoutes.post( - "/", - checkisAdmin, - (req: Express.Request, res: Express.Response, next: Express.NextFunction) => - createCreateUserController(res.locals["context"]).execute(req, res, next) + userRoutes.post("/", checkisAdmin, (req: Request, res: Response, next: NextFunction) => + createCreateUserController(res.locals["context"]).execute(req, res, next) ); - userRoutes.put( - "/:userId", - checkisAdmin, - (req: Express.Request, res: Express.Response, next: Express.NextFunction) => - createUpdateUserController(res.locals["context"]).execute(req, res, next) + userRoutes.put("/:userId", checkisAdmin, (req: Request, res: Response, next: NextFunction) => + createUpdateUserController(res.locals["context"]).execute(req, res, next) ); - userRoutes.delete( - "/:userId", - checkisAdmin, - (req: Express.Request, res: Express.Response, next: Express.NextFunction) => - createDeleteUserController(res.locals["context"]).execute(req, res, next) + userRoutes.delete("/:userId", checkisAdmin, (req: Request, res: Response, next: NextFunction) => + createDeleteUserController(res.locals["context"]).execute(req, res, next) ); appRouter.use("/users", userRoutes); diff --git a/server/src/infrastructure/express/api/v1.ts b/server/src/infrastructure/express/api/v1.ts index 691fd6f..5e5b5fc 100644 --- a/server/src/infrastructure/express/api/v1.ts +++ b/server/src/infrastructure/express/api/v1.ts @@ -1,4 +1,4 @@ -import Express from "express"; +import { NextFunction, Request, Response, Router } from "express"; import { createContextMiddleware } from "./context.middleware"; import { DealerRouter, @@ -10,13 +10,13 @@ import { } from "./routes"; export const v1Routes = () => { - const routes = Express.Router({ mergeParams: true }); + const routes = Router({ mergeParams: true }); routes.get("/hello", (req, res) => { res.send("Hello world!"); }); - routes.use((req: Express.Request, res: Express.Response, next: Express.NextFunction) => { + routes.use((req: Request, res: Response, next: NextFunction) => { res.locals["context"] = createContextMiddleware(); //res.locals["middlewares"] = createMiddlewareMap(); diff --git a/server/tsconfig.eslint.json b/server/tsconfig.eslint.json index 7afb9a0..e9d19f4 100644 --- a/server/tsconfig.eslint.json +++ b/server/tsconfig.eslint.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "types": ["jest"], - //"baseUrl": "./src", + "baseUrl": "./src", "moduleResolution": "node", "paths": { "@/*": ["./src/*"], diff --git a/server/tsconfig.json b/server/tsconfig.json index 87d91f5..8a53910 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -75,6 +75,14 @@ "src/**/*.test.*", "node_modules", - "src/**/firebird/*" + "src/**/firebird/*", + + "src/**/CreateDealer.useCase.ts", + "src/**/UpdateDealer.useCase.ts", + "src/**/DeleteDealer.useCase.ts", + + "src/**/createDealer/*", + "src/**/updateDealer/*", + "src/**/deleteDealer/*" ] }