Skip to content

Commit c892363

Browse files
Merge pull request #39 from Capstone-C1SE04-TI/OPTIMIZE-VALIDATION-LOGIC
Optimize Validation Logic
2 parents af2b98f + 86956f8 commit c892363

File tree

2 files changed

+36
-31
lines changed

2 files changed

+36
-31
lines changed

src/validators/admin.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import {
44
returnValidationResult
55
} from "./index.js";
66

7-
const validateSignInBody = async (req, res, next) => {
8-
await validateUsername(req);
9-
await validatePassword(req);
7+
const validateSignInBody = async (req) => {
8+
await Promise.all([validateUsername(req), validatePassword(req)]);
109
return returnValidationResult(req);
1110
};
1211

src/validators/user.js

+34-28
Original file line numberDiff line numberDiff line change
@@ -16,53 +16,59 @@ import {
1616
returnValidationResult
1717
} from "./index.js";
1818

19-
const validateSignUpBody = async (req, res, next) => {
20-
await validateUsername(req);
21-
await validateEmail(req);
22-
await validatePhoneNumber(req);
23-
await validatePassword(req);
24-
await validateConfirmPassword(req);
19+
const validateSignUpBody = async (req) => {
20+
await Promise.all([
21+
validateUsername(req),
22+
validateEmail(req),
23+
validatePhoneNumber(req),
24+
validatePassword(req),
25+
validateConfirmPassword(req)
26+
]);
2527
return returnValidationResult(req);
2628
};
2729

28-
const validateSignInBody = async (req, res, next) => {
29-
await validateUsername(req);
30-
await validatePassword(req);
30+
const validateSignInBody = async (req) => {
31+
await Promise.all([validateUsername(req), validatePassword(req)]);
3132
return returnValidationResult(req);
3233
};
3334

34-
const validateSubmitEmailBody = async (req, res, next) => {
35+
const validateSubmitEmailBody = async (req) => {
3536
await validateEmail(req);
3637
return returnValidationResult(req);
3738
};
3839

39-
const validateSubmitCodeBody = async (req, res, next) => {
40-
await validateEmail(req);
41-
await validateCode(req);
40+
const validateSubmitCodeBody = async (req) => {
41+
await Promise.all([validateEmail(req), validateCode(req)]);
4242
return returnValidationResult(req);
4343
};
4444

45-
const validateCreateNewPasswordBody = async (req, res, next) => {
46-
await validateEmail(req);
47-
await validatePassword(req);
48-
await validateConfirmPassword(req);
45+
const validateCreateNewPasswordBody = async (req) => {
46+
await Promise.all([
47+
validateEmail(req),
48+
validatePassword(req),
49+
validateConfirmPassword(req)
50+
]);
4951
return returnValidationResult(req);
5052
};
5153

52-
const validateChangePasswordBody = async (req, res, next) => {
53-
await validateEmail(req);
54-
await validateOldPassword(req);
55-
await validateNewPassword(req);
56-
await validateNewConfirmPassword(req);
54+
const validateChangePasswordBody = async (req) => {
55+
await Promise.all([
56+
validateEmail(req),
57+
validateOldPassword(req),
58+
validateNewPassword(req),
59+
validateNewConfirmPassword(req)
60+
]);
5761
return returnValidationResult(req);
5862
};
5963

60-
const validateUpdateProfileBody = async (req, res, next) => {
61-
// await validateFullNameOptional(req);
62-
await validateEmailOptional(req);
63-
await validatePhoneNumberOptional(req);
64-
await validateWebsiteOptional(req);
65-
await validateAvatarOptional(req);
64+
const validateUpdateProfileBody = async (req) => {
65+
await Promise.all([
66+
// validateFullNameOptional(req),
67+
validateEmailOptional(req),
68+
validatePhoneNumberOptional(req),
69+
validateWebsiteOptional(req),
70+
validateAvatarOptional(req)
71+
]);
6672
return returnValidationResult(req);
6773
};
6874

0 commit comments

Comments
 (0)