Fix build and branch name

Author: cham11ng

.dockerignore

@@ -2,15 +2,15 @@ name: Starter CI
 
 on:
   push:
-    branches: [dev, master]
+    branches: [dev, main]
   pull_request:
-    branches: [dev, master]
+    branches: [dev, main]
 
 jobs:
   build:
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
         platform: [ubuntu-latest]
 
     runs-on: ${{ matrix.platform }}

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ services:
       POSTGRES_PASSWORD: ${DB_PASSWORD:-secret}
 
   api:
-    image: "node:16-alpine"
+    image: "node:latest"
     env_file: '.env.docker'
     container_name: "starter-api"
     volumes:
@@ -24,4 +24,4 @@ services:
       - postgres
     ports:
       - "8000:8000"
-    command: sh -c "yarn && yarn dev"
+    command: bash -c "yarn && yarn dev"

docker-compose.yml

@@ -12,7 +12,7 @@
     "email": "sgr.raee@gmail.com"
   },
   "engines": {
-    "node": ">= 16.5.0"
+    "node": ">= 20.9.0"
   },
   "scripts": {
     "dev": "concurrently 'npx tsc --watch' 'nodemon -q build/index.js'",

package.json

@@ -11,7 +11,7 @@ import * as userService from '../../services/userService';
 export function run(): Promise<UserDetail> {
   return userService.insert({
     password: 'secret',
-    name: faker.name.findName(),
+    name: faker.person.fullName(),
     email: faker.internet.email()
   });
 }

src/database/factories/userFactory.ts

@@ -4,7 +4,7 @@ import { getReasonPhrase, StatusCodes } from 'http-status-codes';
 import APIResponseInterface from '../domain/responses/APIResponse';
 import logger from '../utils/logger';
 
-export const buildError = (err: any): APIResponseInterface => {
+export const buildError = (err: any): APIResponseInterface<{ code: number; message: string; data?: any }> => {
   if (err.isJoi) {
     return {
       code: StatusCodes.BAD_REQUEST,
@@ -38,7 +38,7 @@ export const buildError = (err: any): APIResponseInterface => {
   };
 };
 
-export const genericErrorHandler = (
+const genericErrorHandler = (
   err: any,
   _: Request,
   res: Response,
@@ -52,3 +52,5 @@ export const genericErrorHandler = (
 
   res.status(error.code).json(error);
 };
+
+export default genericErrorHandler;

src/middlewares/genericErrorHandler.ts

@@ -3,7 +3,7 @@ import logger from '../utils/logger';
 
 const { errors } = config;
 
-export const nodeErrorHandler = (err: NodeJS.ErrnoException): void => {
+const nodeErrorHandler = (err: NodeJS.ErrnoException): void => {
   switch (err.code) {
     case 'EACCES':
       logger.log('error', errors.portRequirePrivilege);
@@ -19,3 +19,5 @@ export const nodeErrorHandler = (err: NodeJS.ErrnoException): void => {
 
   process.exit(1);
 };
+
+export default nodeErrorHandler;

src/middlewares/nodeErrorHandler.ts

@@ -6,8 +6,8 @@ import * as userController from './controllers/user';
 import authenticate from './middlewares/authenticate';
 import validate from './middlewares/validate';
 import validateRefreshToken from './middlewares/validateRefreshToken';
-import { loginSchema } from './validators/loginRequest';
-import { userPOSTSchema } from './validators/userRequest';
+import { loginSchema } from './resources/validators/loginRequest';
+import { userPOSTSchema } from './resources/validators/userRequest';
 
 const router: Router = Router();