diff --git a/server/src/contexts/common/infrastructure/Common.context.ts b/server/src/contexts/common/infrastructure/Common.context.ts index 9c462c3..5a38406 100644 --- a/server/src/contexts/common/infrastructure/Common.context.ts +++ b/server/src/contexts/common/infrastructure/Common.context.ts @@ -7,7 +7,7 @@ import { IRepositoryManager } from "../domain"; import { ISequelizeAdapter } from "./sequelize"; export interface IContext {} -11111111; + export interface ICommonContext extends IContext { adapter: ISequelizeAdapter; repositoryManager: IRepositoryManager; diff --git a/server/src/contexts/common/infrastructure/express/ControllerFactory.ts b/server/src/contexts/common/infrastructure/express/handleRequest.ts similarity index 57% rename from server/src/contexts/common/infrastructure/express/ControllerFactory.ts rename to server/src/contexts/common/infrastructure/express/handleRequest.ts index 3b9db23..f0f55c6 100644 --- a/server/src/contexts/common/infrastructure/express/ControllerFactory.ts +++ b/server/src/contexts/common/infrastructure/express/handleRequest.ts @@ -1,7 +1,7 @@ import { NextFunction, Request, Response } from "express"; export const handleRequest = - (controllerFactory: any) => (req: Request, res: Response, next: NextFunction) => { + (controllerCreator: any) => (req: Request, res: Response, next: NextFunction) => { const context = res.locals["context"]; - return controllerFactory(context, req, res, next).execute(req, res, next); + return controllerCreator(context, req, res, next).execute(req, res, next); }; diff --git a/server/src/contexts/common/infrastructure/express/index.ts b/server/src/contexts/common/infrastructure/express/index.ts index 7cf956b..f21a552 100644 --- a/server/src/contexts/common/infrastructure/express/index.ts +++ b/server/src/contexts/common/infrastructure/express/index.ts @@ -1,5 +1,5 @@ -export * from "./ControllerFactory"; export * from "./ExpressController"; export * from "./ExpressErrorResponse"; +export * from "./handleRequest"; export * from "./middlewares"; export * from "./PassportStrategyController"; 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 b71aefa..ebaeb0f 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,13 +1,10 @@ import { CreateDealerUseCase } from "@/contexts/sales/application"; -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: Request, res: Response, next: NextFunction) => { - const context: ISalesContext = res.locals.context; - +export const createDealerController = (context: ISalesContext) => { registerDealerRepository(context); return new CreateDealerController( { @@ -15,5 +12,5 @@ export const createDealerController = (req: Request, res: Response, next: NextFu presenter: CreateDealerPresenter, }, context - ).execute(req, res, next); + ); }; 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 8882cd7..7dae7ef 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,13 +1,10 @@ import { GetDealerUseCase } from "@/contexts/sales/application"; -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: Request, res: Response, next: NextFunction) => { - const context: ISalesContext = res.locals.context; - +export const getDealerController = (context: ISalesContext) => { registerDealerRepository(context); return new GetDealerController( @@ -16,5 +13,5 @@ export const getDealerController = (req: Request, res: Response, next: NextFunct presenter: GetDealerPresenter, }, context - ).execute(req, res, next); + ); }; 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 8507b60..b0ff1f3 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,13 +1,10 @@ import { GetDealerByUserUseCase } from "@/contexts/sales/application"; -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: Request, res: Response, next: NextFunction) => { - const context: ISalesContext = res.locals.context; - +export const getDealerByUserController = (context: ISalesContext) => { registerDealerRepository(context); return new GetDealerByUserController( @@ -16,5 +13,5 @@ export const getDealerByUserController = (req: Request, res: Response, next: Nex presenter: GetDealerByUserPresenter, }, context - ).execute(req, res, next); + ); }; 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 107cf3b..c3b1d40 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,13 +1,10 @@ import { ListDealersUseCase } from "@/contexts/sales/application"; -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: Request, res: Response, next: NextFunction) => { - const context: ISalesContext = res.locals.context; - +export const listDealersController = (context: ISalesContext) => { registerDealerRepository(context); return new ListDealersController( { @@ -15,5 +12,5 @@ export const listDealersController = (req: Request, res: Response, next: NextFun presenter: listDealersPresenter, }, context - ).execute(req, res, next); + ); }; 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 126d97b..27688e8 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,17 +1,14 @@ import { DeleteQuoteUseCase } from "@/contexts/sales/application"; -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: Request, res: Response, next: NextFunction) => { - const context: ISalesContext = res.locals.context; - +export const deleteQuoteController = (context: ISalesContext) => { registerQuoteRepository(context); return new DeleteQuoteController( { useCase: new DeleteQuoteUseCase(context), }, context - ).execute(req, res, next); + ); }; 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 9faefce..c6e17b0 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,13 +1,10 @@ import { UpdateQuoteUseCase } from "@/contexts/sales/application"; -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: Request, res: Response, next: NextFunction) => { - const context: ISalesContext = res.locals.context; - +export const updateQuoteController = (context: ISalesContext) => { registerQuoteRepository(context); return new UpdateQuoteController( { @@ -15,5 +12,5 @@ export const updateQuoteController = (req: Request, res: Response, next: NextFun presenter: UpdateQuotePresenter, }, context - ).execute(req, res, next); + ); }; diff --git a/server/src/contexts/sales/infrastructure/mappers/quote.mapper.ts b/server/src/contexts/sales/infrastructure/mappers/quote.mapper.ts index 1b7fd96..00bccd7 100644 --- a/server/src/contexts/sales/infrastructure/mappers/quote.mapper.ts +++ b/server/src/contexts/sales/infrastructure/mappers/quote.mapper.ts @@ -142,7 +142,7 @@ class QuoteMapper items, dealer_id: source.dealerId.toPrimitive(), - date_sent: source.dateSent?.toPrimitive(), + date_sent: source.dateSent.toPrimitive() === "" ? null : source.dateSent.toPrimitive(), }; return quote;