Move errors & export them (#278)

Workable · Jan 17, 2022 · 16998a9 · 16998a9
1 parent d63507d
commit 16998a9
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 7 deletions.
diff --git a/src/middlewares/errors/axios-error.ts → src/errors/axios-error.ts b/src/middlewares/errors/axios-error.ts → src/errors/axios-error.ts
diff --git a/src/middlewares/errors/custom-error.ts → src/errors/custom-error.ts b/src/middlewares/errors/custom-error.ts → src/errors/custom-error.ts
diff --git a/src/errors/index.ts b/src/errors/index.ts
@@ -0,0 +1,3 @@
+export { AxiosError } from './axios-error';
+export { CustomError } from './custom-error';
+export { ValidationError } from './validation-error';
diff --git a/src/middlewares/errors/validation-error.ts → src/errors/validation-error.ts b/src/middlewares/errors/validation-error.ts → src/errors/validation-error.ts
diff --git a/src/helpers/interceptors/axios-error-interceptor.ts b/src/helpers/interceptors/axios-error-interceptor.ts
@@ -1,5 +1,5 @@
 import requireInjected from '../../require-injected';
-import { AxiosError } from '../../middlewares/errors/axios-error';
+import { AxiosError } from '../../errors/axios-error';
 
 export default () => {
   const axios = requireInjected('axios');

diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,7 @@
 import Orka from './orka';
 import * as middlewares from './middlewares';
 import * as helpers from './helpers';
+import * as errors from './errors';
 
 export { default as builder, getRequestContext, runWithContext } from './builder';
 export { getLogger } from './initializers/log4js';
@@ -14,4 +15,4 @@ export { getRedis, createRedisConnection } from './initializers/redis';
 export { getBull } from './initializers/bull';
 export { getPrometheus } from './initializers/prometheus';
 export { getPostgresPool, withPostgresTransaction } from './initializers/postgres';
-export { middlewares, helpers };
+export { middlewares, helpers, errors };
diff --git a/src/initializers/log4js/json-appender.ts b/src/initializers/log4js/json-appender.ts
@@ -58,7 +58,7 @@ export const createValidLog = (layout, logEvent, config) => {
     timestamp: logEvent.startTime,
     severity: logEvent.level.levelStr,
     categoryName: logEvent.categoryName,
-    message,
+    message: message,
     context
   };
 };

diff --git a/src/middlewares/validate-params.ts b/src/middlewares/validate-params.ts
@@ -1,5 +1,5 @@
 import * as Joi from '@hapi/joi';
-import { ValidationError } from './errors/validation-error';
+import { ValidationError } from '../errors/validation-error';
 import * as Koa from 'koa';
 
 function validate(body: any, schema: Joi.ObjectSchema) {

diff --git a/...tializers/koa/errors/axios-errors.test.ts → test/errors/axios-errors.test.ts b/...tializers/koa/errors/axios-errors.test.ts → test/errors/axios-errors.test.ts
@@ -1,7 +1,7 @@
 import * as _axios from 'axios';
 import snapshot = require('snap-shot-it');
 import * as util from 'util';
-import { AxiosError } from '../../../../src/middlewares/errors/axios-error';
+import { AxiosError } from '../../src/errors/axios-error';
 import * as sinon from 'sinon';
 
 const sandbox = sinon.createSandbox();

diff --git a/...tializers/koa/errors/custom-error.test.ts → test/errors/custom-error.test.ts b/...tializers/koa/errors/custom-error.test.ts → test/errors/custom-error.test.ts
@@ -1,6 +1,6 @@
 import 'should';
 import * as sinon from 'sinon';
-import { CustomError } from '../../../../src/middlewares/errors/custom-error';
+import { CustomError } from '../../src/errors/custom-error';
 
 const sandbox = sinon.createSandbox();
 

diff --git a/...izers/koa/errors/validation-error.test.ts → test/errors/validation-error.test.ts b/...izers/koa/errors/validation-error.test.ts → test/errors/validation-error.test.ts
@@ -1,6 +1,6 @@
 import 'should';
 import * as sinon from 'sinon';
-import { ValidationError } from '../../../../src/middlewares/errors/validation-error';
+import { ValidationError } from '../../src/errors/validation-error';
 
 const sandbox = sinon.createSandbox();