diff --git a/apps/server/src/common/presentation/express/index.ts b/apps/server/src/common/presentation/express/index.ts index 50e4a8fa..3331f2c3 100644 --- a/apps/server/src/common/presentation/express/index.ts +++ b/apps/server/src/common/presentation/express/index.ts @@ -1,4 +1,4 @@ export * from "./api-error"; export * from "./express-controller"; export * from "./middlewares"; -export * from "./validate-request"; +export * from "./validate-request-dto"; diff --git a/apps/server/src/common/presentation/express/validate-request.ts b/apps/server/src/common/presentation/express/validate-request-dto.ts similarity index 96% rename from apps/server/src/common/presentation/express/validate-request.ts rename to apps/server/src/common/presentation/express/validate-request-dto.ts index 7bea12d1..98488f77 100644 --- a/apps/server/src/common/presentation/express/validate-request.ts +++ b/apps/server/src/common/presentation/express/validate-request-dto.ts @@ -3,7 +3,7 @@ import httpStatus from "http-status"; import { ZodSchema } from "zod"; import { ApiError } from "./api-error"; -export const validateRequest = +export const validateRequestDTO = (schema: ZodSchema) => (req: Request, res: Response, next: NextFunction) => { const result = schema.safeParse(req.body); if (!result.success) { diff --git a/apps/server/src/contexts/auth/application/index.ts b/apps/server/src/contexts/auth/application/index.ts index 80d2507c..0bf41b63 100644 --- a/apps/server/src/contexts/auth/application/index.ts +++ b/apps/server/src/contexts/auth/application/index.ts @@ -10,10 +10,10 @@ export * from "./auth-service.interface"; export const createAuthService = (): IAuthService => { const transactionManager = createSequelizeTransactionManager(); - const authenticatedUserRepository = createAuthenticatedUserRepository(); - const tabContextRepository = createTabContextRepository(); + const userRepo = createAuthenticatedUserRepository(); + const tabContextRepo = createTabContextRepository(); - return new AuthService(authenticatedUserRepository, tabContextRepository, transactionManager); + return new AuthService(userRepo, tabContextRepo, transactionManager); }; export const createTabContextService = (): ITabContextService => { diff --git a/apps/server/src/contexts/auth/domain/repositories/index.ts b/apps/server/src/contexts/auth/domain/repositories/index.ts index ef546408..c493a1cc 100644 --- a/apps/server/src/contexts/auth/domain/repositories/index.ts +++ b/apps/server/src/contexts/auth/domain/repositories/index.ts @@ -1 +1,2 @@ export * from "./authenticated-user-repository.interface"; +export * from "./tab-context-repository.interface"; diff --git a/apps/server/src/contexts/auth/infraestructure/sequelize/authenticated-user.repository.ts b/apps/server/src/contexts/auth/infraestructure/sequelize/authenticated-user.repository.ts index 419688fb..c2d0918d 100644 --- a/apps/server/src/contexts/auth/infraestructure/sequelize/authenticated-user.repository.ts +++ b/apps/server/src/contexts/auth/infraestructure/sequelize/authenticated-user.repository.ts @@ -6,7 +6,7 @@ import { IAuthenticatedUserRepository, } from "@contexts/auth/domain"; import { Transaction } from "sequelize"; -import { createAuthenticatedUserMapper, IAuthenticatedUserMapper } from "../mappers"; +import { IAuthenticatedUserMapper } from "../mappers"; import { AuthUserModel } from "./auth-user.model"; export class AuthenticatedUserRepository @@ -85,8 +85,3 @@ export class AuthenticatedUserRepository } } } - -export const createAuthenticatedUserRepository = (): IAuthenticatedUserRepository => { - const authenticatedUserMapper = createAuthenticatedUserMapper(); - return new AuthenticatedUserRepository(authenticatedUserMapper); -}; diff --git a/apps/server/src/contexts/auth/infraestructure/sequelize/index.ts b/apps/server/src/contexts/auth/infraestructure/sequelize/index.ts index 81bc3e8f..e4c04d61 100644 --- a/apps/server/src/contexts/auth/infraestructure/sequelize/index.ts +++ b/apps/server/src/contexts/auth/infraestructure/sequelize/index.ts @@ -1,4 +1,17 @@ +import { IAuthenticatedUserRepository, ITabContextRepository } from "../../domain"; +import { createAuthenticatedUserMapper, createTabContextMapper } from "../mappers"; +import { AuthenticatedUserRepository } from "./authenticated-user.repository"; +import { TabContextRepository } from "./tab-context.repository"; + export * from "./auth-user.model"; -export * from "./authenticated-user.repository"; export * from "./tab-context.model"; -export * from "./tab-context.repository"; + +export const createAuthenticatedUserRepository = (): IAuthenticatedUserRepository => { + const authenticatedUserMapper = createAuthenticatedUserMapper(); + return new AuthenticatedUserRepository(authenticatedUserMapper); +}; + +export const createTabContextRepository = (): ITabContextRepository => { + const tabContextMapper = createTabContextMapper(); + return new TabContextRepository(tabContextMapper); +}; diff --git a/apps/server/src/contexts/auth/infraestructure/sequelize/tab-context.repository.ts b/apps/server/src/contexts/auth/infraestructure/sequelize/tab-context.repository.ts index ec537011..6c527ec8 100644 --- a/apps/server/src/contexts/auth/infraestructure/sequelize/tab-context.repository.ts +++ b/apps/server/src/contexts/auth/infraestructure/sequelize/tab-context.repository.ts @@ -3,7 +3,7 @@ import { SequelizeRepository } from "@common/infrastructure"; import { TabContext } from "@contexts/auth/domain/"; import { ITabContextRepository } from "@contexts/auth/domain/repositories/tab-context-repository.interface"; import { Op, Transaction } from "sequelize"; -import { createTabContextMapper, ITabContextMapper } from "../mappers"; +import { ITabContextMapper } from "../mappers"; import { TabContextModel } from "./tab-context.model"; export class TabContextRepository @@ -125,8 +125,3 @@ export class TabContextRepository } } } - -export const createTabContextRepository = (): ITabContextRepository => { - const tabContextMapper = createTabContextMapper(); - return new TabContextRepository(tabContextMapper); -};