typescript-express-starter 10.0.0 → 10.1.1

package/lib/node-postgres/src/services/auth.service.ts

@@ -2,10 +2,10 @@ import { hash, compare } from 'bcrypt';
 import { sign } from 'jsonwebtoken';
 import { Service } from 'typedi';
 import { SECRET_KEY } from '@config';
+import pg from '@database';
 import { HttpException } from '@exceptions/httpException';
 import { DataStoredInToken, TokenData } from '@interfaces/auth.interface';
 import { User } from '@interfaces/users.interface';
-import { UserModel } from '@models/users.model';
 
 const createToken = (user: User): TokenData => {
   const dataStoredInToken: DataStoredInToken = { id: user.id };
@@ -21,32 +21,83 @@ const createCookie = (tokenData: TokenData): string => {
 @Service()
 export class AuthService {
   public async signup(userData: User): Promise<User> {
-    const findUser: User = UserModel.find(user => user.email === userData.email);
-    if (findUser) throw new HttpException(409, `This email ${userData.email} already exists`);
+    const { email, password } = userData;
 
-    const hashedPassword = await hash(userData.password, 10);
-    const createUserData: User = { id: UserModel.length + 1, ...userData, password: hashedPassword };
+    const { rows: findUser } = await pg.query(
+      `
+    SELECT EXISTS(
+      SELECT
+        "email"
+      FROM
+        users
+      WHERE
+        "email" = $1
+    )`,
+      [email],
+    );
+    if (findUser[0].exists) throw new HttpException(409, `This email ${userData.email} already exists`);
 
-    return createUserData;
+    const hashedPassword = await hash(password, 10);
+    const { rows: signUpUserData } = await pg.query(
+      `
+      INSERT INTO
+        users(
+          "email",
+          "password"
+        )
+      VALUES ($1, $2)
+      RETURNING "email", "password"
+      `,
+      [email, hashedPassword],
+    );
+
+    return signUpUserData[0];
   }
 
   public async login(userData: User): Promise<{ cookie: string; findUser: User }> {
-    const findUser: User = UserModel.find(user => user.email === userData.email);
-    if (!findUser) throw new HttpException(409, `This email ${userData.email} was not found`);
+    const { email, password } = userData;
+
+    const { rows, rowCount } = await pg.query(
+      `
+      SELECT
+        "email",
+        "password"
+      FROM
+        users
+      WHERE
+        "email" = $1
+    `,
+      [email],
+    );
+    if (!rowCount) throw new HttpException(409, `This email ${email} was not found`);
 
-    const isPasswordMatching: boolean = await compare(userData.password, findUser.password);
+    const isPasswordMatching: boolean = await compare(password, rows[0].password);
     if (!isPasswordMatching) throw new HttpException(409, "You're password not matching");
 
-    const tokenData = createToken(findUser);
+    const tokenData = createToken(rows[0]);
     const cookie = createCookie(tokenData);
-
-    return { cookie, findUser };
+    return { cookie, findUser: rows[0] };
   }
 
   public async logout(userData: User): Promise<User> {
-    const findUser: User = UserModel.find(user => user.email === userData.email && user.password === userData.password);
-    if (!findUser) throw new HttpException(409, "User doesn't exist");
+    const { email, password } = userData;
+
+    const { rows, rowCount } = await pg.query(
+      `
+    SELECT
+        "email",
+        "password"
+      FROM
+        users
+      WHERE
+        "email" = $1
+      AND
+        "password" = $2
+    `,
+      [email, password],
+    );
+    if (!rowCount) throw new HttpException(409, "User doesn't exist");
 
-    return findUser;
+    return rows[0];
   }
 }

package/lib/node-postgres/src/services/users.service.ts

@@ -1,51 +1,133 @@
 import { hash } from 'bcrypt';
 import { Service } from 'typedi';
+import pg from '@database';
 import { HttpException } from '@exceptions/httpException';
 import { User } from '@interfaces/users.interface';
-import { UserModel } from '@models/users.model';
 
 @Service()
 export class UserService {
   public async findAllUser(): Promise<User[]> {
-    const users: User[] = UserModel;
-    return users;
+    const { rows } = await pg.query(`
+    SELECT
+      *
+    FROM
+      users
+    `);
+    return rows;
   }
 
   public async findUserById(userId: number): Promise<User> {
-    const findUser: User = UserModel.find(user => user.id === userId);
-    if (!findUser) throw new HttpException(409, "User doesn't exist");
+    const { rows, rowCount } = await pg.query(
+      `
+    SELECT
+      *
+    FROM
+      users
+    WHERE
+      id = $1
+    `,
+      [userId],
+    );
+    if (!rowCount) throw new HttpException(409, "User doesn't exist");
 
-    return findUser;
+    return rows[0];
   }
 
   public async createUser(userData: User): Promise<User> {
-    const findUser: User = UserModel.find(user => user.email === userData.email);
-    if (findUser) throw new HttpException(409, `This email ${userData.email} already exists`);
+    const { email, password } = userData;
 
-    const hashedPassword = await hash(userData.password, 10);
-    const createUserData: User = { id: UserModel.length + 1, ...userData, password: hashedPassword };
+    const { rows } = await pg.query(
+      `
+    SELECT EXISTS(
+      SELECT
+        "email"
+      FROM
+        users
+      WHERE
+        "email" = $1
+    )`,
+      [email],
+    );
+    if (rows[0].exists) throw new HttpException(409, `This email ${email} already exists`);
 
-    return createUserData;
+    const hashedPassword = await hash(password, 10);
+    const { rows: createUserData } = await pg.query(
+      `
+      INSERT INTO
+        users(
+          "email",
+          "password"
+        )
+      VALUES ($1, $2)
+      RETURNING "email", "password"
+      `,
+      [email, hashedPassword],
+    );
+
+    return createUserData[0];
   }
 
   public async updateUser(userId: number, userData: User): Promise<User[]> {
-    const findUser: User = UserModel.find(user => user.id === userId);
-    if (!findUser) throw new HttpException(409, "User doesn't exist");
+    const { rows: findUser } = await pg.query(
+      `
+      SELECT EXISTS(
+        SELECT
+          "id"
+        FROM
+          users
+        WHERE
+          "id" = $1
+      )`,
+      [userId],
+    );
+    if (findUser[0].exists) throw new HttpException(409, "User doesn't exist");
 
-    const hashedPassword = await hash(userData.password, 10);
-    const updateUserData: User[] = UserModel.map((user: User) => {
-      if (user.id === findUser.id) user = { id: userId, ...userData, password: hashedPassword };
-      return user;
-    });
+    const { email, password } = userData;
+    const hashedPassword = await hash(password, 10);
+    const { rows: updateUserData } = await pg.query(
+      `
+      UPDATE
+        users
+      SET
+        "email" = $2,
+        "password" = $3
+      WHERE
+        "id" = $1
+      RETURNING "email", "password"
+    `,
+      [userId, email, hashedPassword],
+    );
 
     return updateUserData;
   }
 
   public async deleteUser(userId: number): Promise<User[]> {
-    const findUser: User = UserModel.find(user => user.id === userId);
-    if (!findUser) throw new HttpException(409, "User doesn't exist");
+    const { rows: findUser } = await pg.query(
+      `
+      SELECT EXISTS(
+        SELECT
+          "id"
+        FROM
+          users
+        WHERE
+          "id" = $1
+      )`,
+      [userId],
+    );
+    if (findUser[0].exists) throw new HttpException(409, "User doesn't exist");
+
+    const { rows: deleteUserData } = await pg.query(
+      `
+      DELETE
+      FROM
+        users
+      WHERE
+        id = $1
+      RETURNING "email", "password"
+      `,
+      [userId],
+    );
 
-    const deleteUserData: User[] = UserModel.filter(user => user.id !== findUser.id);
     return deleteUserData;
   }
 }

package/lib/node-postgres/src/test/auth.test.ts

@@ -1,15 +1,17 @@
 import request from 'supertest';
 import { App } from '@/app';
+import pg from '@database';
 import { CreateUserDto } from '@dtos/users.dto';
 import { AuthRoute } from '@routes/auth.route';
 
 afterAll(async () => {
   await new Promise<void>(resolve => setTimeout(() => resolve(), 500));
+  pg.end();
 });
 
 describe('Testing Auth', () => {
   describe('[POST] /signup', () => {
-    it('response should have the Create userData', () => {
+    it('response should have the Create userData', async () => {
       const userData: CreateUserDto = {
         email: 'example@email.com',
         password: 'password',
@@ -17,7 +19,10 @@ describe('Testing Auth', () => {
       const authRoute = new AuthRoute();
       const app = new App([authRoute]);
 
-      return request(app.getServer()).post('/signup').send(userData);
+      return await request(app.getServer())
+      .post('/signup')
+      .send(userData)
+      .expect(201);
     });
   });
 
@@ -31,7 +36,7 @@ describe('Testing Auth', () => {
       const authRoute = new AuthRoute();
       const app = new App([authRoute]);
 
-      return request(app.getServer())
+      return await request(app.getServer())
         .post('/login')
         .send(userData)
         .expect('Set-Cookie', /^Authorization=.+/);

package/lib/node-postgres/src/test/users.test.ts

@@ -1,33 +1,35 @@
 import request from 'supertest';
-import App from '@/app';
+import { App } from '@/app';
+import pg from '@database';
 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));
+  pg.end();
 });
 
 describe('Testing Users', () => {
   describe('[GET] /users', () => {
-    it('response statusCode 200 / findAll', () => {
-      const findUser: User[] = UserModel;
+    it('response statusCode 200 / findAll', async () => {
       const usersRoute = new UserRoute();
       const app = new App([usersRoute]);
 
-      return request(app.getServer()).get(`${usersRoute.path}`).expect(200, { data: findUser, message: 'findAll' });
+      return await request(app.getServer()).get(`${usersRoute.path}`).expect(200);
     });
   });
 
   describe('[GET] /users/:id', () => {
-    it('response statusCode 200 / findOne', () => {
-      const userId = 1;
-      const findUser: User = UserModel.find(user => user.id === userId);
+    it('response statusCode 200 / findOne', async () => {
       const usersRoute = new UserRoute();
       const app = new App([usersRoute]);
 
-      return request(app.getServer()).get(`${usersRoute.path}/${userId}`).expect(200, { data: findUser, message: 'findOne' });
+      return await request(app.getServer())
+        .get(`${usersRoute.path}`)
+        .query({
+          userId: 1,
+        })
+        .expect(200);
     });
   });
 
@@ -40,7 +42,7 @@ describe('Testing Users', () => {
       const usersRoute = new UserRoute();
       const app = new App([usersRoute]);
 
-      return request(app.getServer()).post(`${usersRoute.path}`).send(userData).expect(201);
+      return await request(app.getServer()).post(`${usersRoute.path}`).send(userData).expect(201);
     });
   });
 
@@ -54,18 +56,17 @@ describe('Testing Users', () => {
       const usersRoute = new UserRoute();
       const app = new App([usersRoute]);
 
-      return request(app.getServer()).put(`${usersRoute.path}/${userId}`).send(userData).expect(200);
+      return await request(app.getServer()).put(`${usersRoute.path}/${userId}`).send(userData).expect(200);
     });
   });
 
   describe('[DELETE] /users/:id', () => {
-    it('response statusCode 200 / deleted', () => {
+    it('response statusCode 200 / deleted', async () => {
       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' });
+      return await request(app.getServer()).delete(`${usersRoute.path}/${userId}`).expect(200);
     });
   });
 });

package/lib/node-postgres/tsconfig.json

@@ -29,7 +29,6 @@
       "@exceptions/*": ["exceptions/*"],
       "@interfaces/*": ["interfaces/*"],
       "@middlewares/*": ["middlewares/*"],
-      "@models/*": ["models/*"],
       "@routes/*": ["routes/*"],
       "@services/*": ["services/*"],
       "@utils/*": ["utils/*"]

package/lib/prisma/Makefile

@@ -25,7 +25,7 @@ build: ## Build the container image - Production
 	docker build -t ${APP_NAME}\
 		-f Dockerfile.prod .
 
-build-dev: ## Build the container image - Dvelopment
+build-dev: ## Build the container image - Development
 	docker build -t ${APP_NAME}\
 		-f Dockerfile.dev .
 
@@ -43,4 +43,4 @@ remove: ## Remove the volumes
 
 #-- Database
 db: ## Start the local database MySQL
-	docker-compose up -d mysql
+	docker-compose up -d mysql

package/lib/prisma/src/routes/users.route.ts

@@ -7,7 +7,7 @@ import { ValidationMiddleware } from '@middlewares/validation.middleware';
 export class UserRoute implements Routes {
   public path = '/users';
   public router = Router();
-  public user = new UsersController();
+  public user = new UserController();
 
   constructor() {
     this.initializeRoutes();

package/lib/routing-controllers/Makefile

@@ -25,7 +25,7 @@ build: ## Build the container image - Production
 	docker build -t ${APP_NAME}\
 		-f Dockerfile.prod .
 
-build-dev: ## Build the container image - Dvelopment
+build-dev: ## Build the container image - Development
 	docker build -t ${APP_NAME}\
 		-f Dockerfile.dev .
 

package/lib/sequelize/.sequelizerc

@@ -0,0 +1,8 @@
+const path = require('path');
+
+module.exports = {
+  config: path.resolve('src', 'config', 'sequelize-cli.js'),
+  'models-path': path.resolve('src', 'models'),
+  'seeders-path': path.resolve('src', 'database', 'seeders'),
+  'migrations-path': path.resolve('src', 'database',  'migrations'),
+};

package/lib/sequelize/Makefile

@@ -25,7 +25,7 @@ build: ## Build the container image - Production
 	docker build -t ${APP_NAME}\
 		-f Dockerfile.prod .
 
-build-dev: ## Build the container image - Dvelopment
+build-dev: ## Build the container image - Development
 	docker build -t ${APP_NAME}\
 		-f Dockerfile.dev .
 
@@ -43,4 +43,4 @@ remove: ## Remove the volumes
 
 #-- Database
 db: ## Start the local database MySQL
-	docker-compose up -d mysql
+	docker-compose up -d mysql

package/lib/sequelize/package.json

@@ -13,7 +13,9 @@
     "lint": "eslint --ignore-path .gitignore --ext .ts src/",
     "lint:fix": "npm run lint -- --fix",
     "deploy:prod": "npm run build && pm2 start ecosystem.config.js --only prod",
-    "deploy:dev": "pm2 start ecosystem.config.js --only dev"
+    "deploy:dev": "pm2 start ecosystem.config.js --only dev",
+    "migration:generate": "sequelize migration:generate --name",
+    "migration:run": "sequelize db:migrate"
   },
   "dependencies": {
     "bcrypt": "^5.0.1",

package/lib/sequelize/src/app.ts

@@ -44,8 +44,8 @@ export class App {
     return this.app;
   }
 
-  private connectToDatabase() {
-    DB.sequelize.sync({ force: false });
+  private async connectToDatabase() {
+    await DB.sequelize.sync({ force: false });
   }
 
   private initializeMiddlewares() {

package/lib/sequelize/src/config/sequelize-cli.js

@@ -0,0 +1,15 @@
+const { config } = require("dotenv");
+config({ path: `.env.${process.env.NODE_ENV || "development"}.local` });
+
+const { DB_HOST, DB_PORT, DB_USER, DB_PASSWORD, DB_DATABASE } = process.env;
+
+module.exports = {
+  username: DB_USER,
+  password: DB_PASSWORD,
+  database: DB_DATABASE,
+  port: DB_PORT,
+  host: DB_HOST,
+  dialect: "mysql",
+  migrationStorageTableName: "sequelize_migrations",
+  seederStorageTableName: "sequelize_seeds",
+};

package/lib/typegoose/Makefile

@@ -25,7 +25,7 @@ build: ## Build the container image - Production
 	docker build -t ${APP_NAME}\
 		-f Dockerfile.prod .
 
-build-dev: ## Build the container image - Dvelopment
+build-dev: ## Build the container image - Development
 	docker build -t ${APP_NAME}\
 		-f Dockerfile.dev .
 
@@ -43,4 +43,4 @@ remove: ## Remove the volumes
 
 #-- Database
 db: ## Start the local database MongoDB
-	docker-compose up -d mongo
+	docker-compose up -d mongo

package/lib/typegoose/src/app.ts

@@ -6,11 +6,11 @@ import express from 'express';
 import helmet from 'helmet';
 import hpp from 'hpp';
 import morgan from 'morgan';
-import { connect, set } from 'mongoose';
+
 import swaggerJSDoc from 'swagger-jsdoc';
 import swaggerUi from 'swagger-ui-express';
 import { NODE_ENV, PORT, LOG_FORMAT, ORIGIN, CREDENTIALS } from '@config';
-import { dbConnection } from '@databases';
+import { dbConnection } from '@database';
 import { Routes } from '@interfaces/routes.interface';
 import { ErrorMiddleware } from '@middlewares/error.middleware';
 import { logger, stream } from '@utils/logger';
@@ -45,12 +45,8 @@ class App {
     return this.app;
   }
 
-  private connectToDatabase() {
-    if (this.env !== 'production') {
-      set('debug', true);
-    }
-
-    connect(dbConnection);
+  private async connectToDatabase() {
+    await dbConnection();
   }
 
   private initializeMiddlewares() {

package/lib/typegoose/src/database/index.ts

@@ -1,11 +1,18 @@
-import { DB_HOST, DB_PORT, DB_DATABASE } from '@config';
+import { connect, set } from 'mongoose';
+import { NODE_ENV, DB_HOST, DB_PORT, DB_DATABASE } from '@config';
 
-// export const dbConnection = `mongodb://${DB_HOST}:${DB_PORT}/${DB_DATABASE}`;
-
-export const dbConnection = {
+export const dbConnection = async () => {
+  const dbConfing = {
     url: `mongodb://${DB_HOST}:${DB_PORT}/${DB_DATABASE}`,
     options: {
       useNewUrlParser: true,
       useUnifiedTopology: true
     },
-  };
+  };
+
+  if (NODE_ENV !== 'production') {
+    set('debug', true);
+  }
+
+  await connect(dbConfing);
+};

package/lib/typeorm/.env.development.local

@@ -2,11 +2,11 @@
 PORT = 3000
 
 # DATABASE
-DB_USER = root
-DB_PASSWORD = password
-DB_HOST = localhost
-DB_PORT = 5432
-DB_DATABASE = dev
+POSTGRES_USER = root
+POSTGRES_PASSWORD = password
+POSTGRES_HOST = localhost
+POSTGRES_PORT = 5432
+POSTGRES_DATABASE = dev
 
 # TOKEN
 SECRET_KEY = secretKey

package/lib/typeorm/.env.production.local

@@ -2,11 +2,11 @@
 PORT = 3000
 
 # DATABASE
-DB_USER = root
-DB_PASSWORD = password
-DB_HOST = localhost
-DB_PORT = 5432
-DB_DATABASE = dev
+POSTGRES_USER = root
+POSTGRES_PASSWORD = password
+POSTGRES_HOST = localhost
+POSTGRES_PORT = 5432
+POSTGRES_DATABASE = dev
 
 # TOKEN
 SECRET_KEY = secretKey

package/lib/typeorm/.env.test.local

@@ -2,11 +2,11 @@
 PORT = 3000
 
 # DATABASE
-DB_USER = root
-DB_PASSWORD = password
-DB_HOST = localhost
-DB_PORT = 5432
-DB_DATABASE = dev
+POSTGRES_USER = root
+POSTGRES_PASSWORD = password
+POSTGRES_HOST = localhost
+POSTGRES_PORT = 5432
+POSTGRES_DATABASE = dev
 
 # TOKEN
 SECRET_KEY = secretKey

package/lib/typeorm/Makefile

@@ -25,7 +25,7 @@ build: ## Build the container image - Production
 	docker build -t ${APP_NAME}\
 		-f Dockerfile.prod .
 
-build-dev: ## Build the container image - Dvelopment
+build-dev: ## Build the container image - Development
 	docker build -t ${APP_NAME}\
 		-f Dockerfile.dev .
 

package/lib/typeorm/docker-compose.yml

@@ -20,11 +20,11 @@ services:
     ports:
       - "3000:3000"
     environment:
-      DB_USER: root
-      DB_PASSWORD: password
-      DB_HOST: pg
-      DB_PORT: 5432
-      DB_DATABASE: dev
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: password
+      POSTGRES_HOST: pg
+      POSTGRES_PORT: 5432
+      POSTGRES_DATABASE: dev
     volumes:
       - ./:/app
       - /app/node_modules
@@ -40,9 +40,9 @@ services:
     container_name: pg
     image: postgres:14.5-alpine
     environment:
-      DB_USER: root
-      DB_PASSWORD: password
-      DB_DATABASE: dev
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: dev
     ports:
       - "5432:5432"
     networks: