From b857f4593f82215178a16f928b2e38c18464bb1f Mon Sep 17 00:00:00 2001 From: Lee-clipse <79911816+Lee-clipse@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:28:58 +0900 Subject: [PATCH 1/6] =?UTF-8?q?chore:=20nestjs=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/holder/.eslintrc.js | 8 +++++++- BE/holder/package-lock.json | 2 +- BE/holder/package.json | 2 +- BE/issuer/.eslintrc.js | 8 +++++++- BE/issuer/package-lock.json | 4 ++-- BE/issuer/package.json | 4 ++-- BE/service/.eslintrc.js | 8 +++++++- BE/service/package-lock.json | 2 +- BE/service/package.json | 2 +- BE/verifier/.eslintrc.js | 8 +++++++- BE/verifier/package-lock.json | 2 +- BE/verifier/package.json | 2 +- 12 files changed, 38 insertions(+), 14 deletions(-) diff --git a/BE/holder/.eslintrc.js b/BE/holder/.eslintrc.js index 8f5aedb..356232f 100644 --- a/BE/holder/.eslintrc.js +++ b/BE/holder/.eslintrc.js @@ -2,7 +2,7 @@ module.exports = { parser: '@typescript-eslint/parser', parserOptions: { project: 'tsconfig.json', - tsconfigRootDir : __dirname, + tsconfigRootDir: __dirname, sourceType: 'module', }, plugins: ['@typescript-eslint/eslint-plugin'], @@ -21,5 +21,11 @@ module.exports = { '@typescript-eslint/explicit-function-return-type': 'off', '@typescript-eslint/explicit-module-boundary-types': 'off', '@typescript-eslint/no-explicit-any': 'off', + 'prettier/prettier': [ + 'error', + { + endOfLine: 'auto', + }, + ], }, }; diff --git a/BE/holder/package-lock.json b/BE/holder/package-lock.json index 38f2e1a..c019645 100644 --- a/BE/holder/package-lock.json +++ b/BE/holder/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "license": "UNLICENSED", "dependencies": { - "@nestjs/common": "^9.0.0", + "@nestjs/common": "^9.4.3", "@nestjs/core": "^9.0.0", "@nestjs/platform-express": "^9.0.0", "reflect-metadata": "^0.1.13", diff --git a/BE/holder/package.json b/BE/holder/package.json index edd04f6..d4ae085 100644 --- a/BE/holder/package.json +++ b/BE/holder/package.json @@ -21,7 +21,7 @@ "test:e2e": "jest --config ./test/jest-e2e.json" }, "dependencies": { - "@nestjs/common": "^9.0.0", + "@nestjs/common": "^9.4.3", "@nestjs/core": "^9.0.0", "@nestjs/platform-express": "^9.0.0", "reflect-metadata": "^0.1.13", diff --git a/BE/issuer/.eslintrc.js b/BE/issuer/.eslintrc.js index 8f5aedb..356232f 100644 --- a/BE/issuer/.eslintrc.js +++ b/BE/issuer/.eslintrc.js @@ -2,7 +2,7 @@ module.exports = { parser: '@typescript-eslint/parser', parserOptions: { project: 'tsconfig.json', - tsconfigRootDir : __dirname, + tsconfigRootDir: __dirname, sourceType: 'module', }, plugins: ['@typescript-eslint/eslint-plugin'], @@ -21,5 +21,11 @@ module.exports = { '@typescript-eslint/explicit-function-return-type': 'off', '@typescript-eslint/explicit-module-boundary-types': 'off', '@typescript-eslint/no-explicit-any': 'off', + 'prettier/prettier': [ + 'error', + { + endOfLine: 'auto', + }, + ], }, }; diff --git a/BE/issuer/package-lock.json b/BE/issuer/package-lock.json index c127cd7..c5c2921 100644 --- a/BE/issuer/package-lock.json +++ b/BE/issuer/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.1", "license": "UNLICENSED", "dependencies": { - "@nestjs/common": "^9.0.0", - "@nestjs/core": "^9.0.0", + "@nestjs/common": "^9.4.3", + "@nestjs/core": "^9.4.3", "@nestjs/platform-express": "^9.0.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", diff --git a/BE/issuer/package.json b/BE/issuer/package.json index b050448..4c8e65b 100644 --- a/BE/issuer/package.json +++ b/BE/issuer/package.json @@ -21,8 +21,8 @@ "test:e2e": "jest --config ./test/jest-e2e.json" }, "dependencies": { - "@nestjs/common": "^9.0.0", - "@nestjs/core": "^9.0.0", + "@nestjs/common": "^9.4.3", + "@nestjs/core": "^9.4.3", "@nestjs/platform-express": "^9.0.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", diff --git a/BE/service/.eslintrc.js b/BE/service/.eslintrc.js index 8f5aedb..356232f 100644 --- a/BE/service/.eslintrc.js +++ b/BE/service/.eslintrc.js @@ -2,7 +2,7 @@ module.exports = { parser: '@typescript-eslint/parser', parserOptions: { project: 'tsconfig.json', - tsconfigRootDir : __dirname, + tsconfigRootDir: __dirname, sourceType: 'module', }, plugins: ['@typescript-eslint/eslint-plugin'], @@ -21,5 +21,11 @@ module.exports = { '@typescript-eslint/explicit-function-return-type': 'off', '@typescript-eslint/explicit-module-boundary-types': 'off', '@typescript-eslint/no-explicit-any': 'off', + 'prettier/prettier': [ + 'error', + { + endOfLine: 'auto', + }, + ], }, }; diff --git a/BE/service/package-lock.json b/BE/service/package-lock.json index 2c9cf3c..aa89a00 100644 --- a/BE/service/package-lock.json +++ b/BE/service/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "license": "UNLICENSED", "dependencies": { - "@nestjs/common": "^9.0.0", + "@nestjs/common": "^9.4.3", "@nestjs/core": "^9.0.0", "@nestjs/platform-express": "^9.0.0", "reflect-metadata": "^0.1.13", diff --git a/BE/service/package.json b/BE/service/package.json index 96e4552..c65739e 100644 --- a/BE/service/package.json +++ b/BE/service/package.json @@ -21,7 +21,7 @@ "test:e2e": "jest --config ./test/jest-e2e.json" }, "dependencies": { - "@nestjs/common": "^9.0.0", + "@nestjs/common": "^9.4.3", "@nestjs/core": "^9.0.0", "@nestjs/platform-express": "^9.0.0", "reflect-metadata": "^0.1.13", diff --git a/BE/verifier/.eslintrc.js b/BE/verifier/.eslintrc.js index 8f5aedb..356232f 100644 --- a/BE/verifier/.eslintrc.js +++ b/BE/verifier/.eslintrc.js @@ -2,7 +2,7 @@ module.exports = { parser: '@typescript-eslint/parser', parserOptions: { project: 'tsconfig.json', - tsconfigRootDir : __dirname, + tsconfigRootDir: __dirname, sourceType: 'module', }, plugins: ['@typescript-eslint/eslint-plugin'], @@ -21,5 +21,11 @@ module.exports = { '@typescript-eslint/explicit-function-return-type': 'off', '@typescript-eslint/explicit-module-boundary-types': 'off', '@typescript-eslint/no-explicit-any': 'off', + 'prettier/prettier': [ + 'error', + { + endOfLine: 'auto', + }, + ], }, }; diff --git a/BE/verifier/package-lock.json b/BE/verifier/package-lock.json index db0b116..1b4ea7c 100644 --- a/BE/verifier/package-lock.json +++ b/BE/verifier/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "license": "UNLICENSED", "dependencies": { - "@nestjs/common": "^9.0.0", + "@nestjs/common": "^9.4.3", "@nestjs/core": "^9.0.0", "@nestjs/platform-express": "^9.0.0", "reflect-metadata": "^0.1.13", diff --git a/BE/verifier/package.json b/BE/verifier/package.json index e3c7933..61d16d2 100644 --- a/BE/verifier/package.json +++ b/BE/verifier/package.json @@ -21,7 +21,7 @@ "test:e2e": "jest --config ./test/jest-e2e.json" }, "dependencies": { - "@nestjs/common": "^9.0.0", + "@nestjs/common": "^9.4.3", "@nestjs/core": "^9.0.0", "@nestjs/platform-express": "^9.0.0", "reflect-metadata": "^0.1.13", From da1af925328718e4c017d55900b2259b92600e04 Mon Sep 17 00:00:00 2001 From: Lee-clipse <79911816+Lee-clipse@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:53:08 +0900 Subject: [PATCH 2/6] =?UTF-8?q?test:=20Hello=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Controller - Service 흐름 간단 테스트 --- BE/service/package-lock.json | 2 +- BE/service/package.json | 6 +++--- BE/service/src/app.controller.ts | 11 +++++++++++ BE/service/src/app.module.ts | 6 ++++-- BE/service/src/app.service.ts | 8 ++++++++ BE/service/test/app.test.spec.ts | 28 ++++++++++++++++++++++++++++ BE/service/test/jest-test.json | 13 +++++++++++++ 7 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 BE/service/src/app.controller.ts create mode 100644 BE/service/src/app.service.ts create mode 100644 BE/service/test/app.test.spec.ts create mode 100644 BE/service/test/jest-test.json diff --git a/BE/service/package-lock.json b/BE/service/package-lock.json index aa89a00..e127f6c 100644 --- a/BE/service/package-lock.json +++ b/BE/service/package-lock.json @@ -32,7 +32,7 @@ "jest": "28.1.3", "prettier": "^2.3.2", "source-map-support": "^0.5.20", - "supertest": "^6.1.3", + "supertest": "^6.3.4", "ts-jest": "28.0.8", "ts-loader": "^9.2.3", "ts-node": "^10.0.0", diff --git a/BE/service/package.json b/BE/service/package.json index c65739e..72023ba 100644 --- a/BE/service/package.json +++ b/BE/service/package.json @@ -14,7 +14,7 @@ "start:debug": "nest start --debug --watch", "start:prod": "node dist/main", "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix", - "test": "jest", + "test": "jest --config ./test/jest-test.json", "test:watch": "jest --watch", "test:cov": "jest --coverage", "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", @@ -44,7 +44,7 @@ "jest": "28.1.3", "prettier": "^2.3.2", "source-map-support": "^0.5.20", - "supertest": "^6.1.3", + "supertest": "^6.3.4", "ts-jest": "28.0.8", "ts-loader": "^9.2.3", "ts-node": "^10.0.0", @@ -68,4 +68,4 @@ "coverageDirectory": "../coverage", "testEnvironment": "node" } -} +} \ No newline at end of file diff --git a/BE/service/src/app.controller.ts b/BE/service/src/app.controller.ts new file mode 100644 index 0000000..f857c23 --- /dev/null +++ b/BE/service/src/app.controller.ts @@ -0,0 +1,11 @@ +import { Controller, Get } from '@nestjs/common'; +import { AppService } from './app.service'; + +@Controller('app') +export class AppController { + constructor(private readonly appService: AppService) {} + @Get() + getHello(): string { + return this.appService.sayHello(); + } +} diff --git a/BE/service/src/app.module.ts b/BE/service/src/app.module.ts index ee5f2c9..08c9fcd 100644 --- a/BE/service/src/app.module.ts +++ b/BE/service/src/app.module.ts @@ -1,8 +1,10 @@ import { Module } from '@nestjs/common'; +import { AppService } from './app.service'; +import { AppController } from './app.controller'; @Module({ imports: [], - controllers: [], - providers: [], + controllers: [AppController], + providers: [AppService], }) export class AppModule {} diff --git a/BE/service/src/app.service.ts b/BE/service/src/app.service.ts new file mode 100644 index 0000000..1566b18 --- /dev/null +++ b/BE/service/src/app.service.ts @@ -0,0 +1,8 @@ +import { Injectable } from '@nestjs/common'; + +@Injectable() +export class AppService { + sayHello(): string { + return 'Hello?'; + } +} diff --git a/BE/service/test/app.test.spec.ts b/BE/service/test/app.test.spec.ts new file mode 100644 index 0000000..70f39e4 --- /dev/null +++ b/BE/service/test/app.test.spec.ts @@ -0,0 +1,28 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { INestApplication } from '@nestjs/common'; +import * as request from 'supertest'; +import { AppModule } from '../src/app.module'; + +describe('AppController (e2e)', () => { + let app: INestApplication; + + beforeEach(async () => { + const moduleFixture: TestingModule = await Test.createTestingModule({ + imports: [AppModule], + }).compile(); + + app = moduleFixture.createNestApplication(); + await app.init(); + }); + + it('/app (GET)', () => { + return request(app.getHttpServer()) + .get('/app') + .expect(200) + .expect('Hello?'); + }); + + afterAll(async () => { + await app.close(); + }); +}); diff --git a/BE/service/test/jest-test.json b/BE/service/test/jest-test.json new file mode 100644 index 0000000..54c3b88 --- /dev/null +++ b/BE/service/test/jest-test.json @@ -0,0 +1,13 @@ +{ + "moduleFileExtensions": [ + "js", + "json", + "ts" + ], + "rootDir": ".", + "testEnvironment": "node", + "testRegex": ".test.spec.ts$", + "transform": { + "^.+\\.(t|j)s$": "ts-jest" + } +} \ No newline at end of file From 0ec4edd205d507b76ab1d81b15d7c9f5a50ab3e4 Mon Sep 17 00:00:00 2001 From: Lee-clipse <79911816+Lee-clipse@users.noreply.github.com> Date: Mon, 19 Feb 2024 13:01:38 +0900 Subject: [PATCH 3/6] =?UTF-8?q?test:=20CI=20yaml=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflow/test.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflow/test.yml diff --git a/.github/workflow/test.yml b/.github/workflow/test.yml new file mode 100644 index 0000000..eb8f3eb --- /dev/null +++ b/.github/workflow/test.yml @@ -0,0 +1,23 @@ +name: Test CI (Service API) + +on: + pull_request: + branches: [main, dev] + +jobs: + test: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v2 + + - name: Node 20.11 설치 + uses: actions/setup-node@v2 + with: + node-version: "20.11" + + - name: 모듈 설치 + run: cd ./BE/service && npm i + + - name: 테스트 실행 + run: cd ./BE/service && npm run test From 82f88422e957d3c6da09911a8756d49079653b16 Mon Sep 17 00:00:00 2001 From: Lee-clipse <79911816+Lee-clipse@users.noreply.github.com> Date: Mon, 19 Feb 2024 13:06:06 +0900 Subject: [PATCH 4/6] =?UTF-8?q?chore:=20=ED=8F=B4=EB=8D=94=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/{workflow/test.yml => workflows/test.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{workflow/test.yml => workflows/test.yaml} (100%) diff --git a/.github/workflow/test.yml b/.github/workflows/test.yaml similarity index 100% rename from .github/workflow/test.yml rename to .github/workflows/test.yaml From cc4a5fad2c8b0344a959d652600579d715581777 Mon Sep 17 00:00:00 2001 From: Lee-clipse <79911816+Lee-clipse@users.noreply.github.com> Date: Mon, 19 Feb 2024 13:08:36 +0900 Subject: [PATCH 5/6] =?UTF-8?q?test:=20=EC=9D=98=EB=8F=84=EC=A0=81=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=B2=A8?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/service/src/app.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BE/service/src/app.service.ts b/BE/service/src/app.service.ts index 1566b18..3540a0e 100644 --- a/BE/service/src/app.service.ts +++ b/BE/service/src/app.service.ts @@ -3,6 +3,6 @@ import { Injectable } from '@nestjs/common'; @Injectable() export class AppService { sayHello(): string { - return 'Hello?'; + return 'Who are you?'; } } From d41c6b817604c0f805faa03669910e25c575907b Mon Sep 17 00:00:00 2001 From: Lee-clipse <79911816+Lee-clipse@users.noreply.github.com> Date: Mon, 19 Feb 2024 13:09:44 +0900 Subject: [PATCH 6/6] =?UTF-8?q?test:=20=EC=9D=98=EB=8F=84=EC=A0=81=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/service/src/app.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BE/service/src/app.service.ts b/BE/service/src/app.service.ts index 3540a0e..1566b18 100644 --- a/BE/service/src/app.service.ts +++ b/BE/service/src/app.service.ts @@ -3,6 +3,6 @@ import { Injectable } from '@nestjs/common'; @Injectable() export class AppService { sayHello(): string { - return 'Who are you?'; + return 'Hello?'; } }