api core module refactor pt. 2

mairisb · Jul 14, 2024 · 80f11f9 · 80f11f9
1 parent bccfa81
commit 80f11f9
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/packages/api/src/core/inversify/container.ts → packages/api/src/core/di/di.container.ts b/packages/api/src/core/inversify/container.ts → packages/api/src/core/di/di.container.ts
@@ -14,15 +14,15 @@ import { GameServiceMock } from '../../features/game/game.service.mock';
 import { IGameService } from '../../features/game/game.service.type';
 import { UserService } from '../../features/user/user.service';
 import { IUserService } from '../../features/user/user.service.type';
-import { Middleware, Services } from './identifiers';
+import { Middleware, Services } from './di.identifiers';
 
-const container = new Container();
+const diContainer = new Container();
 
-container.bind<BaseMiddleware>(Middleware.Auth).to(AuthMiddleware);
+diContainer.bind<BaseMiddleware>(Middleware.Auth).to(AuthMiddleware);
 
-container.bind<IAuthService>(Services.Auth).to(AuthService);
-container.bind<ICardService>(Services.Card).to(CardService);
-container.bind<IGameService>(Services.Game).to(GameServiceMock);
-container.bind<IUserService>(Services.User).to(UserService);
+diContainer.bind<IAuthService>(Services.Auth).to(AuthService);
+diContainer.bind<ICardService>(Services.Card).to(CardService);
+diContainer.bind<IGameService>(Services.Game).to(GameServiceMock);
+diContainer.bind<IUserService>(Services.User).to(UserService);
 
-export { container };
+export { diContainer as container };
diff --git a/...ges/api/src/core/inversify/identifiers.ts → packages/api/src/core/di/di.identifiers.ts b/...ges/api/src/core/inversify/identifiers.ts → packages/api/src/core/di/di.identifiers.ts
diff --git a/...api/src/core/inversify/config-function.ts → ...s/api/src/core/server/server-config-fn.ts b/...api/src/core/inversify/config-function.ts → ...s/api/src/core/server/server-config-fn.ts
@@ -1,3 +1,3 @@
 import { ConfigFunction } from 'inversify-express-utils';
 
-export const configFunction: ConfigFunction = () => {};
+export const serverConfigFn: ConfigFunction = () => {};
diff --git a/...c/core/inversify/error-config-function.ts → ...src/core/server/server-error-config-fn.ts b/...c/core/inversify/error-config-function.ts → ...src/core/server/server-error-config-fn.ts
@@ -2,16 +2,16 @@ import { ErrorResponse } from '@tspark/common';
 import { NextFunction, Request, Response } from 'express';
 import { ConfigFunction } from 'inversify-express-utils';
 
-export const errorConfigFunction: ConfigFunction = (app) => {
+export const serverErorConfigFn: ConfigFunction = (app) => {
   app.use(
     (
       err: Error,
       req: Request,
       res: Response<ErrorResponse>,
       next: NextFunction,
     ) => {
-      console.error('Something went wrong!', err.stack);
-      return res.status(500).json({ error: 'Something went wrong!' });
+      console.error('Oops! Something went wrong.', err);
+      return res.status(500).json({ error: 'Oops! Something went wrong.' });
     },
   );
 };
diff --git a/packages/api/src/features/auth/auth.controller.ts b/packages/api/src/features/auth/auth.controller.ts
@@ -5,7 +5,7 @@ import jwt from 'jsonwebtoken';
 import { mapper } from '../../core/auto-mapper/mapper';
 import { config } from '../../core/config/config';
 import { BaseController } from '../../core/controllers/base.controller';
-import { Services } from '../../core/inversify/identifiers';
+import { Services } from '../../core/di/di.identifiers';
 import { User } from '../user/user.entity';
 import { IAuthService } from './auth.service.type';
 

diff --git a/packages/api/src/features/auth/auth.provider.ts b/packages/api/src/features/auth/auth.provider.ts
@@ -3,7 +3,7 @@ import { Request } from 'express';
 import { inject, injectable } from 'inversify';
 import { mapper } from '../../core/auto-mapper/mapper';
 import { BaseController } from '../../core/controllers/base.controller';
-import { Services } from '../../core/inversify/identifiers';
+import { Services } from '../../core/di/di.identifiers';
 import { User } from '../user/user.entity';
 import { IAuthProvider } from './auth.provider.type';
 import { IAuthService } from './auth.service.type';

diff --git a/packages/api/src/features/auth/auth.service.ts b/packages/api/src/features/auth/auth.service.ts
@@ -3,7 +3,7 @@ import bcrypt from 'bcrypt';
 import { inject, injectable } from 'inversify';
 import jwt, { JwtPayload } from 'jsonwebtoken';
 import { config } from '../../core/config/config';
-import { Services } from '../../core/inversify/identifiers';
+import { Services } from '../../core/di/di.identifiers';
 import { User } from '../user/user.entity';
 import { userRepository } from '../user/user.repository';
 import { IUserService } from '../user/user.service.type';

diff --git a/packages/api/src/features/card/card.controller.ts b/packages/api/src/features/card/card.controller.ts
@@ -12,7 +12,7 @@ import {
   requestParam,
   response,
 } from 'inversify-express-utils';
-import { Middleware, Services } from '../../core/inversify/identifiers';
+import { Middleware, Services } from '../../core/di/di.identifiers';
 import { ICardService } from './card.service.type';
 
 @controller('/card', Middleware.Auth)

diff --git a/packages/api/src/features/game/game.controller.ts b/packages/api/src/features/game/game.controller.ts
@@ -4,7 +4,7 @@ import {
   controller,
   httpGet,
 } from 'inversify-express-utils';
-import { Services } from '../../core/inversify/identifiers';
+import { Services } from '../../core/di/di.identifiers';
 import { IGameService } from './game.service.type';
 
 @controller('/game')

diff --git a/packages/api/src/features/user/user.controller.ts b/packages/api/src/features/user/user.controller.ts
@@ -4,7 +4,7 @@ import {
   controller,
   httpGet,
 } from 'inversify-express-utils';
-import { Services } from '../../core/inversify/identifiers';
+import { Services } from '../../core/di/di.identifiers';
 import { IUserService } from './user.service.type';
 
 @controller('/user')

diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
@@ -9,9 +9,9 @@ import { InversifyExpressServer } from 'inversify-express-utils';
 import { createMaps } from './core/auto-mapper/mapper';
 import { config } from './core/config/config';
 import { appDataSource } from './core/db/app-data-source';
-import { configFunction } from './core/inversify/config-function';
-import { container } from './core/inversify/container';
-import { errorConfigFunction } from './core/inversify/error-config-function';
+import { container } from './core/di/di.container';
+import { serverConfigFn } from './core/server/server-config-fn';
+import { serverErorConfigFn } from './core/server/server-error-config-fn';
 import { AuthProvider } from './features/auth/auth.provider';
 
 createMaps();
@@ -47,8 +47,8 @@ const server = new InversifyExpressServer(
   AuthProvider,
 );
 
-server.setConfig(configFunction);
-server.setErrorConfig(errorConfigFunction);
+server.setConfig(serverConfigFn);
+server.setErrorConfig(serverErorConfigFn);
 
 appDataSource
   .initialize()