Merge pull request #33 from fullstack-development/refactor-core

Refactor core

Author: hersveit

.gitignore

@@ -4,3 +4,6 @@ node_modules/
 yarn-error.log
 .env
 .e2e.env
+
+*/**/node_modules_docker_dev
+*/**/.ignore

api/.dockerignore

@@ -5,4 +5,5 @@ Dockerfile
 node_modules
 dist
 env
-coverage
+coverage
+.prisma-lib

api/Dockerfile.dev

@@ -0,0 +1,9 @@
+FROM public.ecr.aws/docker/library/node:18.15
+
+WORKDIR /app
+
+ENV PATH=/app/api/node_modules/.bin:$PATH
+
+EXPOSE 3000
+
+CMD ["sh", "-c", "yarn --cwd libs/repository && yarn --cwd libs/repository prisma:generate && yarn --cwd libs/core && yarn --cwd api && yarn cache clean && yarn --cwd api start:dev"]

api/package.json

@@ -18,20 +18,21 @@
         "test:coverage": "cross-env TEST=true jest --coverage"
     },
     "dependencies": {
-        "@medibloc/nestjs-request-context": "^1.0.0",
         "@nestjs/common": "^9.2.1",
         "@nestjs/core": "^9.2.1",
         "@nestjs/jwt": "^10.0.1",
         "@nestjs/passport": "^9.0.0",
         "@nestjs/platform-express": "^9.2.1",
         "@nestjs/schedule": "^2.1.0",
+        "@nestjs/swagger": "^6.1.4",
         "body-parser": "^1.19.0",
         "class-transformer": "^0.3.1",
         "class-validator": "^0.12.2",
         "cookie-parser": "^1.4.6",
         "cross-env": "^7.0.3",
         "date-fns": "^2.29.3",
         "dotenv": "^8.2.0",
+        "ethers": "^5.7.1",
         "express": "^4.17.2",
         "node-fetch": "^2.6.7",
         "passport": "^0.4.1",
@@ -40,10 +41,8 @@
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "rxjs": "^7.2.0",
-        "swagger-ui-express": "^4.5.0",
         "ts-morph": "^17.0.1",
-        "uuid": "^8.3.2",
-        "yamljs": "^0.3.0"
+        "uuid": "^8.3.2"
     },
     "devDependencies": {
         "@golevelup/ts-jest": "^0.3.2",
@@ -88,13 +87,16 @@
             "<rootDir>/node_modules",
             "<rootDir>/src",
             "<rootDir>/../libs/repository",
-            "<rootDir>/../libs/repository/node_modules"
+            "<rootDir>/../libs/repository/node_modules",
+            "<rootDir>/../libs/core",
+            "<rootDir>/../libs/core/node_modules"
         ],
         "modulePathIgnorePatterns": [
             "<rootDir>/dist/",
             "<rootDir>/eslint-plugin/",
             "<rootDir>/migrations/",
-            "<rootDir>/coverage/"
+            "<rootDir>/coverage/",
+            "<rootDir>/node_modules_docker_dev"
         ],
         "testRegex": ".*\\.spec\\.ts$",
         "transform": {
@@ -109,7 +111,10 @@
             "./jest-setup-file.ts"
         ],
         "moduleNameMapper": {
-            "@lib/repository": "<rootDir>/../libs/repository"
+            "@lib/repository": "<rootDir>/../libs/repository",
+            "@lib/core": "<rootDir>/../libs/core/src/index.ts",
+            "@lib/utils": "<rootDir>/../libs/core/utils/index.ts",
+            "@lib/testing": "<rootDir>/../libs/core/testing/index.ts"
         }
     }
 }

api/src/__mocks__/DatabaseServiceProviderFake.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
-import { DatabaseProvider } from '../core/database/database.core';
+import { DatabaseProvider } from '@lib/repository';
 
 export type DeepMockedDatabaseServiceProvider = ReturnType<typeof getMockedDatabase>;
 

api/src/__mocks__/TransactionsContextFake.ts

@@ -1,28 +1,14 @@
-import { RepositoryLibrary } from '@lib/repository';
-import { RequestContextModule } from '@medibloc/nestjs-request-context';
+import { HttpInterceptor } from '@lib/core';
+import { DatabaseModule } from '@lib/repository';
 import { Module, Scope } from '@nestjs/common';
 import { APP_INTERCEPTOR } from '@nestjs/core';
-import { AuthController } from '../controllers/auth/auth.controller';
-import { UserController } from '../controllers/user/user.controller';
+import { AppController } from '../controllers/rest/app.controller';
+import { AuthController } from '../controllers/rest/auth/auth.controller';
+import { UserController } from '../controllers/rest/user/user.controller';
 import { Config } from '../core/config/config.core';
-import { Database } from '../core/database/database.core';
-import { HttpInterceptor } from '../core/interceptor.core';
-import { TransactionsContext } from '../core/transactions.core';
-import { AppController } from './../controllers/app.controller';
 
 @Module({
-    imports: [
-        Config,
-        RepositoryLibrary,
-        Database,
-        RequestContextModule.forRoot({
-            contextClass: TransactionsContext,
-            isGlobal: true,
-        }),
-        AuthController,
-        UserController,
-        AppController,
-    ],
+    imports: [Config, DatabaseModule.forRoot(), AuthController, UserController, AppController],
     providers: [
         {
             provide: APP_INTERCEPTOR,

api/src/app/app.module.ts

@@ -0,0 +1 @@
+export const PREFIX_URI = 'api';

api/src/controllers/prefix.ts

@@ -1,7 +1,8 @@
+import { ControllerResponse } from '@lib/core';
 import { Body, Controller, Get, Module, Query } from '@nestjs/common';
-import { ControllerResponse } from './../core/controller.core';
+import { PREFIX_URI } from '../prefix';
 
-@Controller('api')
+@Controller(PREFIX_URI)
 export class AppControllerProvider {
     @Get('echo')
     async echo(

api/src/controllers/app.controller.ts …i/src/controllers/rest/app.controller.tsapi/src/controllers/app.controller.ts renamed to api/src/controllers/rest/app.controller.ts api/src/controllers/app.controller.ts renamed to api/src/controllers/rest/app.controller.ts

@@ -1,24 +1,22 @@
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
-import { RequestContextModule } from '@medibloc/nestjs-request-context';
+import { HttpInterceptor } from '@lib/core';
+import { AsyncContext, DatabaseProvider, Transactions } from '@lib/repository';
+import { AppWrap } from '@lib/testing';
 import { ModuleRef } from '@nestjs/core';
 import { JwtModule } from '@nestjs/jwt';
 import { Test } from '@nestjs/testing';
 import * as cookieParser from 'cookie-parser';
 import * as request from 'supertest';
 import { v4 } from 'uuid';
-import { ConfigProvider } from '../../../core/config/config.core';
-import { DatabaseProvider } from '../../../core/database/database.core';
-import { HttpInterceptor } from '../../../core/interceptor.core';
-import { AuthServiceProvider } from '../../../services/auth/auth.service';
-import { JwtRefreshTokenStrategy } from '../../../services/auth/strategies/jwt-refresh.strategy';
-import { JwtStrategy } from '../../../services/auth/strategies/jwt.strategy';
-import { MailServiceProvider } from '../../../services/mail/mail.service';
-import { TokenServiceProvider } from '../../../services/token/token.service';
-import { UserServiceProvider } from '../../../services/user/user.service';
-import { AppWrap } from '../../../utils/tests.utils';
-import { ConfigServiceFake } from '../../../__mocks__/ConfigServiceFake';
-import { TransactionsContextFake } from '../../../__mocks__/TransactionsContextFake';
-import { getUserStub } from '../../../__mocks__/user.stub';
+import { ConfigProvider } from '../../../../core/config/config.core';
+import { AuthServiceProvider } from '../../../../services/auth/auth.service';
+import { JwtRefreshTokenStrategy } from '../../../../services/auth/strategies/jwt-refresh.strategy';
+import { JwtStrategy } from '../../../../services/auth/strategies/jwt.strategy';
+import { MailServiceProvider } from '../../../../services/mail/mail.service';
+import { TokenServiceProvider } from '../../../../services/token/token.service';
+import { UserServiceProvider } from '../../../../services/user/user.service';
+import { ConfigServiceFake } from '../../../../__mocks__/ConfigServiceFake';
+import { getUserStub } from '../../../../__mocks__/user.stub';
 import { AuthControllerProvider } from '../auth.controller';
 
 describe('AuthController', () => {
@@ -37,10 +35,6 @@ describe('AuthController', () => {
                     secret: configService.JWT_SECRET,
                     signOptions: { expiresIn: configService.JWT_EXPIRES_IN },
                 }),
-                RequestContextModule.forRoot({
-                    contextClass: TransactionsContextFake,
-                    isGlobal: true,
-                }),
             ],
             providers: [
                 {
@@ -81,7 +75,11 @@ describe('AuthController', () => {
 
         appWrap.app = module.createNestApplication();
         appWrap.app.useGlobalInterceptors(
-            new HttpInterceptor(createMock<ModuleRef>(), db as unknown as DatabaseProvider),
+            new HttpInterceptor(
+                createMock<ModuleRef>(),
+                createMock<AsyncContext<string, Transactions>>(),
+                db as unknown as DatabaseProvider,
+            ),
         );
         appWrap.app.use(cookieParser());
         await appWrap.app.init();