Skip to content

Commit 663e1e8

Browse files
kkartunovkkartunov
committed
joi & express fixes
1 parent b8ccdfa commit 663e1e8

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

‎app-routes.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ module.exports = (app) => {
121121
});
122122

123123
// Check if the route is not found or HTTP method is not supported
124-
app.use("*", (req, res) => {
124+
app.use((req, res) => {
125125
if (routes[req.baseUrl]) {
126126
res.status(HttpStatus.METHOD_NOT_ALLOWED).json({
127127
message: "The requested HTTP method is not supported.",

‎src/services/ChallengeService.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ async function setDefaultReviewers(currentUser, data) {
315315
incrementalCoefficient: Joi.number().min(0).max(1).optional().allow(null),
316316
type: Joi.when("isMemberReview", {
317317
is: true,
318-
then: Joi.string().valid(_.values(ReviewOpportunityTypeEnum)).insensitive(),
318+
then: Joi.string().valid(..._.values(ReviewOpportunityTypeEnum)).insensitive(),
319319
otherwise: Joi.forbidden(),
320320
}),
321321
aiWorkflowId: Joi.when("isMemberReview", {
@@ -1152,7 +1152,7 @@ searchChallenges.schema = {
11521152
projectId: Joi.number().integer().positive(),
11531153
forumId: Joi.number().integer(),
11541154
legacyId: Joi.number().integer().positive(),
1155-
status: Joi.string().valid(_.values(ChallengeStatusEnum)).insensitive(),
1155+
status: Joi.string().valid(..._.values(ChallengeStatusEnum)).insensitive(),
11561156
group: Joi.string(),
11571157
startDateStart: Joi.date(),
11581158
startDateEnd: Joi.date(),
@@ -1176,7 +1176,7 @@ searchChallenges.schema = {
11761176
isLightweight: Joi.boolean().default(false),
11771177
memberId: Joi.string(),
11781178
sortBy: Joi.string().valid(...allowedSortByValues),
1179-
sortOrder: Joi.string().valid(["asc", "desc"]),
1179+
sortOrder: Joi.string().valid("asc", "desc"),
11801180
groups: Joi.array().items(Joi.optionalId()).unique(),
11811181
ids: Joi.array().items(Joi.optionalId()).unique().min(1),
11821182
isTask: Joi.boolean(),
@@ -1578,7 +1578,7 @@ createChallenge.schema = {
15781578
trackId: Joi.id(),
15791579
legacy: Joi.object().keys({
15801580
reviewType: Joi.string()
1581-
.valid(_.values(ReviewTypeEnum))
1581+
.valid(..._.values(ReviewTypeEnum))
15821582
.insensitive()
15831583
.default(ReviewTypeEnum.INTERNAL),
15841584
confidentialityType: Joi.string().default(config.DEFAULT_CONFIDENTIALITY_TYPE),
@@ -1650,7 +1650,7 @@ createChallenge.schema = {
16501650
Joi.object().keys({
16511651
id: Joi.optionalId(),
16521652
name: Joi.string().required(),
1653-
type: Joi.string().required().valid(_.values(DiscussionTypeEnum)),
1653+
type: Joi.string().required().valid(..._.values(DiscussionTypeEnum)),
16541654
provider: Joi.string().required(),
16551655
url: Joi.string(),
16561656
options: Joi.array().items(Joi.object()),
@@ -1670,7 +1670,7 @@ createChallenge.schema = {
16701670
phaseId: Joi.id().required(),
16711671
type: Joi.when("isMemberReview", {
16721672
is: true,
1673-
then: Joi.string().valid(_.values(ReviewOpportunityTypeEnum)).insensitive(),
1673+
then: Joi.string().valid(..._.values(ReviewOpportunityTypeEnum)).insensitive(),
16741674
otherwise: Joi.forbidden(),
16751675
}),
16761676
aiWorkflowId: Joi.when("isMemberReview", {
@@ -1685,7 +1685,7 @@ createChallenge.schema = {
16851685
),
16861686
prizeSets: Joi.array().items(
16871687
Joi.object().keys({
1688-
type: Joi.string().valid(_.values(PrizeSetTypeEnum)).required(),
1688+
type: Joi.string().valid(..._.values(PrizeSetTypeEnum)).required(),
16891689
description: Joi.string(),
16901690
prizes: Joi.array()
16911691
.items(
@@ -1708,12 +1708,12 @@ createChallenge.schema = {
17081708
})
17091709
.optional(),
17101710
startDate: Joi.date().iso(),
1711-
status: Joi.string().valid([
1711+
status: Joi.string().valid(
17121712
ChallengeStatusEnum.ACTIVE,
17131713
ChallengeStatusEnum.NEW,
17141714
ChallengeStatusEnum.DRAFT,
1715-
ChallengeStatusEnum.APPROVED,
1716-
]),
1715+
ChallengeStatusEnum.APPROVED
1716+
),
17171717
groups: Joi.array().items(Joi.optionalId()).unique(),
17181718
// gitRepoURLs: Joi.array().items(Joi.string().uri()),
17191719
terms: Joi.array().items(
@@ -2751,7 +2751,7 @@ updateChallenge.schema = {
27512751
track: Joi.string(),
27522752
subTrack: Joi.string(),
27532753
reviewType: Joi.string()
2754-
.valid(_.values(ReviewTypeEnum))
2754+
.valid(..._.values(ReviewTypeEnum))
27552755
.insensitive()
27562756
.default(ReviewTypeEnum.INTERNAL),
27572757
confidentialityType: Joi.string()
@@ -2843,7 +2843,7 @@ updateChallenge.schema = {
28432843
Joi.object().keys({
28442844
id: Joi.optionalId(),
28452845
name: Joi.string().required(),
2846-
type: Joi.string().required().valid(_.values(DiscussionTypeEnum)),
2846+
type: Joi.string().required().valid(..._.values(DiscussionTypeEnum)),
28472847
provider: Joi.string().required(),
28482848
url: Joi.string(),
28492849
options: Joi.array().items(Joi.object()),
@@ -2865,7 +2865,7 @@ updateChallenge.schema = {
28652865
phaseId: Joi.id().required(),
28662866
type: Joi.when("isMemberReview", {
28672867
is: true,
2868-
then: Joi.string().valid(_.values(ReviewOpportunityTypeEnum)).insensitive(),
2868+
then: Joi.string().valid(..._.values(ReviewOpportunityTypeEnum)).insensitive(),
28692869
otherwise: Joi.forbidden(),
28702870
}),
28712871
aiWorkflowId: Joi.when("isMemberReview", {
@@ -2884,7 +2884,7 @@ updateChallenge.schema = {
28842884
.items(
28852885
Joi.object()
28862886
.keys({
2887-
type: Joi.string().valid(_.values(PrizeSetTypeEnum)).required(),
2887+
type: Joi.string().valid(..._.values(PrizeSetTypeEnum)).required(),
28882888
description: Joi.string(),
28892889
prizes: Joi.array()
28902890
.items(
@@ -2908,7 +2908,7 @@ updateChallenge.schema = {
29082908
allowedRegistrants: Joi.array().items(Joi.string().trim().lowercase()).optional(),
29092909
})
29102910
.optional(),
2911-
status: Joi.string().valid(_.values(ChallengeStatusEnum)).insensitive(),
2911+
status: Joi.string().valid(..._.values(ChallengeStatusEnum)).insensitive(),
29122912
attachments: Joi.array().items(
29132913
Joi.object().keys({
29142914
id: Joi.id(),
@@ -2928,7 +2928,7 @@ updateChallenge.schema = {
29282928
userId: Joi.number().integer().positive().required(),
29292929
handle: Joi.string().required(),
29302930
placement: Joi.number().integer().positive().required(),
2931-
type: Joi.string().valid(_.values(PrizeSetTypeEnum)),
2931+
type: Joi.string().valid(..._.values(PrizeSetTypeEnum)),
29322932
})
29332933
.unknown(true)
29342934
)
@@ -2940,7 +2940,7 @@ updateChallenge.schema = {
29402940
userId: Joi.number().integer().positive().required(),
29412941
handle: Joi.string().required(),
29422942
placement: Joi.number().integer().positive().required(),
2943-
type: Joi.string().valid(_.values(PrizeSetTypeEnum)),
2943+
type: Joi.string().valid(..._.values(PrizeSetTypeEnum)),
29442944
})
29452945
.unknown(true)
29462946
)

‎src/services/ChallengeTrackService.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ searchChallengeTracks.schema = {
7474
isActive: Joi.boolean(),
7575
abbreviation: Joi.string(),
7676
legacyId: Joi.number().integer().positive(),
77-
track: Joi.string().valid(_.values(ChallengeTrackEnum)),
77+
track: Joi.string().valid(..._.values(ChallengeTrackEnum)),
7878
}),
7979
};
8080

@@ -140,7 +140,7 @@ createChallengeTrack.schema = {
140140
isActive: Joi.boolean().required(),
141141
abbreviation: Joi.string().required(),
142142
legacyId: Joi.number().integer().positive(),
143-
track: Joi.string().valid(_.values(ChallengeTrackEnum)),
143+
track: Joi.string().valid(..._.values(ChallengeTrackEnum)),
144144
})
145145
.required(),
146146
};
@@ -209,7 +209,7 @@ fullyUpdateChallengeTrack.schema = {
209209
isActive: Joi.boolean().required(),
210210
abbreviation: Joi.string().required(),
211211
legacyId: Joi.number().integer().positive(),
212-
track: Joi.string().valid(_.values(ChallengeTrackEnum)),
212+
track: Joi.string().valid(..._.values(ChallengeTrackEnum)),
213213
})
214214
.required(),
215215
};
@@ -251,7 +251,7 @@ partiallyUpdateChallengeTrack.schema = {
251251
isActive: Joi.boolean(),
252252
abbreviation: Joi.string(),
253253
legacyId: Joi.number().integer().positive(),
254-
track: Joi.string().valid(_.values(ChallengeTrackEnum)),
254+
track: Joi.string().valid(..._.values(ChallengeTrackEnum)),
255255
})
256256
.required(),
257257
};

0 commit comments

Comments
 (0)