remove v1 from route

janishar · janishar · commit a3411bf583a8 · 2022-12-22T10:32:07.000+05:30
diff --git a/src/app.ts b/src/app.ts
@@ -10,7 +10,7 @@ import {
   InternalError,
   ErrorType,
 } from './core/ApiError';
-import routesV1 from './routes/v1';
+import routesV1 from './routes';
 
 process.on('uncaughtException', (e) => {
   Logger.error(e);
diff --git a/src/routes/access/credential.ts b/src/routes/access/credential.ts
@@ -1,19 +1,19 @@
 import express from 'express';
-import { SuccessResponse } from '../../../core/ApiResponse';
+import { SuccessResponse } from '../../core/ApiResponse';
 import { RoleRequest } from 'app-request';
-import UserRepo from '../../../database/repository/UserRepo';
-import { BadRequestError } from '../../../core/ApiError';
-import User from '../../../database/model/User';
-import validator from '../../../helpers/validator';
+import UserRepo from '../../database/repository/UserRepo';
+import { BadRequestError } from '../../core/ApiError';
+import User from '../../database/model/User';
+import validator from '../../helpers/validator';
 import schema from './schema';
-import asyncHandler from '../../../helpers/asyncHandler';
+import asyncHandler from '../../helpers/asyncHandler';
 import bcrypt from 'bcrypt';
 import _ from 'lodash';
-import { RoleCode } from '../../../database/model/Role';
-import role from '../../../helpers/role';
-import authorization from '../../../auth/authorization';
-import authentication from '../../../auth/authentication';
-import KeystoreRepo from '../../../database/repository/KeystoreRepo';
+import { RoleCode } from '../../database/model/Role';
+import role from '../../helpers/role';
+import authorization from '../../auth/authorization';
+import authentication from '../../auth/authentication';
+import KeystoreRepo from '../../database/repository/KeystoreRepo';
 
 const router = express.Router();
 
diff --git a/src/routes/access/login.ts b/src/routes/access/login.ts
@@ -1,16 +1,16 @@
 import express from 'express';
-import { SuccessResponse } from '../../../core/ApiResponse';
+import { SuccessResponse } from '../../core/ApiResponse';
 import crypto from 'crypto';
-import UserRepo from '../../../database/repository/UserRepo';
-import { BadRequestError, AuthFailureError } from '../../../core/ApiError';
-import KeystoreRepo from '../../../database/repository/KeystoreRepo';
-import { createTokens } from '../../../auth/authUtils';
-import validator from '../../../helpers/validator';
+import UserRepo from '../../database/repository/UserRepo';
+import { BadRequestError, AuthFailureError } from '../../core/ApiError';
+import KeystoreRepo from '../../database/repository/KeystoreRepo';
+import { createTokens } from '../../auth/authUtils';
+import validator from '../../helpers/validator';
 import schema from './schema';
-import asyncHandler from '../../../helpers/asyncHandler';
+import asyncHandler from '../../helpers/asyncHandler';
 import bcrypt from 'bcrypt';
 import { getUserData } from './utils';
-import { PublicRequest } from '../../../types/app-request';
+import { PublicRequest } from '../../types/app-request';
 
 const router = express.Router();
 
diff --git a/src/routes/access/logout.ts b/src/routes/access/logout.ts
@@ -1,9 +1,9 @@
 import express from 'express';
-import KeystoreRepo from '../../../database/repository/KeystoreRepo';
+import KeystoreRepo from '../../database/repository/KeystoreRepo';
 import { ProtectedRequest } from 'app-request';
-import { SuccessMsgResponse } from '../../../core/ApiResponse';
-import asyncHandler from '../../../helpers/asyncHandler';
-import authentication from '../../../auth/authentication';
+import { SuccessMsgResponse } from '../../core/ApiResponse';
+import asyncHandler from '../../helpers/asyncHandler';
+import authentication from '../../auth/authentication';
 
 const router = express.Router();
 
diff --git a/src/routes/access/schema.ts b/src/routes/access/schema.ts
@@ -1,5 +1,5 @@
 import Joi from 'joi';
-import { JoiAuthBearer } from '../../../helpers/validator';
+import { JoiAuthBearer } from '../../helpers/validator';
 
 export default {
   credential: Joi.object().keys({
diff --git a/src/routes/access/signup.ts b/src/routes/access/signup.ts
@@ -1,16 +1,16 @@
 import express from 'express';
-import { SuccessResponse } from '../../../core/ApiResponse';
+import { SuccessResponse } from '../../core/ApiResponse';
 import { RoleRequest } from 'app-request';
 import crypto from 'crypto';
-import UserRepo from '../../../database/repository/UserRepo';
-import { BadRequestError } from '../../../core/ApiError';
-import User from '../../../database/model/User';
-import { createTokens } from '../../../auth/authUtils';
-import validator from '../../../helpers/validator';
+import UserRepo from '../../database/repository/UserRepo';
+import { BadRequestError } from '../../core/ApiError';
+import User from '../../database/model/User';
+import { createTokens } from '../../auth/authUtils';
+import validator from '../../helpers/validator';
 import schema from './schema';
-import asyncHandler from '../../../helpers/asyncHandler';
+import asyncHandler from '../../helpers/asyncHandler';
 import bcrypt from 'bcrypt';
-import { RoleCode } from '../../../database/model/Role';
+import { RoleCode } from '../../database/model/Role';
 import { getUserData } from './utils';
 
 const router = express.Router();
diff --git a/src/routes/access/token.ts b/src/routes/access/token.ts
@@ -1,20 +1,20 @@
 import express from 'express';
-import { TokenRefreshResponse } from '../../../core/ApiResponse';
+import { TokenRefreshResponse } from '../../core/ApiResponse';
 import { ProtectedRequest } from 'app-request';
 import { Types } from 'mongoose';
-import UserRepo from '../../../database/repository/UserRepo';
-import { AuthFailureError } from '../../../core/ApiError';
-import JWT from '../../../core/JWT';
-import KeystoreRepo from '../../../database/repository/KeystoreRepo';
+import UserRepo from '../../database/repository/UserRepo';
+import { AuthFailureError } from '../../core/ApiError';
+import JWT from '../../core/JWT';
+import KeystoreRepo from '../../database/repository/KeystoreRepo';
 import crypto from 'crypto';
 import {
   validateTokenData,
   createTokens,
   getAccessToken,
-} from '../../../auth/authUtils';
-import validator, { ValidationSource } from '../../../helpers/validator';
+} from '../../auth/authUtils';
+import validator, { ValidationSource } from '../../helpers/validator';
 import schema from './schema';
-import asyncHandler from '../../../helpers/asyncHandler';
+import asyncHandler from '../../helpers/asyncHandler';
 
 const router = express.Router();
 
diff --git a/src/routes/access/utils.ts b/src/routes/access/utils.ts
@@ -1,4 +1,4 @@
-import User from '../../../database/model/User';
+import User from '../../database/model/User';
 import _ from 'lodash';
 
 export const enum AccessMode {
diff --git a/src/routes/blog/editor.ts b/src/routes/blog/editor.ts
@@ -1,16 +1,16 @@
 import express from 'express';
-import { SuccessResponse, SuccessMsgResponse } from '../../../core/ApiResponse';
+import { SuccessResponse, SuccessMsgResponse } from '../../core/ApiResponse';
 import { ProtectedRequest } from 'app-request';
-import { BadRequestError, ForbiddenError } from '../../../core/ApiError';
-import BlogRepo from '../../../database/repository/BlogRepo';
-import { RoleCode } from '../../../database/model/Role';
+import { BadRequestError, ForbiddenError } from '../../core/ApiError';
+import BlogRepo from '../../database/repository/BlogRepo';
+import { RoleCode } from '../../database/model/Role';
 import { Types } from 'mongoose';
-import validator, { ValidationSource } from '../../../helpers/validator';
+import validator, { ValidationSource } from '../../helpers/validator';
 import schema from './schema';
-import asyncHandler from '../../../helpers/asyncHandler';
-import authentication from '../../../auth/authentication';
-import authorization from '../../../auth/authorization';
-import role from '../../../helpers/role';
+import asyncHandler from '../../helpers/asyncHandler';
+import authentication from '../../auth/authentication';
+import authorization from '../../auth/authorization';
+import role from '../../helpers/role';
 
 const router = express.Router();
 
diff --git a/src/routes/blog/index.ts b/src/routes/blog/index.ts
@@ -1,14 +1,14 @@
 import express from 'express';
-import { SuccessResponse } from '../../../core/ApiResponse';
-import asyncHandler from '../../../helpers/asyncHandler';
-import validator, { ValidationSource } from '../../../helpers/validator';
+import { SuccessResponse } from '../../core/ApiResponse';
+import asyncHandler from '../../helpers/asyncHandler';
+import validator, { ValidationSource } from '../../helpers/validator';
 import schema from './schema';
-import { NotFoundError } from '../../../core/ApiError';
-import BlogRepo from '../../../database/repository/BlogRepo';
+import { NotFoundError } from '../../core/ApiError';
+import BlogRepo from '../../database/repository/BlogRepo';
 import { Types } from 'mongoose';
 import writer from './writer';
 import editor from './editor';
-import BlogCache from '../../../cache/repository/BlogCache';
+import BlogCache from '../../cache/repository/BlogCache';
 
 const router = express.Router();
 
diff --git a/src/routes/blog/schema.ts b/src/routes/blog/schema.ts
@@ -1,5 +1,5 @@
 import Joi from 'joi';
-import { JoiObjectId, JoiUrlEndpoint } from '../../../helpers/validator';
+import { JoiObjectId, JoiUrlEndpoint } from '../../helpers/validator';
 
 export default {
   blogUrl: Joi.object().keys({
diff --git a/src/routes/blog/writer.ts b/src/routes/blog/writer.ts
@@ -1,17 +1,17 @@
 import express from 'express';
-import { SuccessResponse, SuccessMsgResponse } from '../../../core/ApiResponse';
+import { SuccessResponse, SuccessMsgResponse } from '../../core/ApiResponse';
 import { ProtectedRequest } from 'app-request';
-import { BadRequestError, ForbiddenError } from '../../../core/ApiError';
-import BlogRepo from '../../../database/repository/BlogRepo';
-import Blog from '../../../database/model/Blog';
-import { RoleCode } from '../../../database/model/Role';
+import { BadRequestError, ForbiddenError } from '../../core/ApiError';
+import BlogRepo from '../../database/repository/BlogRepo';
+import Blog from '../../database/model/Blog';
+import { RoleCode } from '../../database/model/Role';
 import { Types } from 'mongoose';
-import validator, { ValidationSource } from '../../../helpers/validator';
+import validator, { ValidationSource } from '../../helpers/validator';
 import schema from './schema';
-import asyncHandler from '../../../helpers/asyncHandler';
-import authentication from '../../../auth/authentication';
-import authorization from '../../../auth/authorization';
-import role from '../../../helpers/role';
+import asyncHandler from '../../helpers/asyncHandler';
+import authentication from '../../auth/authentication';
+import authorization from '../../auth/authorization';
+import role from '../../helpers/role';
 
 const router = express.Router();
 
diff --git a/src/routes/blogs/index.ts b/src/routes/blogs/index.ts
@@ -1,13 +1,13 @@
 import express from 'express';
-import { SuccessResponse } from '../../../core/ApiResponse';
-import asyncHandler from '../../../helpers/asyncHandler';
-import validator, { ValidationSource } from '../../../helpers/validator';
+import { SuccessResponse } from '../../core/ApiResponse';
+import asyncHandler from '../../helpers/asyncHandler';
+import validator, { ValidationSource } from '../../helpers/validator';
 import schema from './schema';
-import { BadRequestError } from '../../../core/ApiError';
-import BlogRepo from '../../../database/repository/BlogRepo';
+import { BadRequestError } from '../../core/ApiError';
+import BlogRepo from '../../database/repository/BlogRepo';
 import { Types } from 'mongoose';
-import User from '../../../database/model/User';
-import BlogsCache from '../../../cache/repository/BlogsCache';
+import User from '../../database/model/User';
+import BlogsCache from '../../cache/repository/BlogsCache';
 
 const router = express.Router();
 
diff --git a/src/routes/blogs/schema.ts b/src/routes/blogs/schema.ts
@@ -1,5 +1,5 @@
 import Joi from 'joi';
-import { JoiObjectId } from '../../../helpers/validator';
+import { JoiObjectId } from '../../helpers/validator';
 
 export default {
   blogId: Joi.object().keys({
diff --git a/src/routes/index.ts b/src/routes/index.ts
@@ -1,7 +1,7 @@
 import express from 'express';
-import apikey from '../../auth/apikey';
-import permission from '../../helpers/permission';
-import { Permission } from '../../database/model/ApiKey';
+import apikey from '../auth/apikey';
+import permission from '../helpers/permission';
+import { Permission } from '../database/model/ApiKey';
 import signup from './access/signup';
 import login from './access/login';
 import logout from './access/logout';
diff --git a/src/routes/profile/index.ts b/src/routes/profile/index.ts
@@ -1,13 +1,13 @@
 import express from 'express';
-import { SuccessResponse } from '../../../core/ApiResponse';
-import UserRepo from '../../../database/repository/UserRepo';
+import { SuccessResponse } from '../../core/ApiResponse';
+import UserRepo from '../../database/repository/UserRepo';
 import { ProtectedRequest } from 'app-request';
-import { BadRequestError } from '../../../core/ApiError';
-import validator from '../../../helpers/validator';
+import { BadRequestError } from '../../core/ApiError';
+import validator from '../../helpers/validator';
 import schema from './schema';
-import asyncHandler from '../../../helpers/asyncHandler';
+import asyncHandler from '../../helpers/asyncHandler';
 import _ from 'lodash';
-import authentication from '../../../auth/authentication';
+import authentication from '../../auth/authentication';
 
 const router = express.Router();
 
diff --git a/src/routes/profile/schema.ts b/src/routes/profile/schema.ts
@@ -1,5 +1,5 @@
 import Joi from 'joi';
-import { JoiObjectId } from '../../../helpers/validator';
+import { JoiObjectId } from '../../helpers/validator';
 
 export default {
   userId: Joi.object().keys({
diff --git a/tests/routes/access/login/integration.test.ts b/tests/routes/access/login/integration.test.ts
@@ -1,17 +1,17 @@
 jest.resetAllMocks(); // make sure we do not have any mocks set from unit tests
 
 import supertest from 'supertest';
-import app from '../../../../../src/app';
-import UserRepo from '../../../../../src/database/repository/UserRepo';
-import KeystoreRepo from '../../../../../src/database/repository/KeystoreRepo';
-import User, { UserModel } from '../../../../../src/database/model/User';
+import app from '../../../../src/app';
+import UserRepo from '../../../../src/database/repository/UserRepo';
+import KeystoreRepo from '../../../../src/database/repository/KeystoreRepo';
+import User, { UserModel } from '../../../../src/database/model/User';
 import bcrypt from 'bcrypt';
-import * as authUtils from '../../../../../src/auth/authUtils';
-import Role, { RoleCode } from '../../../../../src/database/model/Role';
+import * as authUtils from '../../../../src/auth/authUtils';
+import Role, { RoleCode } from '../../../../src/database/model/Role';
 import { Types } from 'mongoose';
-import ApiKey, { ApiKeyModel } from '../../../../../src/database/model/ApiKey';
-import { connection } from '../../../../../src/database';
-import cache from '../../../../../src/cache';
+import ApiKey, { ApiKeyModel } from '../../../../src/database/model/ApiKey';
+import { connection } from '../../../../src/database';
+import cache from '../../../../src/cache';
 
 export const createTokensSpy = jest.spyOn(authUtils, 'createTokens');
 export const bcryptCompareSpy = jest.spyOn(bcrypt, 'compare');
diff --git a/tests/routes/access/login/mock.ts b/tests/routes/access/login/mock.ts
@@ -1,10 +1,10 @@
-import { USER_ID } from '../../../../auth/authentication/mock';
-import Keystore from '../../../../../src/database/model/Keystore';
-import User from '../../../../../src/database/model/User';
+import { USER_ID } from '../../../auth/authentication/mock';
+import Keystore from '../../../../src/database/model/Keystore';
+import User from '../../../../src/database/model/User';
 import { Types } from 'mongoose';
 import bcrypt from 'bcrypt';
-import * as authUtils from '../../../../../src/auth/authUtils';
-import Role from '../../../../../src/database/model/Role';
+import * as authUtils from '../../../../src/auth/authUtils';
+import Role from '../../../../src/database/model/Role';
 
 export const USER_EMAIL = 'random@test.com';
 export const USER_PASSWORD = 'abc123';
@@ -44,12 +44,12 @@ export const mockUserFindByEmail = jest.fn(
   },
 );
 
-jest.mock('../../../../../src/database/repository/KeystoreRepo', () => ({
+jest.mock('../../../../src/database/repository/KeystoreRepo', () => ({
   create: mockKeystoreCreate,
 }));
 
-jest.mock('../../../../../src/database/repository/UserRepo', () => ({
+jest.mock('../../../../src/database/repository/UserRepo', () => ({
   findByEmail: mockUserFindByEmail,
 }));
 
-jest.unmock('../../../../../src/auth/authUtils'); // remove any override made anywhere
+jest.unmock('../../../../src/auth/authUtils'); // remove any override made anywhere
diff --git a/tests/routes/access/login/unit.test.ts b/tests/routes/access/login/unit.test.ts
@@ -1,6 +1,6 @@
-import '../../../../database/mock';
-import '../../../../cache/mock';
-import { addHeaders } from '../../../../auth/authentication/mock';
+import '../../../database/mock';
+import '../../../cache/mock';
+import { addHeaders } from '../../../auth/authentication/mock';
 
 // the mock for this class should be below all other mock imports
 import {
@@ -14,7 +14,7 @@ import {
 } from './mock';
 
 import supertest from 'supertest';
-import app from '../../../../../src/app';
+import app from '../../../../src/app';
 
 describe('Login basic route', () => {
   const endpoint = '/v1/login/basic';
diff --git a/tests/routes/access/signup/mock.ts b/tests/routes/access/signup/mock.ts
@@ -1,6 +1,6 @@
 import { mockUserFindByEmail } from '../login/mock';
-import User from '../../../../../src/database/model/User';
-import Keystore from '../../../../../src/database/model/Keystore';
+import User from '../../../../src/database/model/User';
+import Keystore from '../../../../src/database/model/Keystore';
 import { Types } from 'mongoose';
 import bcrypt from 'bcrypt';
 
@@ -25,7 +25,7 @@ export const mockUserCreate = jest.fn(
   },
 );
 
-jest.mock('../../../../../src/database/repository/UserRepo', () => ({
+jest.mock('../../../../src/database/repository/UserRepo', () => ({
   findByEmail: mockUserFindByEmail, // utilising already defined mock
   create: mockUserCreate,
 }));
diff --git a/tests/routes/access/signup/unit.test.ts b/tests/routes/access/signup/unit.test.ts
diff --git a/tests/routes/blog/index/mock.ts b/tests/routes/blog/index/mock.ts
diff --git a/tests/routes/blog/index/unit.test.ts b/tests/routes/blog/index/unit.test.ts
diff --git a/tests/routes/blog/writer/mock.ts b/tests/routes/blog/writer/mock.ts
diff --git a/tests/routes/blog/writer/unit.test.ts b/tests/routes/blog/writer/unit.test.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import User from '../../../database/model/User';`
	`1`	`+import User from '../../database/model/User';`
`2`	`2`	`import _ from 'lodash';`
`3`	`3`
`4`	`4`	`export const enum AccessMode {`