From d03a5f7a7a0044e50ae0aaa833f7617a94ec5721 Mon Sep 17 00:00:00 2001 From: publdaze Date: Thu, 13 Jul 2023 11:43:24 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EA=B0=81=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .prettierrc | 2 +- package-lock.json | 14 ++++++++++++++ package.json | 2 ++ src/app.module.ts | 7 ++++--- src/buildings/buildings.controller.spec.ts | 18 ++++++++++++++++++ src/buildings/buildings.controller.ts | 4 ++++ src/buildings/buildings.module.ts | 9 +++++++++ src/buildings/buildings.service.spec.ts | 18 ++++++++++++++++++ src/buildings/buildings.service.ts | 4 ++++ src/buildings/entities/building.entity.ts | 8 ++++++++ src/cans/cans.controller.spec.ts | 18 ++++++++++++++++++ src/cans/cans.controller.ts | 4 ++++ src/cans/cans.module.ts | 9 +++++++++ src/cans/cans.service.spec.ts | 18 ++++++++++++++++++ src/cans/cans.service.ts | 3 +++ src/cans/entities/can.entity.ts | 7 +++++++ src/floors/entities/floor.entity.ts | 6 ++++++ src/floors/floors.controller.spec.ts | 18 ++++++++++++++++++ src/floors/floors.controller.ts | 4 ++++ src/floors/floors.module.ts | 9 +++++++++ src/floors/floors.service.spec.ts | 18 ++++++++++++++++++ src/floors/floors.service.ts | 4 ++++ 22 files changed, 200 insertions(+), 4 deletions(-) create mode 100644 src/buildings/buildings.controller.spec.ts create mode 100644 src/buildings/buildings.controller.ts create mode 100644 src/buildings/buildings.module.ts create mode 100644 src/buildings/buildings.service.spec.ts create mode 100644 src/buildings/buildings.service.ts create mode 100644 src/buildings/entities/building.entity.ts create mode 100644 src/cans/cans.controller.spec.ts create mode 100644 src/cans/cans.controller.ts create mode 100644 src/cans/cans.module.ts create mode 100644 src/cans/cans.service.spec.ts create mode 100644 src/cans/cans.service.ts create mode 100644 src/cans/entities/can.entity.ts create mode 100644 src/floors/entities/floor.entity.ts create mode 100644 src/floors/floors.controller.spec.ts create mode 100644 src/floors/floors.controller.ts create mode 100644 src/floors/floors.module.ts create mode 100644 src/floors/floors.service.spec.ts create mode 100644 src/floors/floors.service.ts diff --git a/.prettierrc b/.prettierrc index dcb7279..a20502b 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,4 @@ { "singleQuote": true, "trailingComma": "all" -} \ No newline at end of file +} diff --git a/package-lock.json b/package-lock.json index 7e4957a..7526adc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,7 @@ "@nestjs/testing": "^10.0.0", "@types/express": "^4.17.17", "@types/jest": "^29.5.2", + "@types/lodash": "^4.14.195", "@types/node": "^20.3.1", "@types/supertest": "^2.0.12", "@typescript-eslint/eslint-plugin": "^5.59.11", @@ -29,6 +30,7 @@ "eslint-config-prettier": "^8.8.0", "eslint-plugin-prettier": "^4.2.1", "jest": "^29.5.0", + "lodash": "^4.17.21", "prettier": "^2.8.8", "source-map-support": "^0.5.21", "supertest": "^6.3.3", @@ -1822,6 +1824,12 @@ "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", "dev": true }, + "node_modules/@types/lodash": { + "version": "4.14.195", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.195.tgz", + "integrity": "sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==", + "dev": true + }, "node_modules/@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", @@ -9347,6 +9355,12 @@ "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", "dev": true }, + "@types/lodash": { + "version": "4.14.195", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.195.tgz", + "integrity": "sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==", + "dev": true + }, "@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", diff --git a/package.json b/package.json index 80c60bb..f699567 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "@nestjs/testing": "^10.0.0", "@types/express": "^4.17.17", "@types/jest": "^29.5.2", + "@types/lodash": "^4.14.195", "@types/node": "^20.3.1", "@types/supertest": "^2.0.12", "@typescript-eslint/eslint-plugin": "^5.59.11", @@ -40,6 +41,7 @@ "eslint-config-prettier": "^8.8.0", "eslint-plugin-prettier": "^4.2.1", "jest": "^29.5.0", + "lodash": "^4.17.21", "prettier": "^2.8.8", "source-map-support": "^0.5.21", "supertest": "^6.3.3", diff --git a/src/app.module.ts b/src/app.module.ts index ee5f2c9..e3d3662 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -1,8 +1,9 @@ import { Module } from '@nestjs/common'; +import { CansModule } from './cans/cans.module'; +import { BuildingsModule } from './buildings/buildings.module'; +import { FloorsModule } from './floors/floors.module'; @Module({ - imports: [], - controllers: [], - providers: [], + imports: [CansModule, BuildingsModule, FloorsModule], }) export class AppModule {} diff --git a/src/buildings/buildings.controller.spec.ts b/src/buildings/buildings.controller.spec.ts new file mode 100644 index 0000000..25e8fb5 --- /dev/null +++ b/src/buildings/buildings.controller.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { BuildingsController } from './buildings.controller'; + +describe('BuildingsController', () => { + let controller: BuildingsController; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + controllers: [BuildingsController], + }).compile(); + + controller = module.get(BuildingsController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/src/buildings/buildings.controller.ts b/src/buildings/buildings.controller.ts new file mode 100644 index 0000000..ddbd691 --- /dev/null +++ b/src/buildings/buildings.controller.ts @@ -0,0 +1,4 @@ +import { Controller } from '@nestjs/common'; + +@Controller('buildings') +export class BuildingsController {} diff --git a/src/buildings/buildings.module.ts b/src/buildings/buildings.module.ts new file mode 100644 index 0000000..71e2993 --- /dev/null +++ b/src/buildings/buildings.module.ts @@ -0,0 +1,9 @@ +import { Module } from '@nestjs/common'; +import { BuildingsController } from './buildings.controller'; +import { BuildingsService } from './buildings.service'; + +@Module({ + controllers: [BuildingsController], + providers: [BuildingsService], +}) +export class BuildingsModule {} diff --git a/src/buildings/buildings.service.spec.ts b/src/buildings/buildings.service.spec.ts new file mode 100644 index 0000000..fac3032 --- /dev/null +++ b/src/buildings/buildings.service.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { BuildingsService } from './buildings.service'; + +describe('BuildingsService', () => { + let service: BuildingsService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [BuildingsService], + }).compile(); + + service = module.get(BuildingsService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); +}); diff --git a/src/buildings/buildings.service.ts b/src/buildings/buildings.service.ts new file mode 100644 index 0000000..4c35c61 --- /dev/null +++ b/src/buildings/buildings.service.ts @@ -0,0 +1,4 @@ +import { Injectable } from '@nestjs/common'; + +@Injectable() +export class BuildingsService {} diff --git a/src/buildings/entities/building.entity.ts b/src/buildings/entities/building.entity.ts new file mode 100644 index 0000000..4822e7c --- /dev/null +++ b/src/buildings/entities/building.entity.ts @@ -0,0 +1,8 @@ +import { Floor } from '../../floors/entities/floor.entity'; + +export class Building { + buildingId: number; + buildingName: number; + name: string; + floors: Floor[]; +} diff --git a/src/cans/cans.controller.spec.ts b/src/cans/cans.controller.spec.ts new file mode 100644 index 0000000..fed4f31 --- /dev/null +++ b/src/cans/cans.controller.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { CansController } from './cans.controller'; + +describe('CansController', () => { + let controller: CansController; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + controllers: [CansController], + }).compile(); + + controller = module.get(CansController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/src/cans/cans.controller.ts b/src/cans/cans.controller.ts new file mode 100644 index 0000000..86584a3 --- /dev/null +++ b/src/cans/cans.controller.ts @@ -0,0 +1,4 @@ +import { Controller } from '@nestjs/common'; + +@Controller('cans') +export class CansController {} diff --git a/src/cans/cans.module.ts b/src/cans/cans.module.ts new file mode 100644 index 0000000..d67f520 --- /dev/null +++ b/src/cans/cans.module.ts @@ -0,0 +1,9 @@ +import { Module } from '@nestjs/common'; +import { CansService } from './cans.service'; +import { CansController } from './cans.controller'; + +@Module({ + providers: [CansService], + controllers: [CansController], +}) +export class CansModule {} diff --git a/src/cans/cans.service.spec.ts b/src/cans/cans.service.spec.ts new file mode 100644 index 0000000..7721d79 --- /dev/null +++ b/src/cans/cans.service.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { CansService } from './cans.service'; + +describe('CansService', () => { + let service: CansService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [CansService], + }).compile(); + + service = module.get(CansService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); +}); diff --git a/src/cans/cans.service.ts b/src/cans/cans.service.ts new file mode 100644 index 0000000..856ee01 --- /dev/null +++ b/src/cans/cans.service.ts @@ -0,0 +1,3 @@ +import { Injectable } from '@nestjs/common'; +@Injectable() +export class CansService {} diff --git a/src/cans/entities/can.entity.ts b/src/cans/entities/can.entity.ts new file mode 100644 index 0000000..32c8c22 --- /dev/null +++ b/src/cans/entities/can.entity.ts @@ -0,0 +1,7 @@ +export class Can { + canId: number; + regular: number; + bottle: number; + plastic: number; + paper: number; +} diff --git a/src/floors/entities/floor.entity.ts b/src/floors/entities/floor.entity.ts new file mode 100644 index 0000000..cd53871 --- /dev/null +++ b/src/floors/entities/floor.entity.ts @@ -0,0 +1,6 @@ +import { Can } from '../../cans/entities/can.entity'; + +export class Floor { + floorNumber: number; + trashCans: Can[]; +} diff --git a/src/floors/floors.controller.spec.ts b/src/floors/floors.controller.spec.ts new file mode 100644 index 0000000..a7f7f6b --- /dev/null +++ b/src/floors/floors.controller.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { FloorsController } from './floors.controller'; + +describe('FloorsController', () => { + let controller: FloorsController; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + controllers: [FloorsController], + }).compile(); + + controller = module.get(FloorsController); + }); + + it('should be defined', () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/src/floors/floors.controller.ts b/src/floors/floors.controller.ts new file mode 100644 index 0000000..f6de074 --- /dev/null +++ b/src/floors/floors.controller.ts @@ -0,0 +1,4 @@ +import { Controller } from '@nestjs/common'; + +@Controller('floors') +export class FloorsController {} diff --git a/src/floors/floors.module.ts b/src/floors/floors.module.ts new file mode 100644 index 0000000..2f9ec2f --- /dev/null +++ b/src/floors/floors.module.ts @@ -0,0 +1,9 @@ +import { Module } from '@nestjs/common'; +import { FloorsController } from './floors.controller'; +import { FloorsService } from './floors.service'; + +@Module({ + controllers: [FloorsController], + providers: [FloorsService], +}) +export class FloorsModule {} diff --git a/src/floors/floors.service.spec.ts b/src/floors/floors.service.spec.ts new file mode 100644 index 0000000..474e3d7 --- /dev/null +++ b/src/floors/floors.service.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { FloorsService } from './floors.service'; + +describe('FloorsService', () => { + let service: FloorsService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [FloorsService], + }).compile(); + + service = module.get(FloorsService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); +}); diff --git a/src/floors/floors.service.ts b/src/floors/floors.service.ts new file mode 100644 index 0000000..b7932c7 --- /dev/null +++ b/src/floors/floors.service.ts @@ -0,0 +1,4 @@ +import { Injectable } from '@nestjs/common'; + +@Injectable() +export class FloorsService {}