.

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 = (
+const profileMiddleware = (req: Request, res: Response, next: NextFunction) => {
-  req: express.Request,
-  res: express.Response,
-  next: express.NextFunction
-) => {
   const _req = req as AuthenticatedRequest;
   const user = <AuthUser>_req.user;
 

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 req: Request;
-  protected res: Express.Response;
+  protected res: Response;
-  protected next: Express.NextFunction;
+  protected next: NextFunction;
 
   protected serverURL: string = "";
   protected file: any;
 
   protected abstract executeImpl(): Promise<void | any>;
 
-  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<any> {
+  private _jsonResponse(statusCode: number, jsonPayload: any): Response<any> {
     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<IError_Response_DTO> {
+  ): Response<IError_Response_DTO> {
     return generateExpressError(this.req, this.res, statusCode, message, error);
   }
 

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,
+  req: Request,
-  res: Express.Response,
+  res: Response,
   statusCode: number,
   message?: string,
   error?: Error | InfrastructureError
-): Express.Response<IError_Response_DTO> => {
+): Response<IError_Response_DTO> => {
   const context = {
     user: res.locals.user || undefined,
     params: req.params || undefined,

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<string, Express.RequestHandler> = {};
+const registeredMiddlewares: Record<string, RequestHandler> = {};
 
-function registerMiddleware(name: string, middleware: Express.RequestHandler) {
+function registerMiddleware(name: string, middleware: RequestHandler) {
-  return (req: Express.Request, res: Express.Response, next: Express.NextFunction) => {
+  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<string>) {
   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<string>) {
 }
 
 function createMiddlewareMap() {
-  return new Map<string, Express.RequestHandler>();
+  return new Map<string, RequestHandler>();
 }
 
 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);

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";

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 = (
+export const createDealerController = (req: Request, res: Response, next: NextFunction) => {
-  req: Express.Request,
-  res: Express.Response,
-  next: Express.NextFunction
-) => {
   const context: ISalesContext = res.locals.context;
 
   registerDealerRepository(context);

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";

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 = (
+export const getDealerController = (req: Request, res: Response, next: NextFunction) => {
-  req: Express.Request,
-  res: Express.Response,
-  next: Express.NextFunction
-) => {
   const context: ISalesContext = res.locals.context;
 
   registerDealerRepository(context);

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 = (
+export const getDealerByUserController = (req: Request, res: Response, next: NextFunction) => {
-  req: Express.Request,
-  res: Express.Response,
-  next: Express.NextFunction
-) => {
   const context: ISalesContext = res.locals.context;
 
   registerDealerRepository(context);

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 = (
+export const listDealersController = (req: Request, res: Response, next: NextFunction) => {
-  req: Express.Request,
-  res: Express.Response,
-  next: Express.NextFunction
-) => {
   const context: ISalesContext = res.locals.context;
 
   registerDealerRepository(context);

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";

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 = (
+export const createQuoteController = (req: Request, res: Response, next: NextFunction) => {
-  req: Express.Request,
-  res: Express.Response,
-  next: Express.NextFunction
-) => {
   const context: ISalesContext = res.locals.context;
 
   registerQuoteRepository(context);

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 = (
+export const deleteQuoteController = (req: Request, res: Response, next: NextFunction) => {
-  req: Express.Request,
-  res: Express.Response,
-  next: Express.NextFunction
-) => {
   const context: ISalesContext = res.locals.context;
 
   registerQuoteRepository(context);

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 = (
+export const getQuoteController = (req: Request, res: Response, next: NextFunction) => {
-  req: Express.Request,
-  res: Express.Response,
-  next: Express.NextFunction
-) => {
   const context: ISalesContext = res.locals.context;
 
   registerQuoteRepository(context);

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 = (
+export const listQuotesController = (req: Request, res: Response, next: NextFunction) => {
-  req: Express.Request,
-  res: Express.Response,
-  next: Express.NextFunction
-) => {
   const context: ISalesContext = res.locals.context;
 
   registerQuoteRepository(context);

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 = (
+export const reportQuoteController = (req: Request, res: Response, next: NextFunction) => {
-  req: Express.Request,
-  res: Express.Response,
-  next: Express.NextFunction
-) => {
   const context: ISalesContext = res.locals.context;
 
   registerQuoteRepository(context);

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 = (
+export const setStatusQuoteController = (req: Request, res: Response, next: NextFunction) => {
-  req: Express.Request,
-  res: Express.Response,
-  next: Express.NextFunction
-) => {
   const context: ISalesContext = res.locals.context;
 
   registerQuoteRepository(context);

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 = (
+export const updateQuoteController = (req: Request, res: Response, next: NextFunction) => {
-  req: Express.Request,
-  res: Express.Response,
-  next: Express.NextFunction
-) => {
   const context: ISalesContext = res.locals.context;
 
   registerQuoteRepository(context);

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) => {
+export const catalogRouter = (appRouter: Router) => {
-  const catalogRoutes: Express.Router = Express.Router({ mergeParams: true });
+  const catalogRoutes: Router = Router({ mergeParams: true });
 
-  catalogRoutes.get(
+  catalogRoutes.get("/", checkUser, (req: Request, res: Response, next: NextFunction) =>
-    "/",
+    listArticlesController(res.locals["context"]).execute(req, res, next)
-    checkUser,
-    (req: Express.Request, res: Express.Response, next: Express.NextFunction) =>
-      listArticlesController(res.locals["context"]).execute(req, res, next)
   );
 
   appRouter.use("/catalog", catalogRoutes);

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) => {
+export const DealerRouter = (appRouter: Router) => {
-  const dealerRoutes: Express.Router = Express.Router({ mergeParams: true });
+  const dealerRoutes: Router = Router({ mergeParams: true });
 
   dealerRoutes.get("/", checkisAdmin, listDealersController);
   dealerRoutes.get("/:dealerId", checkUser, getDealerMiddleware, getDealerController);

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) => {
+export const profileRouter = (appRouter: Router) => {
-  const profileRoutes: Express.Router = Express.Router({ mergeParams: true });
+  const profileRoutes: Router = Router({ mergeParams: true });
 
-  profileRoutes.get(
+  profileRoutes.get("/", checkUser, (req: Request, res: Response, next: NextFunction) =>
-    "/",
+    createGetProfileController(res.locals["context"]).execute(req, res, next)
-    checkUser,
-    (req: Express.Request, res: Express.Response, next: Express.NextFunction) =>
-      createGetProfileController(res.locals["context"]).execute(req, res, next)
   );
 
-  profileRoutes.put(
+  profileRoutes.put("/", checkUser, (req: Request, res: Response, next: NextFunction) =>
-    "/",
+    createUpdateProfileController(res.locals["context"]).execute(req, res, next)
-    checkUser,
-    (req: Express.Request, res: Express.Response, next: Express.NextFunction) =>
-      createUpdateProfileController(res.locals["context"]).execute(req, res, next)
   );
 
   appRouter.use("/profile", profileRoutes);

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) => {
+export const QuoteRouter = (appRouter: Router) => {
-  const quoteRoutes: Express.Router = Express.Router({ mergeParams: true });
+  const quoteRoutes: Router = Router({ mergeParams: true });
 
   // Users CRUD
   quoteRoutes.get("/", checkUser, getDealerMiddleware, listQuotesController);

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) => {
+export const usersRouter = (appRouter: Router) => {
-  const userRoutes: Express.Router = Express.Router({ mergeParams: true });
+  const userRoutes: Router = Router({ mergeParams: true });
 
-  userRoutes.get(
+  userRoutes.get("/", checkisAdmin, (req: Request, res: Response, next: NextFunction) =>
-    "/",
+    createListUsersController(res.locals["context"]).execute(req, res, next)
-    checkisAdmin,
-    (req: Express.Request, res: Express.Response, next: Express.NextFunction) =>
-      createListUsersController(res.locals["context"]).execute(req, res, next)
   );
 
-  userRoutes.get(
+  userRoutes.get("/:userId", checkAdminOrSelf, (req: Request, res: Response, next: NextFunction) =>
-    "/:userId",
+    createGetUserController(res.locals["context"]).execute(req, res, next)
-    checkAdminOrSelf,
-    (req: Express.Request, res: Express.Response, next: Express.NextFunction) =>
-      createGetUserController(res.locals["context"]).execute(req, res, next)
   );
 
-  userRoutes.post(
+  userRoutes.post("/", checkisAdmin, (req: Request, res: Response, next: NextFunction) =>
-    "/",
+    createCreateUserController(res.locals["context"]).execute(req, res, next)
-    checkisAdmin,
-    (req: Express.Request, res: Express.Response, next: Express.NextFunction) =>
-      createCreateUserController(res.locals["context"]).execute(req, res, next)
   );
 
-  userRoutes.put(
+  userRoutes.put("/:userId", checkisAdmin, (req: Request, res: Response, next: NextFunction) =>
-    "/:userId",
+    createUpdateUserController(res.locals["context"]).execute(req, res, next)
-    checkisAdmin,
-    (req: Express.Request, res: Express.Response, next: Express.NextFunction) =>
-      createUpdateUserController(res.locals["context"]).execute(req, res, next)
   );
 
-  userRoutes.delete(
+  userRoutes.delete("/:userId", checkisAdmin, (req: Request, res: Response, next: NextFunction) =>
-    "/:userId",
+    createDeleteUserController(res.locals["context"]).execute(req, res, next)
-    checkisAdmin,
-    (req: Express.Request, res: Express.Response, next: Express.NextFunction) =>
-      createDeleteUserController(res.locals["context"]).execute(req, res, next)
   );
 
   appRouter.use("/users", userRoutes);

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();
 

server/tsconfig.eslint.json

@@ -2,7 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "types": ["jest"],
-    //"baseUrl": "./src",
+    "baseUrl": "./src",
     "moduleResolution": "node",
     "paths": {
       "@/*": ["./src/*"],

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/*"
   ]
 }