Skip to content

Commit 97ac116

Browse files
frckbricefrckbrice
committed
integration testing enforced and formatting
1 parent e19e2eb commit 97ac116

12 files changed

Lines changed: 153 additions & 62 deletions

File tree

‎application-business-rules/use-cases/blogs/blog-handlers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Blog use cases (Clean Architecture)
22
module.exports = {
3-
createBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
3+
createBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents }) =>
44
async function createBlogUseCaseHandler(blogData) {
55
try {
66
const validatedBlog = await makeBlogModel({ blogData });
@@ -36,7 +36,7 @@ module.exports = {
3636
}
3737
},
3838

39-
updateBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
39+
updateBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents }) =>
4040
async function updateBlogUseCaseHandler({ blogId, updateData }) {
4141
try {
4242
const existingBlog = await dbBlogHandler.findOneBlog({ blogId });

‎application-business-rules/use-cases/user/index.js‎

Lines changed: 60 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,69 @@ const { makeHttpError } = require('../../../interface-adapters/validators-errors
99
const entityModels = require('../../../enterprise-business-rules/entities');
1010

1111
// Auth Use Cases
12-
const registerUserUseCaseHandler = authUseCases.registerUserUseCase({ dbUserHandler, entityModels, logEvents, makeHttpError });
13-
const loginUserUseCaseHandler = authUseCases.loginUserUseCase({ dbUserHandler, logEvents, makeHttpError });
12+
const registerUserUseCaseHandler = authUseCases.registerUserUseCase({
13+
dbUserHandler,
14+
entityModels,
15+
logEvents,
16+
makeHttpError,
17+
});
18+
const loginUserUseCaseHandler = authUseCases.loginUserUseCase({
19+
dbUserHandler,
20+
logEvents,
21+
makeHttpError,
22+
});
1423
const logoutUseCaseHandler = authUseCases.logoutUseCase({ RequiredParameterError, logEvents });
15-
const refreshTokenUseCaseHandler = authUseCases.refreshTokenUseCase({ dbUserHandler, RequiredParameterError, logEvents });
16-
const forgotPasswordUseCaseHandler = authUseCases.forgotPasswordUseCase({ dbUserHandler, logEvents });
17-
const resetPasswordUseCaseHandler = authUseCases.resetPasswordUseCase({ dbUserHandler, logEvents, makeHttpError });
24+
const refreshTokenUseCaseHandler = authUseCases.refreshTokenUseCase({
25+
dbUserHandler,
26+
RequiredParameterError,
27+
logEvents,
28+
});
29+
const forgotPasswordUseCaseHandler = authUseCases.forgotPasswordUseCase({
30+
dbUserHandler,
31+
logEvents,
32+
});
33+
const resetPasswordUseCaseHandler = authUseCases.resetPasswordUseCase({
34+
dbUserHandler,
35+
logEvents,
36+
makeHttpError,
37+
});
1838

1939
// Profile Use Cases
20-
const findAllUsersUseCaseHandler = profileUseCases.findAllUsersUseCase({ dbUserHandler, logEvents });
21-
const findOneUserUseCaseHandler = profileUseCases.findOneUserUseCase({ dbUserHandler, validateId, logEvents });
22-
const updateUserUseCaseHandler = profileUseCases.updateUserUseCase({ dbUserHandler, makeUser, validateId, RequiredParameterError, logEvents, makeHttpError });
23-
const deleteUserUseCaseHandler = profileUseCases.deleteUserUseCase({ dbUserHandler, validateId, RequiredParameterError, logEvents });
24-
const blockUserUseCaseHandler = profileUseCases.blockUserUseCase({ dbUserHandler, validateId, RequiredParameterError, logEvents });
25-
const unBlockUserUseCaseHandler = profileUseCases.unBlockUserUseCase({ dbUserHandler, validateId, RequiredParameterError, logEvents });
40+
const findAllUsersUseCaseHandler = profileUseCases.findAllUsersUseCase({
41+
dbUserHandler,
42+
logEvents,
43+
});
44+
const findOneUserUseCaseHandler = profileUseCases.findOneUserUseCase({
45+
dbUserHandler,
46+
validateId,
47+
logEvents,
48+
});
49+
const updateUserUseCaseHandler = profileUseCases.updateUserUseCase({
50+
dbUserHandler,
51+
makeUser,
52+
validateId,
53+
RequiredParameterError,
54+
logEvents,
55+
makeHttpError,
56+
});
57+
const deleteUserUseCaseHandler = profileUseCases.deleteUserUseCase({
58+
dbUserHandler,
59+
validateId,
60+
RequiredParameterError,
61+
logEvents,
62+
});
63+
const blockUserUseCaseHandler = profileUseCases.blockUserUseCase({
64+
dbUserHandler,
65+
validateId,
66+
RequiredParameterError,
67+
logEvents,
68+
});
69+
const unBlockUserUseCaseHandler = profileUseCases.unBlockUserUseCase({
70+
dbUserHandler,
71+
validateId,
72+
RequiredParameterError,
73+
logEvents,
74+
});
2675

2776
module.exports = {
2877
// Auth

‎application-business-rules/use-cases/user/user-auth-usecases.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module.exports = {
2-
registerUserUseCase: require('./user-handlers').registerUserUseCase,
3-
loginUserUseCase: require('./user-handlers').loginUserUseCase,
4-
refreshTokenUseCase: require('./user-handlers').refreshTokenUseCase,
5-
logoutUseCase: require('./user-handlers').logoutUseCase,
6-
forgotPasswordUseCase: require('./user-handlers').forgotPasswordUseCase,
7-
resetPasswordUseCase: require('./user-handlers').resetPasswordUseCase,
8-
};
2+
registerUserUseCase: require('./user-handlers').registerUserUseCase,
3+
loginUserUseCase: require('./user-handlers').loginUserUseCase,
4+
refreshTokenUseCase: require('./user-handlers').refreshTokenUseCase,
5+
logoutUseCase: require('./user-handlers').logoutUseCase,
6+
forgotPasswordUseCase: require('./user-handlers').forgotPasswordUseCase,
7+
resetPasswordUseCase: require('./user-handlers').resetPasswordUseCase,
8+
};

‎application-business-rules/use-cases/user/user-handlers.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ module.exports = {
229229
* @throws {RequiredParameterError} If the ID is not provided.
230230
* @throws {new Error} If the user is not found.
231231
*/
232-
deleteUserUseCase: ({ dbUserHandler, validateId, RequiredParameterError, logEvents }) => {
232+
deleteUserUseCase: ({ dbUserHandler, validateId, logEvents }) => {
233233
return async function deleteUserUseCaseHandler({ userId }) {
234234
const newId = validateId(userId);
235235
try {
@@ -268,7 +268,7 @@ module.exports = {
268268
* @throws {new Error} If the user is not found.
269269
* @throws {Error} If there is an error refreshing the token.
270270
*/
271-
refreshTokenUseCase: ({ dbUserHandler, RequiredParameterError, logEvents }) => {
271+
refreshTokenUseCase: ({ dbUserHandler, logEvents }) => {
272272
return async function refreshTokenUseCaseHandler({ refreshToken, jwt }) {
273273
try {
274274
console.log(`refreshToken: ${refreshToken}`);
@@ -316,7 +316,7 @@ module.exports = {
316316
* @param {string} refreshToken - The refresh token to be used for logout.
317317
* @return {Object} An object containing the access token and refresh token.
318318
*/
319-
logoutUseCase: ({ RequiredParameterError, logEvents }) => {
319+
logoutUseCase: ({ logEvents }) => {
320320
return async function logoutUseCaseHandler({ refreshToken }) {
321321
try {
322322
if (!refreshToken) {
@@ -334,7 +334,7 @@ module.exports = {
334334
},
335335

336336
//block user
337-
blockUserUseCase: ({ dbUserHandler, validateId, RequiredParameterError, logEvents }) => {
337+
blockUserUseCase: ({ dbUserHandler, validateId, logEvents }) => {
338338
return async function blockUserUseCaseHandler({ userId }) {
339339
const newId = validateId(userId);
340340

@@ -363,7 +363,7 @@ module.exports = {
363363
},
364364

365365
//un-block user
366-
unBlockUserUseCase: ({ dbUserHandler, validateId, RequiredParameterError, logEvents }) => {
366+
unBlockUserUseCase: ({ dbUserHandler, validateId, logEvents }) => {
367367
return async function unBlockUserUseCaseHandler({ userId }) {
368368
const newId = validateId(userId);
369369

‎application-business-rules/use-cases/user/user-profile-usecases.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ module.exports = {
55
deleteUserUseCase: require('./user-handlers').deleteUserUseCase,
66
blockUserUseCase: require('./user-handlers').blockUserUseCase,
77
unBlockUserUseCase: require('./user-handlers').unBlockUserUseCase,
8-
};
8+
};

‎enterprise-business-rules/entities/blog-model.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
const blogValidation = require('../validate-models/blog-validation');
2-
31
module.exports = {
42
makeBlogModel: ({ blogValidation, logEvents }) => {
53
return async function makeBlog({ blogData }) {

‎enterprise-business-rules/validate-models/blog-validation.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const productValidation = require('./product-validation-fcts')();
22

3-
const { validateDescription, validateTitle, validateObjectId } = productValidation;
3+
const { validateDescription, validateTitle } = productValidation;
44

55
//validate cover image for only more optimized types
66
const validateCoverImage = ({ cover_image, InvalidPropertyError }) => {

‎interface-adapters/controllers/blogs/blog-controller.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const defaultHeaders = {
44
'x-content-type-options': 'nosniff',
55
};
66

7-
const createBlogController = ({ createBlogUseCaseHandler, errorHandlers, logEvents }) =>
7+
const createBlogController = ({ createBlogUseCaseHandler, logEvents }) =>
88
async function createBlogControllerHandler(httpRequest) {
99
const { body } = httpRequest;
1010
if (!body || Object.keys(body).length === 0) {
@@ -32,10 +32,10 @@ const createBlogController = ({ createBlogUseCaseHandler, errorHandlers, logEven
3232
};
3333

3434
const findAllBlogsController = ({ findAllBlogsUseCaseHandler, logEvents }) =>
35-
async function findAllBlogsControllerHandler(httpRequest) {
35+
async function findAllBlogsControllerHandler() {
3636
try {
3737
const blogs = await findAllBlogsUseCaseHandler();
38-
const safeBlogs = Array.isArray(blogs) ? blogs : (blogs ? [blogs] : []);
38+
const safeBlogs = Array.isArray(blogs) ? blogs : blogs ? [blogs] : [];
3939
return {
4040
headers: defaultHeaders,
4141
statusCode: 200,

‎interface-adapters/controllers/users/user-auth-controller.js‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ module.exports = {
2828
return {
2929
headers: { 'Content-Type': 'application/json' },
3030
statusCode: 400,
31-
data: { success: false, error: registeredUser?.errorMessage || 'User validation failed. Please check required fields.', stack: registeredUser?.stack },
31+
data: {
32+
success: false,
33+
error:
34+
registeredUser?.errorMessage ||
35+
'User validation failed. Please check required fields.',
36+
stack: registeredUser?.stack,
37+
},
3238
};
3339
}
3440
return {
@@ -520,7 +526,12 @@ module.exports = {
520526
},
521527

522528
//reset password
523-
resetPasswordController: ({ resetPasswordUseCaseHandler, UniqueConstraintError }) => {
529+
resetPasswordController: ({
530+
resetPasswordUseCaseHandler,
531+
UniqueConstraintError,
532+
makeHttpError,
533+
logEvents,
534+
}) => {
524535
return async function resetPasswordControllerHandler(httpRequest) {
525536
const { token } = httpRequest.params;
526537
const { password } = httpRequest.body;
@@ -542,6 +553,10 @@ module.exports = {
542553
: { message: 'resetPassword failed! hindly try again after some time' },
543554
};
544555
} catch (e) {
556+
logEvents(
557+
`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`,
558+
'controllerHandlerErr.log'
559+
);
545560
console.log('error from resetPasswordController controller handler: ', e);
546561
const statusCode = e instanceof UniqueConstraintError ? 400 : 500;
547562
return makeHttpError({ errorMessage: e.message, statusCode });

‎interface-adapters/controllers/users/user-profile-controller.js‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
21
module.exports = {
3-
findAllUsersController: ({
4-
findAllUsersUseCaseHandler,
5-
makeHttpError, logEvents }) => {
2+
findAllUsersController: ({ findAllUsersUseCaseHandler, makeHttpError, logEvents }) => {
63
return async function findAllUsersControllerHandler() {
74
try {
85
const users = await findAllUsersUseCaseHandler();
@@ -12,12 +9,15 @@ module.exports = {
129
data: JSON.stringify(users),
1310
};
1411
} catch (e) {
15-
logEvents(`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`, 'controllerHandlerErr.log');
12+
logEvents(
13+
`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`,
14+
'controllerHandlerErr.log'
15+
);
1616
return makeHttpError({ errorMessage: e.message, statusCode: 500 });
1717
}
1818
};
1919
},
20-
findOneUserController: ({ findOneUserUseCaseHandler, UniqueConstraintError, InvalidPropertyError, makeHttpError, logEvents }) => {
20+
findOneUserController: ({ findOneUserUseCaseHandler, makeHttpError, logEvents }) => {
2121
return async function findOneUserControllerHandler(httpRequest) {
2222
const { userId } = httpRequest.params;
2323
if (!userId) {
@@ -31,7 +31,10 @@ module.exports = {
3131
data: JSON.stringify(user),
3232
};
3333
} catch (e) {
34-
logEvents(`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`, 'controllerHandlerErr.log');
34+
logEvents(
35+
`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`,
36+
'controllerHandlerErr.log'
37+
);
3538
return makeHttpError({ errorMessage: e.message, statusCode: 500 });
3639
}
3740
};
@@ -51,7 +54,10 @@ module.exports = {
5154
data: JSON.stringify(updatedUser),
5255
};
5356
} catch (e) {
54-
logEvents(`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`, 'controllerHandlerErr.log');
57+
logEvents(
58+
`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`,
59+
'controllerHandlerErr.log'
60+
);
5561
return makeHttpError({ errorMessage: e.message, statusCode: 500 });
5662
}
5763
};
@@ -70,7 +76,10 @@ module.exports = {
7076
data: JSON.stringify(deletedUser),
7177
};
7278
} catch (e) {
73-
logEvents(`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`, 'controllerHandlerErr.log');
79+
logEvents(
80+
`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`,
81+
'controllerHandlerErr.log'
82+
);
7483
return makeHttpError({ errorMessage: e.message, statusCode: 500 });
7584
}
7685
};
@@ -89,7 +98,10 @@ module.exports = {
8998
data: JSON.stringify({ message: 'user blocked successfully', blockedUser }),
9099
};
91100
} catch (e) {
92-
logEvents(`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`, 'controllerHandlerErr.log');
101+
logEvents(
102+
`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`,
103+
'controllerHandlerErr.log'
104+
);
93105
return makeHttpError({ errorMessage: e.message, statusCode: 500 });
94106
}
95107
},
@@ -107,8 +119,11 @@ module.exports = {
107119
data: JSON.stringify({ message: 'user unblocked successfully', unBlockedUser }),
108120
};
109121
} catch (e) {
110-
logEvents(`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`, 'controllerHandlerErr.log');
122+
logEvents(
123+
`${('No:', e.no)}:${('code: ', e.code)}\t${('name: ', e.name)}\t${('message:', e.message)}`,
124+
'controllerHandlerErr.log'
125+
);
111126
return makeHttpError({ errorMessage: e.message, statusCode: 500 });
112127
}
113128
},
114-
};
129+
};

0 commit comments

Comments
 (0)