Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

[Next Release] PROD 2252 and PLAT 1128 #89

Merged
merged 6 commits into from
Jul 5, 2022
Merged

[Next Release] PROD 2252 and PLAT 1128 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c14f585
fix reviewer number query
eisbilir Jun 26, 2022
b858536
Merge pull request #86 from eisbilir/fix-reviewer-number
ThomasKranitsas Jul 1, 2022
991a756
encode tags
LieutenantRoger Jul 2, 2022
0266cbb
deploying encode tag fix
LieutenantRoger Jul 2, 2022
ea41a33
recover ci
LieutenantRoger Jul 5, 2022
393e396
Merge pull request #88 from topcoder-platform/PLAT_1128
ThomasKranitsas Jul 5, 2022
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
2 changes: 1 addition & 1 deletion src/services/ProcessorService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ async function getLegacyTrackInformation (trackId, typeId, tags, m2mToken) {
`typeId=${typeId}`
]
_.each((tags || []), (tag) => {
query.push(`tags[]=${tag}`)
query.push(`tags[]=${encodeURIComponent(tag)}`)
})
try {
const res = await helper.getRequest(`${config.V5_CHALLENGE_MIGRATION_API_URL}/convert-to-v4?${query.join('&')}`, m2mToken)
Expand Down
13 changes: 6 additions & 7 deletions src/services/selfServiceReviewerService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ const util = require('util')
const logger = require('../common/logger')
const helper = require('../common/helper')

const QUERY_GET_ENTRY = 'SELECT parameter FROM phase_criteria WHERE project_phase_id = %d'
const QUERY_GET_ENTRY = 'SELECT parameter FROM phase_criteria WHERE project_phase_id = %d AND phase_criteria_type_id = 6'
const QUERY_CREATE = 'INSERT INTO phase_criteria (project_phase_id, phase_criteria_type_id, parameter, create_user, create_date, modify_user, modify_date) VALUES (?, 6, ?, ?, CURRENT, ?, CURRENT)'
const QUERY_UPDATE = 'UPDATE phase_criteria SET parameter = ?, modify_user = ?, modify_date = CURRENT WHERE project_phase_id = ?'
const QUERY_DELETE = 'DELETE FROM phase_criteria WHERE project_phase_id = ?'
const QUERY_UPDATE = 'UPDATE phase_criteria SET parameter = ?, modify_user = ?, modify_date = CURRENT WHERE project_phase_id = ? AND phase_criteria_type_id = 6'
const QUERY_DELETE = 'DELETE FROM phase_criteria WHERE project_phase_id = ? AND phase_criteria_type_id = 6'

/**
* Prepare Informix statement
Expand Down Expand Up @@ -43,10 +43,9 @@ async function getEntry (phaseId) {
}

/**
* Enable timeline notifications
* Merge number of reviewers
* @param {Number} phaseId the legacy challenge ID
* @param {Number} typeId the type ID
* @param {Any} value the value
* @param {Number=} value the value
* @param {String} createdBy the created by
*/
async function createOrSetNumberOfReviewers (phaseId, value, createdBy) {
Expand All @@ -67,7 +66,7 @@ async function createOrSetNumberOfReviewers (phaseId, value, createdBy) {
}
} else {
const query = await prepare(connection, QUERY_CREATE)
logger.info(`Will delete with values: ${phaseId}, ${value}, ${createdBy}, ${createdBy}`)
logger.info(`Will create with values: ${phaseId}, ${value}, ${createdBy}, ${createdBy}`)
result = await query.executeAsync([phaseId, value, createdBy, createdBy])
}
await connection.commitTransactionAsync()
Expand Down