Skip to content

PM-2614 - Module updates -> dev #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 5, 2025
Merged

PM-2614 - Module updates -> dev #32

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
93e0da8
pnpm update --latest
kkartunov Nov 4, 2025
0ffaffb
on dev env
kkartunov Nov 4, 2025
0d99cea
uuid API version updates
kkartunov Nov 4, 2025
b8ccdfa
axios-retry api update
kkartunov Nov 4, 2025
663e1e8
joi & express fixes
kkartunov Nov 4, 2025
6530304
fix error, schema.validate
kkartunov Nov 4, 2025
611ee56
clean up readmes
kkartunov Nov 4, 2025
de2bc0d
remove unused
kkartunov Nov 4, 2025
d4aa9b4
up aws sdk to v3
kkartunov Nov 4, 2025
127cce1
hid pnpm-lock
kkartunov Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,7 @@ workflows:
branches:
only:
- develop
- feature/top-262-projectid-non-mandatory
- TOP-2364
- PM-2097
- pm-2539
- module-updates

- "build-qa":
context: org-global
Expand Down
4 changes: 2 additions & 2 deletions app-routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
const _ = require("lodash");
const config = require("config");
const HttpStatus = require("http-status-codes");
const uuid = require("uuid/v4");
const { v4: uuid } = require('uuid');
const helper = require("./src/common/helper");
const errors = require("./src/common/errors");
const logger = require("./src/common/logger");
Expand Down Expand Up @@ -121,7 +121,7 @@ module.exports = (app) => {
});

// Check if the route is not found or HTTP method is not supported
app.use("*", (req, res) => {
app.use((req, res) => {
Copy link

@github-actions github-actions bot Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[❗❗ correctness]
Removing the "*" wildcard from app.use means that this middleware will now handle all requests, not just those that don't match any defined route. This could lead to unexpected behavior if there are other middlewares or routes defined after this point that should be executed. Consider whether this change is intentional and if it aligns with the desired routing logic.

if (routes[req.baseUrl]) {
res.status(HttpStatus.METHOD_NOT_ALLOWED).json({
message: "The requested HTTP method is not supported.",
Expand Down
2 changes: 1 addition & 1 deletion mock-api/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const config = require('config')
const winston = require('winston')
const _ = require('lodash')
const prisma = require('../src/common/prisma').getClient()
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');

const app = express()
app.set('port', config.PORT)
Expand Down
66 changes: 33 additions & 33 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,49 +27,49 @@
"repository": "https://github.com/topcoder-platform/challenge-api",
"devDependencies": {
"aws-sdk-mock": "^6.2.1",
"chai": "^4.2.0",
"chai-http": "^4.2.1",
"mocha": "^11.1.0",
"chai": "^6.2.0",
"chai-http": "^5.1.2",
"mocha": "^11.7.4",
"mocha-prepare": "^0.1.0",
"nodemon": "^3.1.9",
"nodemon": "^3.1.10",
"nyc": "^17.1.0",
"prettier": "^2.8.1",
"prisma": "^6.4.1",
"standard": "^17.1.0"
"prettier": "^3.6.2",
"prisma": "^6.18.0",
"standard": "^17.1.2"
},
"dependencies": {
"@prisma/client": "^6.4.1",
"aws-sdk": "^2.1145.0",
"axios": "^1.10.0",
"axios-retry": "^3.4.0",
"bluebird": "^3.5.1",
"body-parser": "^1.15.1",
"compare-versions": "^6.1.0",
"config": "^3.0.1",
"@prisma/client": "^6.18.0",
"aws-sdk": "^2.1692.0",
"axios": "^1.13.1",
"axios-retry": "^4.5.0",
"bluebird": "^3.7.2",
"body-parser": "^2.2.0",
"compare-versions": "^6.1.1",
"config": "^4.1.1",
"cors": "^2.8.5",
"decimal.js": "^10.4.3",
"deep-equal": "^2.2.0",
"dompurify": "^3.0.2",
"dotenv": "^8.2.0",
"express": "^4.15.4",
"express-fileupload": "^1.1.6",
"decimal.js": "^10.6.0",
"deep-equal": "^2.2.3",
"dompurify": "^3.3.0",
"dotenv": "^17.2.3",
"express": "^5.1.0",
"express-fileupload": "^1.5.2",
"express-interceptor": "^1.2.0",
"get-parameter-names": "^0.3.0",
"http-status-codes": "^1.3.0",
"joi": "^14.0.0",
"jsdom": "^21.1.2",
"http-status-codes": "^2.3.0",
"joi": "^18.0.1",
"jsdom": "^27.1.0",
"json-rules-engine": "^7.3.1",
"jsonwebtoken": "^9.0.2",
"lodash": "^4.17.19",
"markdown-it": "^13.0.1",
"moment": "^2.24.0",
"lodash": "^4.17.21",
"markdown-it": "^14.1.0",
"moment": "^2.30.1",
"node-cache": "^5.1.2",
"swagger-ui-express": "^4.1.3",
"tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.6.4",
"topcoder-bus-api-wrapper": "topcoder-platform/tc-bus-api-wrapper.git",
"uuid": "^3.3.2",
"winston": "^3.8.2",
"xss": "^1.0.8",
"swagger-ui-express": "^5.0.1",
"tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.4",
"topcoder-bus-api-wrapper": "github:topcoder-platform/tc-bus-api-wrapper",
"uuid": "^13.0.0",
"winston": "^3.18.3",
"xss": "^1.0.15",
"yamljs": "^0.3.0"
},
"standard": {
Expand Down
2 changes: 1 addition & 1 deletion src/common/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const util = require("util");
const AWS = require("aws-sdk");
const config = require("config");
const axios = require("axios");
const axiosRetry = require("axios-retry");
const axiosRetry = require("axios-retry").default;
const busApi = require("topcoder-bus-api-wrapper");
const NodeCache = require("node-cache");
const HttpStatus = require("http-status-codes");
Expand Down
2 changes: 1 addition & 1 deletion src/common/phase-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const _ = require("lodash");

const uuid = require("uuid/v4");
const { v4: uuid } = require('uuid');
const moment = require("moment");

const errors = require("./errors");
Expand Down
2 changes: 1 addition & 1 deletion src/phase-management/PhaseAdvancer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const uuid = require("uuid/v4");
const { v4: uuid } = require('uuid');
const { Engine } = require("json-rules-engine");
const { Prisma } = require("@prisma/client");
const config = require("config");
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/seed-tables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
const _ = require("lodash");
const util = require("util");
const uuid = require("uuid/v4");
const { v4: uuid } = require('uuid');
const logger = require("../common/logger");
const prismaHelper = require("../common/prisma-helper");

Expand Down
36 changes: 18 additions & 18 deletions src/services/ChallengeService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
const _ = require("lodash");
const Joi = require("joi");
const { Prisma } = require("@prisma/client");
const uuid = require("uuid/v4");
const { v4: uuid } = require('uuid');
const config = require("config");
const xss = require("xss");
const helper = require("../common/helper");
Expand Down Expand Up @@ -315,7 +315,7 @@ async function setDefaultReviewers(currentUser, data) {
incrementalCoefficient: Joi.number().min(0).max(1).optional().allow(null),
type: Joi.when("isMemberReview", {
is: true,
then: Joi.string().valid(_.values(ReviewOpportunityTypeEnum)).insensitive(),
then: Joi.string().valid(..._.values(ReviewOpportunityTypeEnum)).insensitive(),
otherwise: Joi.forbidden(),
}),
aiWorkflowId: Joi.when("isMemberReview", {
Expand Down Expand Up @@ -1152,7 +1152,7 @@ searchChallenges.schema = {
projectId: Joi.number().integer().positive(),
forumId: Joi.number().integer(),
legacyId: Joi.number().integer().positive(),
status: Joi.string().valid(_.values(ChallengeStatusEnum)).insensitive(),
status: Joi.string().valid(..._.values(ChallengeStatusEnum)).insensitive(),
group: Joi.string(),
startDateStart: Joi.date(),
startDateEnd: Joi.date(),
Expand All @@ -1176,7 +1176,7 @@ searchChallenges.schema = {
isLightweight: Joi.boolean().default(false),
memberId: Joi.string(),
sortBy: Joi.string().valid(...allowedSortByValues),
sortOrder: Joi.string().valid(["asc", "desc"]),
sortOrder: Joi.string().valid("asc", "desc"),
groups: Joi.array().items(Joi.optionalId()).unique(),
ids: Joi.array().items(Joi.optionalId()).unique().min(1),
isTask: Joi.boolean(),
Expand Down Expand Up @@ -1578,7 +1578,7 @@ createChallenge.schema = {
trackId: Joi.id(),
legacy: Joi.object().keys({
reviewType: Joi.string()
.valid(_.values(ReviewTypeEnum))
.valid(..._.values(ReviewTypeEnum))
.insensitive()
.default(ReviewTypeEnum.INTERNAL),
confidentialityType: Joi.string().default(config.DEFAULT_CONFIDENTIALITY_TYPE),
Expand Down Expand Up @@ -1650,7 +1650,7 @@ createChallenge.schema = {
Joi.object().keys({
id: Joi.optionalId(),
name: Joi.string().required(),
type: Joi.string().required().valid(_.values(DiscussionTypeEnum)),
type: Joi.string().required().valid(..._.values(DiscussionTypeEnum)),
provider: Joi.string().required(),
url: Joi.string(),
options: Joi.array().items(Joi.object()),
Expand All @@ -1670,7 +1670,7 @@ createChallenge.schema = {
phaseId: Joi.id().required(),
type: Joi.when("isMemberReview", {
is: true,
then: Joi.string().valid(_.values(ReviewOpportunityTypeEnum)).insensitive(),
then: Joi.string().valid(..._.values(ReviewOpportunityTypeEnum)).insensitive(),
otherwise: Joi.forbidden(),
}),
aiWorkflowId: Joi.when("isMemberReview", {
Expand All @@ -1685,7 +1685,7 @@ createChallenge.schema = {
),
prizeSets: Joi.array().items(
Joi.object().keys({
type: Joi.string().valid(_.values(PrizeSetTypeEnum)).required(),
type: Joi.string().valid(..._.values(PrizeSetTypeEnum)).required(),
description: Joi.string(),
prizes: Joi.array()
.items(
Expand All @@ -1708,12 +1708,12 @@ createChallenge.schema = {
})
.optional(),
startDate: Joi.date().iso(),
status: Joi.string().valid([
status: Joi.string().valid(
ChallengeStatusEnum.ACTIVE,
ChallengeStatusEnum.NEW,
ChallengeStatusEnum.DRAFT,
ChallengeStatusEnum.APPROVED,
]),
ChallengeStatusEnum.APPROVED
),
groups: Joi.array().items(Joi.optionalId()).unique(),
// gitRepoURLs: Joi.array().items(Joi.string().uri()),
terms: Joi.array().items(
Expand Down Expand Up @@ -2751,7 +2751,7 @@ updateChallenge.schema = {
track: Joi.string(),
subTrack: Joi.string(),
reviewType: Joi.string()
.valid(_.values(ReviewTypeEnum))
.valid(..._.values(ReviewTypeEnum))
.insensitive()
.default(ReviewTypeEnum.INTERNAL),
confidentialityType: Joi.string()
Expand Down Expand Up @@ -2843,7 +2843,7 @@ updateChallenge.schema = {
Joi.object().keys({
id: Joi.optionalId(),
name: Joi.string().required(),
type: Joi.string().required().valid(_.values(DiscussionTypeEnum)),
type: Joi.string().required().valid(..._.values(DiscussionTypeEnum)),
provider: Joi.string().required(),
url: Joi.string(),
options: Joi.array().items(Joi.object()),
Expand All @@ -2865,7 +2865,7 @@ updateChallenge.schema = {
phaseId: Joi.id().required(),
type: Joi.when("isMemberReview", {
is: true,
then: Joi.string().valid(_.values(ReviewOpportunityTypeEnum)).insensitive(),
then: Joi.string().valid(..._.values(ReviewOpportunityTypeEnum)).insensitive(),
otherwise: Joi.forbidden(),
}),
aiWorkflowId: Joi.when("isMemberReview", {
Expand All @@ -2884,7 +2884,7 @@ updateChallenge.schema = {
.items(
Joi.object()
.keys({
type: Joi.string().valid(_.values(PrizeSetTypeEnum)).required(),
type: Joi.string().valid(..._.values(PrizeSetTypeEnum)).required(),
description: Joi.string(),
prizes: Joi.array()
.items(
Expand All @@ -2908,7 +2908,7 @@ updateChallenge.schema = {
allowedRegistrants: Joi.array().items(Joi.string().trim().lowercase()).optional(),
})
.optional(),
status: Joi.string().valid(_.values(ChallengeStatusEnum)).insensitive(),
status: Joi.string().valid(..._.values(ChallengeStatusEnum)).insensitive(),
attachments: Joi.array().items(
Joi.object().keys({
id: Joi.id(),
Expand All @@ -2928,7 +2928,7 @@ updateChallenge.schema = {
userId: Joi.number().integer().positive().required(),
handle: Joi.string().required(),
placement: Joi.number().integer().positive().required(),
type: Joi.string().valid(_.values(PrizeSetTypeEnum)),
type: Joi.string().valid(..._.values(PrizeSetTypeEnum)),
})
.unknown(true)
)
Expand All @@ -2940,7 +2940,7 @@ updateChallenge.schema = {
userId: Joi.number().integer().positive().required(),
handle: Joi.string().required(),
placement: Joi.number().integer().positive().required(),
type: Joi.string().valid(_.values(PrizeSetTypeEnum)),
type: Joi.string().valid(..._.values(PrizeSetTypeEnum)),
})
.unknown(true)
)
Expand Down
8 changes: 4 additions & 4 deletions src/services/ChallengeTrackService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ searchChallengeTracks.schema = {
isActive: Joi.boolean(),
abbreviation: Joi.string(),
legacyId: Joi.number().integer().positive(),
track: Joi.string().valid(_.values(ChallengeTrackEnum)),
track: Joi.string().valid(..._.values(ChallengeTrackEnum)),
Copy link

@github-actions github-actions bot Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[⚠️ correctness]
The change from _.values(ChallengeTrackEnum) to ..._.values(ChallengeTrackEnum) is technically correct and improves the code by spreading the array values directly into the valid method. However, ensure that ChallengeTrackEnum is always an object with enumerable properties, as spreading will fail if it's not.

}),
};

Expand Down Expand Up @@ -140,7 +140,7 @@ createChallengeTrack.schema = {
isActive: Joi.boolean().required(),
abbreviation: Joi.string().required(),
legacyId: Joi.number().integer().positive(),
track: Joi.string().valid(_.values(ChallengeTrackEnum)),
track: Joi.string().valid(..._.values(ChallengeTrackEnum)),
Copy link

@github-actions github-actions bot Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[⚠️ correctness]
The use of the spread operator here assumes that ChallengeTrackEnum is an object with enumerable properties. If ChallengeTrackEnum can be null or undefined, this will throw an error. Consider adding a check or default value to prevent runtime errors.

})
.required(),
};
Expand Down Expand Up @@ -209,7 +209,7 @@ fullyUpdateChallengeTrack.schema = {
isActive: Joi.boolean().required(),
abbreviation: Joi.string().required(),
legacyId: Joi.number().integer().positive(),
track: Joi.string().valid(_.values(ChallengeTrackEnum)),
track: Joi.string().valid(..._.values(ChallengeTrackEnum)),
Copy link

@github-actions github-actions bot Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[⚠️ correctness]
Ensure that ChallengeTrackEnum is always defined and is an object with enumerable properties. The spread operator will throw an error if ChallengeTrackEnum is null or undefined.

})
.required(),
};
Expand Down Expand Up @@ -251,7 +251,7 @@ partiallyUpdateChallengeTrack.schema = {
isActive: Joi.boolean(),
abbreviation: Joi.string(),
legacyId: Joi.number().integer().positive(),
track: Joi.string().valid(_.values(ChallengeTrackEnum)),
track: Joi.string().valid(..._.values(ChallengeTrackEnum)),
Copy link

@github-actions github-actions bot Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[⚠️ correctness]
Using the spread operator assumes ChallengeTrackEnum is always an object with enumerable properties. If there's a possibility of it being null or undefined, consider adding a safeguard to prevent potential runtime errors.

})
.required(),
};
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/attachment.api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require('../../app-bootstrap')
const fs = require('fs')
const path = require('path')
const config = require('config')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const chai = require('chai')
const chaiHttp = require('chai-http')
const app = require('../../app')
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/audit.log.api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
require('../../app-bootstrap')
const _ = require('lodash')
const config = require('config')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const chai = require('chai')
const chaiHttp = require('chai-http')
const app = require('../../app')
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/challenge.api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
require('../../app-bootstrap')
const _ = require('lodash')
const config = require('config')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const fs = require('fs')
const path = require('path')
const chai = require('chai')
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/challenge.phase.api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

require('../../app-bootstrap')
const config = require('config')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const chai = require('chai')
const chaiHttp = require('chai-http')
const app = require('../../app')
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/challenge.type.api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

require('../../app-bootstrap')
const config = require('config')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const chai = require('chai')
const chaiHttp = require('chai-http')
const app = require('../../app')
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/challenge.type.timeline.template.api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

require('../../app-bootstrap')
const config = require('config')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const chai = require('chai')
const chaiHttp = require('chai-http')
const app = require('../../app')
Expand Down
Loading