Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
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
2 changes: 1 addition & 1 deletion app-routes.js
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
2 changes: 1 addition & 1 deletion mock-api/app.js
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
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
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
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
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
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
2 changes: 1 addition & 1 deletion src/services/ChallengeService.js
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
2 changes: 1 addition & 1 deletion test/e2e/attachment.api.test.js
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
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
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
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
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
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/phase.api.test.js
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/timeline.template.api.test.js
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/testHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* This file defines common helper methods used for tests
*/
const _ = require('lodash')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const { ChallengeStatusEnum } = require('../src/common/prisma')
const prisma = require('../src/common/prisma').getClient()
const jwt = require('jsonwebtoken')
Expand Down
2 changes: 1 addition & 1 deletion test/unit/AttachmentService.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
require('../../app-bootstrap')
const fs = require('fs')
const path = require('path')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const chai = require('chai')
const awsMock = require('aws-sdk-mock')
const service = require('../../src/services/AttachmentService')
Expand Down
2 changes: 1 addition & 1 deletion test/unit/AuditLogService.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

require('../../app-bootstrap')
const _ = require('lodash')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const chai = require('chai')
const service = require('../../src/services/AuditLogService')
const prisma = require('../../src/common/prisma').getClient()
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ChallengePhaseService.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require('../../app-bootstrap')
const chai = require('chai')
const config = require('config')
const { Prisma } = require('@prisma/client')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const { getReviewClient } = require('../../src/common/review-prisma')
const prisma = require('../../src/common/prisma').getClient()
const service = require('../../src/services/ChallengePhaseService')
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ChallengeService.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if (!process.env.REVIEW_DB_URL && process.env.DATABASE_URL) {
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 constants = require('../../app-constants')
const service = require('../../src/services/ChallengeService')
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ChallengeTypeService.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

require('../../app-bootstrap')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const chai = require('chai')
const service = require('../../src/services/ChallengeTypeService')

Expand Down
2 changes: 1 addition & 1 deletion test/unit/PhaseService.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

require('../../app-bootstrap')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const chai = require('chai')
const service = require('../../src/services/PhaseService')

Expand Down
2 changes: 1 addition & 1 deletion test/unit/TimelineTemplateService.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

require('../../app-bootstrap')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid');
const chai = require('chai')
const service = require('../../src/services/TimelineTemplateService')
const prisma = require('../../src/common/prisma').getClient()
Expand Down