From 910ac42cf1dfbbb753084b7caabe7de29d30a169 Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Thu, 10 Feb 2022 16:04:42 +0200 Subject: [PATCH 1/3] add logging --- src/services/ProcessorService.js | 2 +- src/services/selfServiceReviewerService.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/services/ProcessorService.js b/src/services/ProcessorService.js index c596780..b86f283 100644 --- a/src/services/ProcessorService.js +++ b/src/services/ProcessorService.js @@ -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. diff --git a/src/services/selfServiceReviewerService.js b/src/services/selfServiceReviewerService.js index 5bf3cad..e46cd05 100644 --- a/src/services/selfServiceReviewerService.js +++ b/src/services/selfServiceReviewerService.js @@ -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() From f800822131ae78834e1b29dc38ab3fa76d6da455 Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Thu, 10 Feb 2022 16:16:24 +0200 Subject: [PATCH 2/3] fix issue with ifx queries --- src/services/ProcessorService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/ProcessorService.js b/src/services/ProcessorService.js index b86f283..7a746b2 100644 --- a/src/services/ProcessorService.js +++ b/src/services/ProcessorService.js @@ -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...') } From 83cfe22daf5c4834ec9981300f9ccb3238759453 Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Fri, 11 Feb 2022 12:35:16 +0200 Subject: [PATCH 3/3] force sync phases on self service challenges --- src/services/ProcessorService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/ProcessorService.js b/src/services/ProcessorService.js index 7a746b2..fd78490 100644 --- a/src/services/ProcessorService.js +++ b/src/services/ProcessorService.js @@ -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)) {