typescript-express-starter 9.1.2 → 9.2.0

package/lib/typegoose/src/services/auth.service.ts

@@ -10,10 +10,10 @@ import { isEmpty } from '@utils/util';
 
 class AuthService {
   public async signup(userData: CreateUserDto): Promise<User> {
-    if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
+    if (isEmpty(userData)) throw new HttpException(400, "userData is empty");
 
     const findUser: User = await userModel.findOne({ 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 userModel.create({ ...userData, password: hashedPassword });
@@ -22,13 +22,13 @@ class AuthService {
   }
 
   public async login(userData: CreateUserDto): Promise<{ cookie: string; findUser: User }> {
-    if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
+    if (isEmpty(userData)) throw new HttpException(400, "userData is empty");
 
     const findUser: User = await userModel.findOne({ email: userData.email });
-    if (!findUser) throw new HttpException(409, `You're email ${userData.email} not found`);
+    if (!findUser) throw new HttpException(409, `This email ${userData.email} was not found`);
 
     const isPasswordMatching: boolean = await compare(userData.password, findUser.password);
-    if (!isPasswordMatching) throw new HttpException(409, "You're password not matching");
+    if (!isPasswordMatching) throw new HttpException(409, "Password is not matching");
 
     const tokenData = this.createToken(findUser);
     const cookie = this.createCookie(tokenData);
@@ -37,10 +37,10 @@ class AuthService {
   }
 
   public async logout(userData: User): Promise<User> {
-    if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
+    if (isEmpty(userData)) throw new HttpException(400, "userData is empty");
 
     const findUser: User = await userModel.findOne({ email: userData.email, password: userData.password });
-    if (!findUser) throw new HttpException(409, `You're email ${userData.email} not found`);
+    if (!findUser) throw new HttpException(409, `This email ${userData.email} was not found`);
 
     return findUser;
   }

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

@@ -14,19 +14,19 @@ class UserService {
   }
 
   public async findUserById(userId: string): Promise<User> {
-    if (isEmpty(userId)) throw new HttpException(400, "You're not userId");
+    if (isEmpty(userId)) throw new HttpException(400, "UserId is empty");
 
     const findUser: User = await userModel.findOne({ _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");
+    if (isEmpty(userData)) throw new HttpException(400, "userData is empty");
 
     const findUser: User = await userModel.findOne({ 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 userModel.create({ ...userData, password: hashedPassword });
@@ -35,11 +35,11 @@ class UserService {
   }
 
   public async updateUser(userId: string, userData: CreateUserDto): Promise<User> {
-    if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
+    if (isEmpty(userData)) throw new HttpException(400, "userData is empty");
 
     if (userData.email) {
       const findUser: User = await userModel.findOne({ email: userData.email });
-      if (findUser && findUser._id != userId) throw new HttpException(409, `You're email ${userData.email} already exists`);
+      if (findUser && findUser._id != userId) throw new HttpException(409, `This email ${userData.email} already exists`);
     }
 
     if (userData.password) {
@@ -48,14 +48,14 @@ class UserService {
     }
 
     const updateUserById: User = await userModel.findByIdAndUpdate(userId, { userData });
-    if (!updateUserById) throw new HttpException(409, "You're not user");
+    if (!updateUserById) throw new HttpException(409, "User doesn't exist");
 
     return updateUserById;
   }
 
   public async deleteUser(userId: string): Promise<User> {
     const deleteUserById: User = await userModel.findByIdAndDelete(userId);
-    if (!deleteUserById) throw new HttpException(409, "You're not user");
+    if (!deleteUserById) throw new HttpException(409, "User doesn't exist");
 
     return deleteUserById;
   }

package/lib/typeorm/jest.config.js

@@ -1,4 +1,4 @@
-const { pathsToModuleNameMapper } = require('ts-jest/utils');
+const { pathsToModuleNameMapper } = require('ts-jest');
 const { compilerOptions } = require('./tsconfig.json');
 
 module.exports = {

package/lib/typeorm/package.json

@@ -18,60 +18,60 @@
   "dependencies": {
     "bcrypt": "^5.0.1",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.13.1",
+    "class-validator": "^0.13.2",
     "compression": "^1.7.4",
-    "cookie-parser": "^1.4.5",
+    "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
-    "dotenv": "^10.0.0",
-    "envalid": "^7.1.0",
-    "express": "^4.17.1",
-    "helmet": "^4.6.0",
+    "dotenv": "^16.0.1",
+    "envalid": "^7.3.1",
+    "express": "^4.18.1",
+    "helmet": "^5.1.1",
     "hpp": "^0.2.3",
     "jsonwebtoken": "^8.5.1",
     "morgan": "^1.10.0",
-    "pg": "^8.6.0",
+    "pg": "^8.7.3",
     "reflect-metadata": "^0.1.13",
-    "swagger-jsdoc": "^6.0.0",
-    "swagger-ui-express": "^4.1.6",
-    "typeorm": "^0.2.34",
-    "winston": "^3.3.3",
-    "winston-daily-rotate-file": "^4.5.5"
+    "swagger-jsdoc": "^6.2.1",
+    "swagger-ui-express": "^4.5.0",
+    "typeorm": "^0.2.45",
+    "winston": "^3.8.1",
+    "winston-daily-rotate-file": "^4.7.1"
   },
   "devDependencies": {
-    "@swc/cli": "^0.1.51",
-    "@swc/core": "^1.2.108",
+    "@swc/cli": "^0.1.57",
+    "@swc/core": "^1.2.220",
     "@types/bcrypt": "^5.0.0",
-    "@types/compression": "^1.7.1",
-    "@types/cookie-parser": "^1.4.2",
-    "@types/cors": "^2.8.11",
+    "@types/compression": "^1.7.2",
+    "@types/cookie-parser": "^1.4.3",
+    "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
-    "@types/hpp": "^0.2.1",
-    "@types/jest": "27.4.x",
-    "@types/jsonwebtoken": "^8.5.4",
+    "@types/hpp": "^0.2.2",
+    "@types/jest": "^28.1.6",
+    "@types/jsonwebtoken": "^8.5.8",
     "@types/morgan": "^1.9.3",
-    "@types/node": "^16.0.1",
-    "@types/supertest": "^2.0.11",
+    "@types/node": "^17.0.45",
+    "@types/supertest": "^2.0.12",
     "@types/swagger-jsdoc": "^6.0.1",
     "@types/swagger-ui-express": "^4.1.3",
-    "@typescript-eslint/eslint-plugin": "^4.28.2",
-    "@typescript-eslint/parser": "^4.28.2",
+    "@typescript-eslint/eslint-plugin": "^5.29.0",
+    "@typescript-eslint/parser": "^5.29.0",
     "cross-env": "^7.0.3",
-    "eslint": "^7.30.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "husky": "^7.0.1",
-    "jest": "^27.0.6",
-    "lint-staged": "^11.0.0",
+    "eslint": "^8.20.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "husky": "^8.0.1",
+    "jest": "^28.1.1",
+    "lint-staged": "^13.0.3",
     "node-config": "^0.0.2",
-    "node-gyp": "^8.1.0",
-    "nodemon": "^2.0.9",
-    "pm2": "^5.1.0",
-    "prettier": "^2.3.2",
-    "supertest": "^6.2.2",
-    "ts-jest": "^27.1.4",
-    "ts-node": "^10.4.0",
-    "tsc-alias": "^1.4.1",
-    "tsconfig-paths": "^3.10.1",
-    "typescript": "^4.5.2"
+    "node-gyp": "^9.1.0",
+    "nodemon": "^2.0.19",
+    "pm2": "^5.2.0",
+    "prettier": "^2.7.1",
+    "supertest": "^6.2.4",
+    "ts-jest": "^28.0.7",
+    "ts-node": "^10.9.1",
+    "tsc-alias": "^1.7.0",
+    "tsconfig-paths": "^4.0.0",
+    "typescript": "^4.7.4"
   }
-}
+}

package/lib/typeorm/src/databases/index.ts

@@ -5,7 +5,7 @@ import { DB_HOST, DB_PORT, DB_USER, DB_PASSWORD, DB_DATABASE } from '@config';
 export const dbConnection: ConnectionOptions = {
   type: 'postgres',
   host: DB_HOST,
-  port: DB_PORT,
+  port: Number(DB_PORT),
   username: DB_USER,
   password: DB_PASSWORD,
   database: DB_DATABASE,

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

@@ -12,10 +12,10 @@ import { isEmpty } from '@utils/util';
 @EntityRepository()
 class AuthService extends Repository<UserEntity> {
   public async signup(userData: CreateUserDto): Promise<User> {
-    if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
+    if (isEmpty(userData)) throw new HttpException(400, "userData is empty");
 
     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();
@@ -23,13 +23,13 @@ class AuthService extends Repository<UserEntity> {
   }
 
   public async login(userData: CreateUserDto): Promise<{ cookie: string; findUser: User }> {
-    if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
+    if (isEmpty(userData)) throw new HttpException(400, "userData is empty");
 
     const findUser: User = await UserEntity.findOne({ where: { email: userData.email } });
-    if (!findUser) throw new HttpException(409, `You're email ${userData.email} not found`);
+    if (!findUser) throw new HttpException(409, `This email ${userData.email} was not found`);
 
     const isPasswordMatching: boolean = await compare(userData.password, findUser.password);
-    if (!isPasswordMatching) throw new HttpException(409, "You're password not matching");
+    if (!isPasswordMatching) throw new HttpException(409, "Password not matching");
 
     const tokenData = this.createToken(findUser);
     const cookie = this.createCookie(tokenData);
@@ -38,10 +38,10 @@ class AuthService extends Repository<UserEntity> {
   }
 
   public async logout(userData: User): Promise<User> {
-    if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
+    if (isEmpty(userData)) throw new HttpException(400, "userData is empty");
 
     const findUser: User = await UserEntity.findOne({ where: { email: userData.email, password: userData.password } });
-    if (!findUser) throw new HttpException(409, "You're not user");
+    if (!findUser) throw new HttpException(409, "User doesn't exist");
 
     return findUser;
   }

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

@@ -14,19 +14,19 @@ class UserService extends Repository<UserEntity> {
   }
 
   public async findUserById(userId: number): Promise<User> {
-    if (isEmpty(userId)) throw new HttpException(400, "You're not userId");
+    if (isEmpty(userId)) throw new HttpException(400, "UserId is empty");
 
     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");
+    if (isEmpty(userData)) throw new HttpException(400, "userData is empty");
 
     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();
@@ -35,10 +35,10 @@ class UserService extends Repository<UserEntity> {
   }
 
   public async updateUser(userId: number, userData: CreateUserDto): Promise<User> {
-    if (isEmpty(userData)) throw new HttpException(400, "You're not userData");
+    if (isEmpty(userData)) throw new HttpException(400, "userData is empty");
 
     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,10 +48,10 @@ class UserService extends Repository<UserEntity> {
   }
 
   public async deleteUser(userId: number): Promise<User> {
-    if (isEmpty(userId)) throw new HttpException(400, "You're not userId");
+    if (isEmpty(userId)) throw new HttpException(400, "UserId is empty");
 
     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;

package/lib/typeorm/src/tests/auth.test.ts

@@ -1,9 +1,10 @@
 import bcrypt from 'bcrypt';
 import request from 'supertest';
-import { createConnection, getRepository } from 'typeorm';
+import { createConnection, getConnection, Repository } from 'typeorm';
 import App from '@/app';
 import { dbConnection } from '@databases';
 import { CreateUserDto } from '@dtos/users.dto';
+import { UserEntity } from '@entities/users.entity';
 import AuthRoute from '@routes/auth.route';
 
 beforeAll(async () => {
@@ -11,7 +12,7 @@ beforeAll(async () => {
 });
 
 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/users.test.ts

@@ -1,9 +1,10 @@
 import bcrypt from 'bcrypt';
 import request from 'supertest';
-import { createConnection, getRepository } from 'typeorm';
+import { createConnection, getConnection, Repository } from 'typeorm';
 import App from '@/app';
 import { dbConnection } from '@databases';
 import { CreateUserDto } from '@dtos/users.dto';
+import { UserEntity } from '@entities/users.entity';
 import UserRoute from '@routes/users.route';
 
 beforeAll(async () => {
@@ -11,15 +12,36 @@ beforeAll(async () => {
 });
 
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-express-starter",
-  "version": "9.1.2",
+  "version": "9.2.0",
   "description": "Quick and Easy TypeScript Express Starter",
   "author": "AGUMON <ljlm0402@gmail.com>",
   "license": "MIT",
@@ -36,14 +36,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"
   },