Skip to content

Commit a3411bf

Browse files
janisharjanishar
committed
remove v1 from route
1 parent f6c1dd0 commit a3411bf

File tree

26 files changed

+131
-131
lines changed

26 files changed

+131
-131
lines changed

‎src/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
InternalError,
1111
ErrorType,
1212
} from './core/ApiError';
13-
import routesV1 from './routes/v1';
13+
import routesV1 from './routes';
1414

1515
process.on('uncaughtException', (e) => {
1616
Logger.error(e);

‎src/routes/v1/access/credential.ts renamed to ‎src/routes/access/credential.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import express from 'express';
2-
import { SuccessResponse } from '../../../core/ApiResponse';
2+
import { SuccessResponse } from '../../core/ApiResponse';
33
import { RoleRequest } from 'app-request';
4-
import UserRepo from '../../../database/repository/UserRepo';
5-
import { BadRequestError } from '../../../core/ApiError';
6-
import User from '../../../database/model/User';
7-
import validator from '../../../helpers/validator';
4+
import UserRepo from '../../database/repository/UserRepo';
5+
import { BadRequestError } from '../../core/ApiError';
6+
import User from '../../database/model/User';
7+
import validator from '../../helpers/validator';
88
import schema from './schema';
9-
import asyncHandler from '../../../helpers/asyncHandler';
9+
import asyncHandler from '../../helpers/asyncHandler';
1010
import bcrypt from 'bcrypt';
1111
import _ from 'lodash';
12-
import { RoleCode } from '../../../database/model/Role';
13-
import role from '../../../helpers/role';
14-
import authorization from '../../../auth/authorization';
15-
import authentication from '../../../auth/authentication';
16-
import KeystoreRepo from '../../../database/repository/KeystoreRepo';
12+
import { RoleCode } from '../../database/model/Role';
13+
import role from '../../helpers/role';
14+
import authorization from '../../auth/authorization';
15+
import authentication from '../../auth/authentication';
16+
import KeystoreRepo from '../../database/repository/KeystoreRepo';
1717

1818
const router = express.Router();
1919

‎src/routes/v1/access/login.ts renamed to ‎src/routes/access/login.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import express from 'express';
2-
import { SuccessResponse } from '../../../core/ApiResponse';
2+
import { SuccessResponse } from '../../core/ApiResponse';
33
import crypto from 'crypto';
4-
import UserRepo from '../../../database/repository/UserRepo';
5-
import { BadRequestError, AuthFailureError } from '../../../core/ApiError';
6-
import KeystoreRepo from '../../../database/repository/KeystoreRepo';
7-
import { createTokens } from '../../../auth/authUtils';
8-
import validator from '../../../helpers/validator';
4+
import UserRepo from '../../database/repository/UserRepo';
5+
import { BadRequestError, AuthFailureError } from '../../core/ApiError';
6+
import KeystoreRepo from '../../database/repository/KeystoreRepo';
7+
import { createTokens } from '../../auth/authUtils';
8+
import validator from '../../helpers/validator';
99
import schema from './schema';
10-
import asyncHandler from '../../../helpers/asyncHandler';
10+
import asyncHandler from '../../helpers/asyncHandler';
1111
import bcrypt from 'bcrypt';
1212
import { getUserData } from './utils';
13-
import { PublicRequest } from '../../../types/app-request';
13+
import { PublicRequest } from '../../types/app-request';
1414

1515
const router = express.Router();
1616

‎src/routes/v1/access/logout.ts renamed to ‎src/routes/access/logout.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import express from 'express';
2-
import KeystoreRepo from '../../../database/repository/KeystoreRepo';
2+
import KeystoreRepo from '../../database/repository/KeystoreRepo';
33
import { ProtectedRequest } from 'app-request';
4-
import { SuccessMsgResponse } from '../../../core/ApiResponse';
5-
import asyncHandler from '../../../helpers/asyncHandler';
6-
import authentication from '../../../auth/authentication';
4+
import { SuccessMsgResponse } from '../../core/ApiResponse';
5+
import asyncHandler from '../../helpers/asyncHandler';
6+
import authentication from '../../auth/authentication';
77

88
const router = express.Router();
99

‎src/routes/v1/access/schema.ts renamed to ‎src/routes/access/schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Joi from 'joi';
2-
import { JoiAuthBearer } from '../../../helpers/validator';
2+
import { JoiAuthBearer } from '../../helpers/validator';
33

44
export default {
55
credential: Joi.object().keys({

‎src/routes/v1/access/signup.ts renamed to ‎src/routes/access/signup.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import express from 'express';
2-
import { SuccessResponse } from '../../../core/ApiResponse';
2+
import { SuccessResponse } from '../../core/ApiResponse';
33
import { RoleRequest } from 'app-request';
44
import crypto from 'crypto';
5-
import UserRepo from '../../../database/repository/UserRepo';
6-
import { BadRequestError } from '../../../core/ApiError';
7-
import User from '../../../database/model/User';
8-
import { createTokens } from '../../../auth/authUtils';
9-
import validator from '../../../helpers/validator';
5+
import UserRepo from '../../database/repository/UserRepo';
6+
import { BadRequestError } from '../../core/ApiError';
7+
import User from '../../database/model/User';
8+
import { createTokens } from '../../auth/authUtils';
9+
import validator from '../../helpers/validator';
1010
import schema from './schema';
11-
import asyncHandler from '../../../helpers/asyncHandler';
11+
import asyncHandler from '../../helpers/asyncHandler';
1212
import bcrypt from 'bcrypt';
13-
import { RoleCode } from '../../../database/model/Role';
13+
import { RoleCode } from '../../database/model/Role';
1414
import { getUserData } from './utils';
1515

1616
const router = express.Router();

‎src/routes/v1/access/token.ts renamed to ‎src/routes/access/token.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import express from 'express';
2-
import { TokenRefreshResponse } from '../../../core/ApiResponse';
2+
import { TokenRefreshResponse } from '../../core/ApiResponse';
33
import { ProtectedRequest } from 'app-request';
44
import { Types } from 'mongoose';
5-
import UserRepo from '../../../database/repository/UserRepo';
6-
import { AuthFailureError } from '../../../core/ApiError';
7-
import JWT from '../../../core/JWT';
8-
import KeystoreRepo from '../../../database/repository/KeystoreRepo';
5+
import UserRepo from '../../database/repository/UserRepo';
6+
import { AuthFailureError } from '../../core/ApiError';
7+
import JWT from '../../core/JWT';
8+
import KeystoreRepo from '../../database/repository/KeystoreRepo';
99
import crypto from 'crypto';
1010
import {
1111
validateTokenData,
1212
createTokens,
1313
getAccessToken,
14-
} from '../../../auth/authUtils';
15-
import validator, { ValidationSource } from '../../../helpers/validator';
14+
} from '../../auth/authUtils';
15+
import validator, { ValidationSource } from '../../helpers/validator';
1616
import schema from './schema';
17-
import asyncHandler from '../../../helpers/asyncHandler';
17+
import asyncHandler from '../../helpers/asyncHandler';
1818

1919
const router = express.Router();
2020

‎src/routes/v1/access/utils.ts renamed to ‎src/routes/access/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import User from '../../../database/model/User';
1+
import User from '../../database/model/User';
22
import _ from 'lodash';
33

44
export const enum AccessMode {

‎src/routes/v1/blog/editor.ts renamed to ‎src/routes/blog/editor.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import express from 'express';
2-
import { SuccessResponse, SuccessMsgResponse } from '../../../core/ApiResponse';
2+
import { SuccessResponse, SuccessMsgResponse } from '../../core/ApiResponse';
33
import { ProtectedRequest } from 'app-request';
4-
import { BadRequestError, ForbiddenError } from '../../../core/ApiError';
5-
import BlogRepo from '../../../database/repository/BlogRepo';
6-
import { RoleCode } from '../../../database/model/Role';
4+
import { BadRequestError, ForbiddenError } from '../../core/ApiError';
5+
import BlogRepo from '../../database/repository/BlogRepo';
6+
import { RoleCode } from '../../database/model/Role';
77
import { Types } from 'mongoose';
8-
import validator, { ValidationSource } from '../../../helpers/validator';
8+
import validator, { ValidationSource } from '../../helpers/validator';
99
import schema from './schema';
10-
import asyncHandler from '../../../helpers/asyncHandler';
11-
import authentication from '../../../auth/authentication';
12-
import authorization from '../../../auth/authorization';
13-
import role from '../../../helpers/role';
10+
import asyncHandler from '../../helpers/asyncHandler';
11+
import authentication from '../../auth/authentication';
12+
import authorization from '../../auth/authorization';
13+
import role from '../../helpers/role';
1414

1515
const router = express.Router();
1616

‎src/routes/v1/blog/index.ts renamed to ‎src/routes/blog/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import express from 'express';
2-
import { SuccessResponse } from '../../../core/ApiResponse';
3-
import asyncHandler from '../../../helpers/asyncHandler';
4-
import validator, { ValidationSource } from '../../../helpers/validator';
2+
import { SuccessResponse } from '../../core/ApiResponse';
3+
import asyncHandler from '../../helpers/asyncHandler';
4+
import validator, { ValidationSource } from '../../helpers/validator';
55
import schema from './schema';
6-
import { NotFoundError } from '../../../core/ApiError';
7-
import BlogRepo from '../../../database/repository/BlogRepo';
6+
import { NotFoundError } from '../../core/ApiError';
7+
import BlogRepo from '../../database/repository/BlogRepo';
88
import { Types } from 'mongoose';
99
import writer from './writer';
1010
import editor from './editor';
11-
import BlogCache from '../../../cache/repository/BlogCache';
11+
import BlogCache from '../../cache/repository/BlogCache';
1212

1313
const router = express.Router();
1414

‎src/routes/v1/blog/schema.ts renamed to ‎src/routes/blog/schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Joi from 'joi';
2-
import { JoiObjectId, JoiUrlEndpoint } from '../../../helpers/validator';
2+
import { JoiObjectId, JoiUrlEndpoint } from '../../helpers/validator';
33

44
export default {
55
blogUrl: Joi.object().keys({

‎src/routes/v1/blog/writer.ts renamed to ‎src/routes/blog/writer.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import express from 'express';
2-
import { SuccessResponse, SuccessMsgResponse } from '../../../core/ApiResponse';
2+
import { SuccessResponse, SuccessMsgResponse } from '../../core/ApiResponse';
33
import { ProtectedRequest } from 'app-request';
4-
import { BadRequestError, ForbiddenError } from '../../../core/ApiError';
5-
import BlogRepo from '../../../database/repository/BlogRepo';
6-
import Blog from '../../../database/model/Blog';
7-
import { RoleCode } from '../../../database/model/Role';
4+
import { BadRequestError, ForbiddenError } from '../../core/ApiError';
5+
import BlogRepo from '../../database/repository/BlogRepo';
6+
import Blog from '../../database/model/Blog';
7+
import { RoleCode } from '../../database/model/Role';
88
import { Types } from 'mongoose';
9-
import validator, { ValidationSource } from '../../../helpers/validator';
9+
import validator, { ValidationSource } from '../../helpers/validator';
1010
import schema from './schema';
11-
import asyncHandler from '../../../helpers/asyncHandler';
12-
import authentication from '../../../auth/authentication';
13-
import authorization from '../../../auth/authorization';
14-
import role from '../../../helpers/role';
11+
import asyncHandler from '../../helpers/asyncHandler';
12+
import authentication from '../../auth/authentication';
13+
import authorization from '../../auth/authorization';
14+
import role from '../../helpers/role';
1515

1616
const router = express.Router();
1717

‎src/routes/v1/blogs/index.ts renamed to ‎src/routes/blogs/index.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import express from 'express';
2-
import { SuccessResponse } from '../../../core/ApiResponse';
3-
import asyncHandler from '../../../helpers/asyncHandler';
4-
import validator, { ValidationSource } from '../../../helpers/validator';
2+
import { SuccessResponse } from '../../core/ApiResponse';
3+
import asyncHandler from '../../helpers/asyncHandler';
4+
import validator, { ValidationSource } from '../../helpers/validator';
55
import schema from './schema';
6-
import { BadRequestError } from '../../../core/ApiError';
7-
import BlogRepo from '../../../database/repository/BlogRepo';
6+
import { BadRequestError } from '../../core/ApiError';
7+
import BlogRepo from '../../database/repository/BlogRepo';
88
import { Types } from 'mongoose';
9-
import User from '../../../database/model/User';
10-
import BlogsCache from '../../../cache/repository/BlogsCache';
9+
import User from '../../database/model/User';
10+
import BlogsCache from '../../cache/repository/BlogsCache';
1111

1212
const router = express.Router();
1313

‎src/routes/v1/blogs/schema.ts renamed to ‎src/routes/blogs/schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Joi from 'joi';
2-
import { JoiObjectId } from '../../../helpers/validator';
2+
import { JoiObjectId } from '../../helpers/validator';
33

44
export default {
55
blogId: Joi.object().keys({

‎src/routes/v1/index.ts renamed to ‎src/routes/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import express from 'express';
2-
import apikey from '../../auth/apikey';
3-
import permission from '../../helpers/permission';
4-
import { Permission } from '../../database/model/ApiKey';
2+
import apikey from '../auth/apikey';
3+
import permission from '../helpers/permission';
4+
import { Permission } from '../database/model/ApiKey';
55
import signup from './access/signup';
66
import login from './access/login';
77
import logout from './access/logout';

‎src/routes/v1/profile/index.ts renamed to ‎src/routes/profile/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import express from 'express';
2-
import { SuccessResponse } from '../../../core/ApiResponse';
3-
import UserRepo from '../../../database/repository/UserRepo';
2+
import { SuccessResponse } from '../../core/ApiResponse';
3+
import UserRepo from '../../database/repository/UserRepo';
44
import { ProtectedRequest } from 'app-request';
5-
import { BadRequestError } from '../../../core/ApiError';
6-
import validator from '../../../helpers/validator';
5+
import { BadRequestError } from '../../core/ApiError';
6+
import validator from '../../helpers/validator';
77
import schema from './schema';
8-
import asyncHandler from '../../../helpers/asyncHandler';
8+
import asyncHandler from '../../helpers/asyncHandler';
99
import _ from 'lodash';
10-
import authentication from '../../../auth/authentication';
10+
import authentication from '../../auth/authentication';
1111

1212
const router = express.Router();
1313

‎src/routes/v1/profile/schema.ts renamed to ‎src/routes/profile/schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Joi from 'joi';
2-
import { JoiObjectId } from '../../../helpers/validator';
2+
import { JoiObjectId } from '../../helpers/validator';
33

44
export default {
55
userId: Joi.object().keys({

‎tests/routes/v1/access/login/integration.test.ts renamed to ‎tests/routes/access/login/integration.test.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
jest.resetAllMocks(); // make sure we do not have any mocks set from unit tests
22

33
import supertest from 'supertest';
4-
import app from '../../../../../src/app';
5-
import UserRepo from '../../../../../src/database/repository/UserRepo';
6-
import KeystoreRepo from '../../../../../src/database/repository/KeystoreRepo';
7-
import User, { UserModel } from '../../../../../src/database/model/User';
4+
import app from '../../../../src/app';
5+
import UserRepo from '../../../../src/database/repository/UserRepo';
6+
import KeystoreRepo from '../../../../src/database/repository/KeystoreRepo';
7+
import User, { UserModel } from '../../../../src/database/model/User';
88
import bcrypt from 'bcrypt';
9-
import * as authUtils from '../../../../../src/auth/authUtils';
10-
import Role, { RoleCode } from '../../../../../src/database/model/Role';
9+
import * as authUtils from '../../../../src/auth/authUtils';
10+
import Role, { RoleCode } from '../../../../src/database/model/Role';
1111
import { Types } from 'mongoose';
12-
import ApiKey, { ApiKeyModel } from '../../../../../src/database/model/ApiKey';
13-
import { connection } from '../../../../../src/database';
14-
import cache from '../../../../../src/cache';
12+
import ApiKey, { ApiKeyModel } from '../../../../src/database/model/ApiKey';
13+
import { connection } from '../../../../src/database';
14+
import cache from '../../../../src/cache';
1515

1616
export const createTokensSpy = jest.spyOn(authUtils, 'createTokens');
1717
export const bcryptCompareSpy = jest.spyOn(bcrypt, 'compare');

‎tests/routes/v1/access/login/mock.ts renamed to ‎tests/routes/access/login/mock.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { USER_ID } from '../../../../auth/authentication/mock';
2-
import Keystore from '../../../../../src/database/model/Keystore';
3-
import User from '../../../../../src/database/model/User';
1+
import { USER_ID } from '../../../auth/authentication/mock';
2+
import Keystore from '../../../../src/database/model/Keystore';
3+
import User from '../../../../src/database/model/User';
44
import { Types } from 'mongoose';
55
import bcrypt from 'bcrypt';
6-
import * as authUtils from '../../../../../src/auth/authUtils';
7-
import Role from '../../../../../src/database/model/Role';
6+
import * as authUtils from '../../../../src/auth/authUtils';
7+
import Role from '../../../../src/database/model/Role';
88

99
export const USER_EMAIL = 'random@test.com';
1010
export const USER_PASSWORD = 'abc123';
@@ -44,12 +44,12 @@ export const mockUserFindByEmail = jest.fn(
4444
},
4545
);
4646

47-
jest.mock('../../../../../src/database/repository/KeystoreRepo', () => ({
47+
jest.mock('../../../../src/database/repository/KeystoreRepo', () => ({
4848
create: mockKeystoreCreate,
4949
}));
5050

51-
jest.mock('../../../../../src/database/repository/UserRepo', () => ({
51+
jest.mock('../../../../src/database/repository/UserRepo', () => ({
5252
findByEmail: mockUserFindByEmail,
5353
}));
5454

55-
jest.unmock('../../../../../src/auth/authUtils'); // remove any override made anywhere
55+
jest.unmock('../../../../src/auth/authUtils'); // remove any override made anywhere

‎tests/routes/v1/access/login/unit.test.ts renamed to ‎tests/routes/access/login/unit.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import '../../../../database/mock';
2-
import '../../../../cache/mock';
3-
import { addHeaders } from '../../../../auth/authentication/mock';
1+
import '../../../database/mock';
2+
import '../../../cache/mock';
3+
import { addHeaders } from '../../../auth/authentication/mock';
44

55
// the mock for this class should be below all other mock imports
66
import {
@@ -14,7 +14,7 @@ import {
1414
} from './mock';
1515

1616
import supertest from 'supertest';
17-
import app from '../../../../../src/app';
17+
import app from '../../../../src/app';
1818

1919
describe('Login basic route', () => {
2020
const endpoint = '/v1/login/basic';

‎tests/routes/v1/access/signup/mock.ts renamed to ‎tests/routes/access/signup/mock.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { mockUserFindByEmail } from '../login/mock';
2-
import User from '../../../../../src/database/model/User';
3-
import Keystore from '../../../../../src/database/model/Keystore';
2+
import User from '../../../../src/database/model/User';
3+
import Keystore from '../../../../src/database/model/Keystore';
44
import { Types } from 'mongoose';
55
import bcrypt from 'bcrypt';
66

@@ -25,7 +25,7 @@ export const mockUserCreate = jest.fn(
2525
},
2626
);
2727

28-
jest.mock('../../../../../src/database/repository/UserRepo', () => ({
28+
jest.mock('../../../../src/database/repository/UserRepo', () => ({
2929
findByEmail: mockUserFindByEmail, // utilising already defined mock
3030
create: mockUserCreate,
3131
}));

0 commit comments

Comments
 (0)