typescript-express-starter 9.1.2 → 10.0.0

package/lib/typeorm/src/services/users.service.ts

@@ -1,32 +1,28 @@
 import { hash } from 'bcrypt';
 import { EntityRepository, Repository } from 'typeorm';
-import { CreateUserDto } from '@dtos/users.dto';
+import { Service } from 'typedi';
 import { UserEntity } from '@entities/users.entity';
-import { HttpException } from '@exceptions/HttpException';
+import { HttpException } from '@/exceptions/httpException';
 import { User } from '@interfaces/users.interface';
-import { isEmpty } from '@utils/util';
 
+@Service()
 @EntityRepository()
-class UserService extends Repository<UserEntity> {
+export class UserService extends Repository<UserEntity> {
   public async findAllUser(): Promise<User[]> {
     const users: User[] = await UserEntity.find();
     return users;
   }
 
   public async findUserById(userId: number): Promise<User> {
-    if (isEmpty(userId)) throw new HttpException(400, "You're not userId");
-
     const findUser: User = await UserEntity.findOne({ where: { id: userId } });
-    if (!findUser) throw new HttpException(409, "You're not user");
+    if (!findUser) throw new HttpException(409, "User doesn't exist");
 
     return findUser;
   }
 
-  public async createUser(userData: CreateUserDto): Promise<User> {
-    if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
-
+  public async createUser(userData: User): Promise<User> {
     const findUser: User = await UserEntity.findOne({ where: { email: userData.email } });
-    if (findUser) throw new HttpException(409, `You're email ${userData.email} already exists`);
+    if (findUser) throw new HttpException(409, `This email ${userData.email} already exists`);
 
     const hashedPassword = await hash(userData.password, 10);
     const createUserData: User = await UserEntity.create({ ...userData, password: hashedPassword }).save();
@@ -34,11 +30,9 @@ class UserService extends Repository<UserEntity> {
     return createUserData;
   }
 
-  public async updateUser(userId: number, userData: CreateUserDto): Promise<User> {
-    if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
-
+  public async updateUser(userId: number, userData: User): Promise<User> {
     const findUser: User = await UserEntity.findOne({ where: { id: userId } });
-    if (!findUser) throw new HttpException(409, "You're not user");
+    if (!findUser) throw new HttpException(409, "User doesn't exist");
 
     const hashedPassword = await hash(userData.password, 10);
     await UserEntity.update(userId, { ...userData, password: hashedPassword });
@@ -48,14 +42,10 @@ class UserService extends Repository<UserEntity> {
   }
 
   public async deleteUser(userId: number): Promise<User> {
-    if (isEmpty(userId)) throw new HttpException(400, "You're not userId");
-
     const findUser: User = await UserEntity.findOne({ where: { id: userId } });
-    if (!findUser) throw new HttpException(409, "You're not user");
+    if (!findUser) throw new HttpException(409, "User doesn't exist");
 
     await UserEntity.delete({ id: userId });
     return findUser;
   }
 }
-
-export default UserService;

package/lib/typeorm/src/{tests → test}/auth.test.ts

@@ -1,17 +1,18 @@
 import bcrypt from 'bcrypt';
 import request from 'supertest';
-import { createConnection, getRepository } from 'typeorm';
-import App from '@/app';
+import { createConnection, getConnection, Repository } from 'typeorm';
+import { App } from '@/app';
 import { dbConnection } from '@databases';
 import { CreateUserDto } from '@dtos/users.dto';
-import AuthRoute from '@routes/auth.route';
+import { UserEntity } from '@entities/users.entity';
+import { AuthRoute } from '@routes/auth.route';
 
-beforeAll(async () => {
-  await createConnection(dbConnection);
-});
+// beforeAll(async () => {
+//   await createConnection(dbConnection);
+// });
 
 afterAll(async () => {
-  await new Promise<void>(resolve => setTimeout(() => resolve(), 500));
+  await getConnection().close();
 });
 
 describe('Testing Auth', () => {
@@ -23,8 +24,7 @@ describe('Testing Auth', () => {
       };
 
       const authRoute = new AuthRoute();
-      const users = authRoute.authController.authService.users;
-      const userRepository = getRepository(users);
+      const userRepository = new Repository<UserEntity>();
 
       userRepository.findOne = jest.fn().mockReturnValue(null);
       userRepository.save = jest.fn().mockReturnValue({
@@ -46,8 +46,7 @@ describe('Testing Auth', () => {
       };
 
       const authRoute = new AuthRoute();
-      const users = authRoute.authController.authService.users;
-      const userRepository = getRepository(users);
+      const userRepository = new Repository<UserEntity>();
 
       userRepository.findOne = jest.fn().mockReturnValue({
         id: 1,

package/lib/typeorm/src/{tests → test}/users.test.ts

@@ -1,25 +1,47 @@
 import bcrypt from 'bcrypt';
 import request from 'supertest';
-import { createConnection, getRepository } from 'typeorm';
-import App from '@/app';
+import { createConnection, getConnection, Repository } from 'typeorm';
+import { App } from '@/app';
 import { dbConnection } from '@databases';
 import { CreateUserDto } from '@dtos/users.dto';
-import UserRoute from '@routes/users.route';
+import { UserEntity } from '@entities/users.entity';
+import { UserRoute } from '@routes/users.route';
 
-beforeAll(async () => {
-  await createConnection(dbConnection);
-});
+// beforeAll(async () => {
+//   await createConnection(dbConnection);
+// });
 
 afterAll(async () => {
-  await new Promise<void>(resolve => setTimeout(() => resolve(), 500));
+  await getConnection().close();
 });
 
 describe('Testing Users', () => {
+  describe('[POST] /users', () => {
+    it('response Create user', async () => {
+      const userData: CreateUserDto = {
+        email: 'test@email.com',
+        password: 'q1w2e3r4!',
+      };
+
+      const usersRoute = new UserRoute();
+      const userRepository = new Repository<UserEntity>();
+
+      userRepository.findOne = jest.fn().mockReturnValue(null);
+      userRepository.save = jest.fn().mockReturnValue({
+        id: 1,
+        email: userData.email,
+        password: await bcrypt.hash(userData.password, 10),
+      });
+
+      const app = new App([usersRoute]);
+      return request(app.getServer()).post(`${usersRoute.path}`).send(userData).expect(201);
+    });
+  });
+
   describe('[GET] /users', () => {
     it('response findAll users', async () => {
       const usersRoute = new UserRoute();
-      const users = usersRoute.usersController.userService.users;
-      const userRepository = getRepository(users);
+      const userRepository = new Repository<UserEntity>();
 
       userRepository.find = jest.fn().mockReturnValue([
         {
@@ -49,8 +71,7 @@ describe('Testing Users', () => {
       const userId = 1;
 
       const usersRoute = new UserRoute();
-      const users = usersRoute.usersController.userService.users;
-      const userRepository = getRepository(users);
+      const userRepository = new Repository<UserEntity>();
 
       userRepository.findOne = jest.fn().mockReturnValue({
         id: userId,
@@ -63,29 +84,6 @@ describe('Testing Users', () => {
     });
   });
 
-  describe('[POST] /users', () => {
-    it('response Create user', async () => {
-      const userData: CreateUserDto = {
-        email: 'test@email.com',
-        password: 'q1w2e3r4!',
-      };
-
-      const usersRoute = new UserRoute();
-      const users = usersRoute.usersController.userService.users;
-      const userRepository = getRepository(users);
-
-      userRepository.findOne = jest.fn().mockReturnValue(null);
-      userRepository.save = jest.fn().mockReturnValue({
-        id: 1,
-        email: userData.email,
-        password: await bcrypt.hash(userData.password, 10),
-      });
-
-      const app = new App([usersRoute]);
-      return request(app.getServer()).post(`${usersRoute.path}`).send(userData).expect(201);
-    });
-  });
-
   describe('[PUT] /users/:id', () => {
     it('response Update user', async () => {
       const userId = 1;
@@ -95,8 +93,7 @@ describe('Testing Users', () => {
       };
 
       const usersRoute = new UserRoute();
-      const users = usersRoute.usersController.userService.users;
-      const userRepository = getRepository(users);
+      const userRepository = new Repository<UserEntity>();
 
       userRepository.findOne = jest.fn().mockReturnValue({
         id: userId,
@@ -124,8 +121,7 @@ describe('Testing Users', () => {
       const userId = 1;
 
       const usersRoute = new UserRoute();
-      const users = usersRoute.usersController.userService.users;
-      const userRepository = getRepository(users);
+      const userRepository = new Repository<UserEntity>();
 
       userRepository.findOne = jest.fn().mockReturnValue({
         id: userId,

package/lib/typeorm/src/utils/validateEnv.ts

@@ -1,10 +1,8 @@
 import { cleanEnv, port, str } from 'envalid';
 
-const validateEnv = () => {
+export const ValidateEnv = () => {
   cleanEnv(process.env, {
     NODE_ENV: str(),
     PORT: port(),
   });
 };
-
-export default validateEnv;

package/lib/typeorm/tsconfig.json

@@ -24,7 +24,7 @@
       "@/*": ["*"],
       "@config": ["config"],
       "@controllers/*": ["controllers/*"],
-      "@databases": ["databases"],
+      "@database": ["database"],
       "@dtos/*": ["dtos/*"],
       "@entities/*": ["entities/*"],
       "@exceptions/*": ["exceptions/*"],
@@ -36,5 +36,5 @@
     }
   },
   "include": ["src/**/*.ts", "src/**/*.json", ".env"],
-  "exclude": ["node_modules", "src/http", "src/logs", "src/tests"]
+  "exclude": ["node_modules", "src/http", "src/logs"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-express-starter",
-  "version": "9.1.2",
+  "version": "10.0.0",
   "description": "Quick and Easy TypeScript Express Starter",
   "author": "AGUMON <ljlm0402@gmail.com>",
   "license": "MIT",
@@ -16,6 +16,7 @@
     "typegoose",
     "mikro-orm",
     "routing-controllers",
+    "node-postgres",
     "logger",
     "swagger",
     "jest",
@@ -36,14 +37,13 @@
     "start": "node bin/cli.js"
   },
   "dependencies": {
-    "chalk": "^3.0.0",
+    "chalk": "^4.1.2",
     "edit-json-file": "^1.5.0",
     "gitignore": "^0.6.0",
     "inquirer": "^6.5.2",
     "ncp": "^2.0.0",
     "ora": "^4.0.3"
   },
-  "devDependencies": {},
   "publishConfig": {
     "access": "public"
   },

package/lib/default/Dockerfile

@@ -1,24 +0,0 @@
-# Common build stage
-FROM node:14.14.0-alpine3.12 as common-build-stage
-
-COPY . ./app
-
-WORKDIR /app
-
-RUN npm install
-
-EXPOSE 3000
-
-# Development build stage
-FROM common-build-stage as development-build-stage
-
-ENV NODE_ENV development
-
-CMD ["npm", "run", "dev"]
-
-# Production build stage
-FROM common-build-stage as production-build-stage
-
-ENV NODE_ENV production
-
-CMD ["npm", "run", "start"]

package/lib/default/src/controllers/index.controller.ts

@@ -1,13 +0,0 @@
-import { NextFunction, Request, Response } from 'express';
-
-class IndexController {
-  public index = (req: Request, res: Response, next: NextFunction): void => {
-    try {
-      res.sendStatus(200);
-    } catch (error) {
-      next(error);
-    }
-  };
-}
-
-export default IndexController;

package/lib/default/src/routes/index.route.ts

@@ -1,19 +0,0 @@
-import { Router } from 'express';
-import IndexController from '@controllers/index.controller';
-import { Routes } from '@interfaces/routes.interface';
-
-class IndexRoute implements Routes {
-  public path = '/';
-  public router = Router();
-  public indexController = new IndexController();
-
-  constructor() {
-    this.initializeRoutes();
-  }
-
-  private initializeRoutes() {
-    this.router.get(`${this.path}`, this.indexController.index);
-  }
-}
-
-export default IndexRoute;

package/lib/default/src/utils/util.ts

@@ -1,19 +0,0 @@
-/**
- * @method isEmpty
- * @param {String | Number | Object} value
- * @returns {Boolean} true & false
- * @description this value is Empty Check
- */
-export const isEmpty = (value: string | number | object): boolean => {
-  if (value === null) {
-    return true;
-  } else if (typeof value !== 'number' && value === '') {
-    return true;
-  } else if (typeof value === 'undefined' || value === undefined) {
-    return true;
-  } else if (value !== null && typeof value === 'object' && !Object.keys(value).length) {
-    return true;
-  } else {
-    return false;
-  }
-};

package/lib/graphql/Dockerfile

@@ -1,24 +0,0 @@
-# Common build stage
-FROM node:14.14.0-alpine3.12 as common-build-stage
-
-COPY . ./app
-
-WORKDIR /app
-
-RUN npm install
-
-EXPOSE 3000
-
-# Development build stage
-FROM common-build-stage as development-build-stage
-
-ENV NODE_ENV development
-
-CMD ["npm", "run", "dev"]
-
-# Production build stage
-FROM common-build-stage as production-build-stage
-
-ENV NODE_ENV production
-
-CMD ["npm", "run", "start"]

package/lib/graphql/src/tests/index.test.ts

@@ -1,18 +0,0 @@
-import request from 'supertest';
-import App from '@app';
-import IndexRoute from '@routes/index.route';
-
-afterAll(async () => {
-  await new Promise<void>(resolve => setTimeout(() => resolve(), 500));
-});
-
-describe('Testing Index', () => {
-  describe('[GET] /', () => {
-    it('response statusCode 200', () => {
-      const indexRoute = new IndexRoute();
-      const app = new App([indexRoute]);
-
-      return request(app.getServer()).get(`${indexRoute.path}`).expect(200);
-    });
-  });
-});

package/lib/graphql/src/tests/users.test.ts

@@ -1,71 +0,0 @@
-import request from 'supertest';
-import App from '@app';
-import { CreateUserDto } from '@dtos/users.dto';
-import { User } from '@interfaces/users.interface';
-import userModel from '@models/users.model';
-import UserRoute from '@routes/users.route';
-
-afterAll(async () => {
-  await new Promise<void>(resolve => setTimeout(() => resolve(), 500));
-});
-
-describe('Testing Users', () => {
-  describe('[GET] /users', () => {
-    it('response statusCode 200 / findAll', () => {
-      const findUser: User[] = userModel;
-      const usersRoute = new UserRoute();
-      const app = new App([usersRoute]);
-
-      return request(app.getServer()).get(`${usersRoute.path}`).expect(200, { data: findUser, message: 'findAll' });
-    });
-  });
-
-  describe('[GET] /users/:id', () => {
-    it('response statusCode 200 / findOne', () => {
-      const userId = 1;
-      const findUser: User = userModel.find(user => user.id === userId);
-      const usersRoute = new UserRoute();
-      const app = new App([usersRoute]);
-
-      return request(app.getServer()).get(`${usersRoute.path}/${userId}`).expect(200, { data: findUser, message: 'findOne' });
-    });
-  });
-
-  describe('[POST] /users', () => {
-    it('response statusCode 201 / created', async () => {
-      const userData: CreateUserDto = {
-        email: 'test@email.com',
-        password: 'q1w2e3r4',
-      };
-      const usersRoute = new UserRoute();
-      const app = new App([usersRoute]);
-
-      return request(app.getServer()).post(`${usersRoute.path}`).send(userData).expect(201);
-    });
-  });
-
-  describe('[PUT] /users/:id', () => {
-    it('response statusCode 200 / updated', async () => {
-      const userId = 1;
-      const userData: CreateUserDto = {
-        email: 'test@email.com',
-        password: 'q1w2e3r4',
-      };
-      const usersRoute = new UserRoute();
-      const app = new App([usersRoute]);
-
-      return request(app.getServer()).put(`${usersRoute.path}/${userId}`).send(userData).expect(200);
-    });
-  });
-
-  describe('[DELETE] /users/:id', () => {
-    it('response statusCode 200 / deleted', () => {
-      const userId = 1;
-      const deleteUser: User[] = userModel.filter(user => user.id !== userId);
-      const usersRoute = new UserRoute();
-      const app = new App([usersRoute]);
-
-      return request(app.getServer()).delete(`${usersRoute.path}/${userId}`).expect(200, { data: deleteUser, message: 'deleted' });
-    });
-  });
-});

package/lib/graphql/src/utils/util.ts

@@ -1,19 +0,0 @@
-/**
- * @method isEmpty
- * @param {String | Number | Object} value
- * @returns {Boolean} true & false
- * @description this value is Empty Check
- */
- export const isEmpty = (value: string | number | object): boolean => {
-  if (value === null) {
-    return true;
-  } else if (typeof value !== 'number' && value === '') {
-    return true;
-  } else if (typeof value === 'undefined' || value === undefined) {
-    return true;
-  } else if (value !== null && typeof value === 'object' && !Object.keys(value).length) {
-    return true;
-  } else {
-    return false;
-  }
-};

package/lib/knex/Dockerfile

@@ -1,24 +0,0 @@
-# Common build stage
-FROM node:14.14.0-alpine3.12 as common-build-stage
-
-COPY . ./app
-
-WORKDIR /app
-
-RUN npm install
-
-EXPOSE 3000
-
-# Development build stage
-FROM common-build-stage as development-build-stage
-
-ENV NODE_ENV development
-
-CMD ["npm", "run", "dev"]
-
-# Production build stage
-FROM common-build-stage as production-build-stage
-
-ENV NODE_ENV production
-
-CMD ["npm", "run", "start"]

package/lib/knex/src/controllers/index.controller.ts

@@ -1,13 +0,0 @@
-import { NextFunction, Request, Response } from 'express';
-
-class IndexController {
-  public index = (req: Request, res: Response, next: NextFunction): void => {
-    try {
-      res.sendStatus(200);
-    } catch (error) {
-      next(error);
-    }
-  };
-}
-
-export default IndexController;

package/lib/knex/src/databases/migrations/20210713110926_initial.ts

@@ -1,13 +0,0 @@
-import Knex from 'knex';
-
-export async function up(knex: Knex): Promise<void> {
-  await knex.schema.createTable('users', table => {
-    table.bigIncrements('id').unsigned().primary();
-    table.string('email', 45).notNullable();
-    table.string('password', 255).notNullable();
-  });
-}
-
-export async function down(knex: Knex): Promise<void> {
-  await knex.schema.dropTable('users');
-}

package/lib/knex/src/routes/index.route.ts

@@ -1,19 +0,0 @@
-import { Router } from 'express';
-import IndexController from '@controllers/index.controller';
-import { Routes } from '@interfaces/routes.interface';
-
-class IndexRoute implements Routes {
-  public path = '/';
-  public router = Router();
-  public indexController = new IndexController();
-
-  constructor() {
-    this.initializeRoutes();
-  }
-
-  private initializeRoutes() {
-    this.router.get(`${this.path}`, this.indexController.index);
-  }
-}
-
-export default IndexRoute;

package/lib/knex/src/tests/index.test.ts

@@ -1,17 +0,0 @@
-import request from 'supertest';
-import App from '@/app';
-import IndexRoute from '@routes/index.route';
-
-afterAll(async () => {
-  await new Promise<void>(resolve => setTimeout(() => resolve(), 500));
-});
-
-describe('Testing Index', () => {
-  describe('[GET] /', () => {
-    it('response statusCode 200', () => {
-      const indexRoute = new IndexRoute();
-      const app = new App([indexRoute]);
-      return request(app.getServer()).get(`${indexRoute.path}`).expect(200);
-    });
-  });
-});

package/lib/knex/src/utils/util.ts

@@ -1,19 +0,0 @@
-/**
- * @method isEmpty
- * @param {String | Number | Object} value
- * @returns {Boolean} true & false
- * @description this value is Empty Check
- */
-export const isEmpty = (value: string | number | object): boolean => {
-  if (value === null) {
-    return true;
-  } else if (typeof value !== 'number' && value === '') {
-    return true;
-  } else if (typeof value === 'undefined' || value === undefined) {
-    return true;
-  } else if (value !== null && typeof value === 'object' && !Object.keys(value).length) {
-    return true;
-  } else {
-    return false;
-  }
-};

package/lib/mikro-orm/Dockerfile

@@ -1,24 +0,0 @@
-# Common build stage
-FROM node:14.14.0-alpine3.12 as common-build-stage
-
-COPY . ./app
-
-WORKDIR /app
-
-RUN npm install
-
-EXPOSE 3000
-
-# Development build stage
-FROM common-build-stage as development-build-stage
-
-ENV NODE_ENV development
-
-CMD ["npm", "run", "dev"]
-
-# Production build stage
-FROM common-build-stage as production-build-stage
-
-ENV NODE_ENV production
-
-CMD ["npm", "run", "start"]

package/lib/mikro-orm/src/controllers/index.controller.ts

@@ -1,13 +0,0 @@
-import { NextFunction, Request, Response } from 'express';
-
-class IndexController {
-  public index = (req: Request, res: Response, next: NextFunction) => {
-    try {
-      res.sendStatus(200);
-    } catch (error) {
-      next(error);
-    }
-  };
-}
-
-export default IndexController;