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

Fix legacy syncing issues #70

Merged
merged 3 commits into from
Feb 11, 2022
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 3 additions & 3 deletions src/services/ProcessorService.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ async function syncChallengePhases (legacyId, v5Phases, createdBy, isSelfService
logger.info(`v4 Phase: ${JSON.stringify(phase)}, v5 Equiv: ${JSON.stringify(v5Equivalent)}`)
if (v5Equivalent) {
// Compare duration and status
if (v5Equivalent.duration * 1000 !== phase.duration * 1) {
if (v5Equivalent.duration * 1000 !== phase.duration * 1 || isSelfService) {
// ||
// (v5Equivalent.isOpen && _.toInteger(phase.phase_status_id) === constants.PhaseStatusTypes.Closed) ||
// (!v5Equivalent.isOpen && _.toInteger(phase.phase_status_id) === constants.PhaseStatusTypes.Open)) {
Expand All @@ -110,7 +110,7 @@ async function syncChallengePhases (legacyId, v5Phases, createdBy, isSelfService
}
if (isSelfService && phaseName === 'Review') {
// make sure to set the required reviewers to 2
await createOrSetNumberOfReviewers(phase.project_phase_id, '2', createdBy)
await createOrSetNumberOfReviewers(_.toString(phase.project_phase_id), '2', _.toString(createdBy))
}
}
// TODO: What about iterative reviews? There can be many for the same challenge.
Expand Down Expand Up @@ -709,7 +709,7 @@ async function processMessage (message) {
}

if (!_.get(message.payload, 'task.isTask')) {
await syncChallengePhases(legacyId, message.payload.phases, _.get(message, 'payload.legacy.selfService'), createdByUserId)
await syncChallengePhases(legacyId, message.payload.phases, createdByUserId, _.get(message, 'payload.legacy.selfService'))
} else {
logger.info('Will skip syncing phases as the challenge is a task...')
}
Expand Down
5 changes: 4 additions & 1 deletion src/services/selfServiceReviewerService.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,16 @@ async function createOrSetNumberOfReviewers (phaseId, value, createdBy) {
if (existing) {
if (value) {
const query = await prepare(connection, QUERY_UPDATE)
logger.info(`Will update with values: ${value}, ${createdBy}, ${phaseId}`)
result = await query.executeAsync([value, createdBy, phaseId])
} else {
const query = await prepare(connection, QUERY_DELETE)
result = await query.executeAsync([phaseId, value])
logger.info(`Will delete with values: ${phaseId}`)
result = await query.executeAsync([phaseId])
}
} else {
const query = await prepare(connection, QUERY_CREATE)
logger.info(`Will delete with values: ${phaseId}, ${value}, ${createdBy}, ${createdBy}`)
result = await query.executeAsync([phaseId, value, createdBy, createdBy])
}
await connection.commitTransactionAsync()
Expand Down