From 9d98622634c740dfd0aa1eeb0ef8e40086cc1365 Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Mon, 20 Oct 2025 21:23:53 +0200 Subject: [PATCH 01/10] fix: default shouldOpenOpportunity to false --- .circleci/config.yml | 1 + src/services/ChallengeService.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ba478a..64c0915 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -103,6 +103,7 @@ workflows: - feature/top-262-projectid-non-mandatory - TOP-2364 - PM-2097 + - pm-2456 - "build-qa": context: org-global diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index 3a4c78a..4149090 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -287,7 +287,7 @@ async function setDefaultReviewers(currentUser, data) { scorecardId: Joi.string().required(), isMemberReview: Joi.boolean().required(), isAIReviewer: Joi.boolean().default(false), - shouldOpenOpportunity: Joi.boolean().default(true), + shouldOpenOpportunity: Joi.boolean().default(false), memberReviewerCount: Joi.when("isMemberReview", { is: true, then: Joi.number().integer().min(1).required(), From 2f3c97170ec4b9c29ba4a70be996f1af08de30fd Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Mon, 20 Oct 2025 22:33:48 +0200 Subject: [PATCH 02/10] fix: default shouldOpenOpportunity to false --- src/common/prisma-helper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/prisma-helper.js b/src/common/prisma-helper.js index 11b3048..1700b91 100644 --- a/src/common/prisma-helper.js +++ b/src/common/prisma-helper.js @@ -233,7 +233,7 @@ function convertChallengeSchemaToPrisma(currentUser, challenge) { incrementalPayment: _.isNil(r.incrementalPayment) ? null : Number(r.incrementalPayment), aiWorkflowId: r.aiWorkflowId, shouldOpenOpportunity: _.isNil(r.shouldOpenOpportunity) - ? true + ? false : !!r.shouldOpenOpportunity, createdAt: new Date(Date.now() + index), }; From 8ab395984f166a39a3a7c6768ed7115941746083 Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Wed, 22 Oct 2025 02:23:45 +0200 Subject: [PATCH 03/10] debug logs --- src/common/prisma-helper.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/prisma-helper.js b/src/common/prisma-helper.js index 0a3845b..5c53a9f 100644 --- a/src/common/prisma-helper.js +++ b/src/common/prisma-helper.js @@ -221,6 +221,7 @@ function convertChallengeSchemaToPrisma(currentUser, challenge) { if (!_.isNil(challenge.reviewers)) { result.reviewers = { create: _.map(challenge.reviewers, (r, index) => { + console.log(r.shouldOpenOpportunity, 'r.shouldOpenOpportunity') const reviewer = { ...auditFields, scorecardId: String(r.scorecardId), From d15d6aa03137a25611021bf4601daa90e86b1ec7 Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Wed, 22 Oct 2025 17:03:57 +0200 Subject: [PATCH 04/10] fix: removed debug logs --- src/common/prisma-helper.js | 1 + src/services/ChallengeService.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/common/prisma-helper.js b/src/common/prisma-helper.js index 5c53a9f..434d1a6 100644 --- a/src/common/prisma-helper.js +++ b/src/common/prisma-helper.js @@ -67,6 +67,7 @@ function convertChallengePhaseSchema(challenge, result, auditFields) { * @returns prisma model data to create/update challenge */ function convertChallengeSchemaToPrisma(currentUser, challenge) { + console.log(challenge, 'convertChallengeSchemaToPrisma challenge') // used id used in createdBy and updatedBy const userId = _.toString(currentUser.userId); const auditFields = { diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index ffa2e72..3622bad 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -2560,6 +2560,7 @@ async function updateChallenge(currentUser, challengeId, data, options = {}) { }); } + console.log(data, 'data from request') // convert data to prisma models const updateData = prismaHelper.convertChallengeSchemaToPrisma( currentUser, From 0c696eb6d29f36c08bfe816f751125592361465b Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Wed, 22 Oct 2025 17:29:08 +0200 Subject: [PATCH 05/10] fix: removed debug logs --- src/services/ChallengeService.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index 1e243bf..b1240bb 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -2516,7 +2516,7 @@ async function updateChallenge(currentUser, challengeId, data, options = {}) { if (_.isNil(data.phases)) { phasesForUpdate = null; } - + console.log(JSON(data), 'data from request before') // Normalize and validate reviewers' phase references before converting to Prisma input if (!_.isNil(data.reviewers)) { try { @@ -2562,6 +2562,7 @@ async function updateChallenge(currentUser, challengeId, data, options = {}) { } } + console.log(JSON(data), 'data from request after 2') if (!_.isNil(data.reviewers)) { await ensureScorecardChangeDoesNotConflict({ challengeId, @@ -2570,8 +2571,7 @@ async function updateChallenge(currentUser, challengeId, data, options = {}) { originalChallengePhases, }); } - - console.log(data, 'data from request') + console.log(JSON(data), 'data from request after 3') // convert data to prisma models const updateData = prismaHelper.convertChallengeSchemaToPrisma( currentUser, From 7efb759652e25b1c5ca7126440cf3efbf6432811 Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Wed, 22 Oct 2025 17:55:10 +0200 Subject: [PATCH 06/10] fix: removed debug logs --- src/services/ChallengeService.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index b1240bb..42015d5 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -2516,7 +2516,7 @@ async function updateChallenge(currentUser, challengeId, data, options = {}) { if (_.isNil(data.phases)) { phasesForUpdate = null; } - console.log(JSON(data), 'data from request before') + console.log(JSON.stringify(data), 'data from request before') // Normalize and validate reviewers' phase references before converting to Prisma input if (!_.isNil(data.reviewers)) { try { @@ -2562,7 +2562,7 @@ async function updateChallenge(currentUser, challengeId, data, options = {}) { } } - console.log(JSON(data), 'data from request after 2') + console.log(JSON.stringify(data), 'data from request after 2') if (!_.isNil(data.reviewers)) { await ensureScorecardChangeDoesNotConflict({ challengeId, @@ -2571,7 +2571,7 @@ async function updateChallenge(currentUser, challengeId, data, options = {}) { originalChallengePhases, }); } - console.log(JSON(data), 'data from request after 3') + console.log(JSON.stringify(data), 'data from request after 3') // convert data to prisma models const updateData = prismaHelper.convertChallengeSchemaToPrisma( currentUser, From d673dfb5010f32d6dcf41cc167cda46966cf624d Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Thu, 23 Oct 2025 00:01:02 +0200 Subject: [PATCH 07/10] fix: include shouldOpenOpportunity as valid field --- src/services/ChallengeService.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index 42015d5..121d809 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -3228,6 +3228,7 @@ function sanitizeChallenge(challenge) { "fixedAmount", "baseCoefficient", "incrementalCoefficient", + "shouldOpenOpportunity", "type", "aiWorkflowId", ]) From 43e1d43aed61265c68ebb084e9748d1f34609de5 Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Thu, 23 Oct 2025 00:16:19 +0200 Subject: [PATCH 08/10] fix: include shouldOpenOpportunity as valid field --- src/common/prisma-helper.js | 1 - src/services/ChallengeService.js | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/common/prisma-helper.js b/src/common/prisma-helper.js index 434d1a6..5c53a9f 100644 --- a/src/common/prisma-helper.js +++ b/src/common/prisma-helper.js @@ -67,7 +67,6 @@ function convertChallengePhaseSchema(challenge, result, auditFields) { * @returns prisma model data to create/update challenge */ function convertChallengeSchemaToPrisma(currentUser, challenge) { - console.log(challenge, 'convertChallengeSchemaToPrisma challenge') // used id used in createdBy and updatedBy const userId = _.toString(currentUser.userId); const auditFields = { diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index 121d809..f97648a 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -2516,7 +2516,7 @@ async function updateChallenge(currentUser, challengeId, data, options = {}) { if (_.isNil(data.phases)) { phasesForUpdate = null; } - console.log(JSON.stringify(data), 'data from request before') + // Normalize and validate reviewers' phase references before converting to Prisma input if (!_.isNil(data.reviewers)) { try { @@ -2562,7 +2562,6 @@ async function updateChallenge(currentUser, challengeId, data, options = {}) { } } - console.log(JSON.stringify(data), 'data from request after 2') if (!_.isNil(data.reviewers)) { await ensureScorecardChangeDoesNotConflict({ challengeId, @@ -2571,7 +2570,7 @@ async function updateChallenge(currentUser, challengeId, data, options = {}) { originalChallengePhases, }); } - console.log(JSON.stringify(data), 'data from request after 3') + // convert data to prisma models const updateData = prismaHelper.convertChallengeSchemaToPrisma( currentUser, From e5e482cac09ca29a883b12f7ec3c047627dac78f Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Thu, 23 Oct 2025 00:39:37 +0200 Subject: [PATCH 09/10] fix: include shouldOpenOpportunity as valid field --- src/common/prisma-helper.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/prisma-helper.js b/src/common/prisma-helper.js index 5c53a9f..0a3845b 100644 --- a/src/common/prisma-helper.js +++ b/src/common/prisma-helper.js @@ -221,7 +221,6 @@ function convertChallengeSchemaToPrisma(currentUser, challenge) { if (!_.isNil(challenge.reviewers)) { result.reviewers = { create: _.map(challenge.reviewers, (r, index) => { - console.log(r.shouldOpenOpportunity, 'r.shouldOpenOpportunity') const reviewer = { ...auditFields, scorecardId: String(r.scorecardId), From b8862ab9e10d84d3ddf5b3691eb6014d3d2a41c5 Mon Sep 17 00:00:00 2001 From: Hentry Martin Date: Thu, 23 Oct 2025 00:44:38 +0200 Subject: [PATCH 10/10] fix: include shouldOpenOpportunity as valid field --- src/common/prisma-helper.js | 2 +- src/services/ChallengeService.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/prisma-helper.js b/src/common/prisma-helper.js index 0a3845b..529712e 100644 --- a/src/common/prisma-helper.js +++ b/src/common/prisma-helper.js @@ -234,7 +234,7 @@ function convertChallengeSchemaToPrisma(currentUser, challenge) { : Number(r.incrementalCoefficient), aiWorkflowId: r.aiWorkflowId, shouldOpenOpportunity: _.isNil(r.shouldOpenOpportunity) - ? false + ? true : !!r.shouldOpenOpportunity, createdAt: new Date(Date.now() + index), }; diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index f97648a..b20450c 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -290,7 +290,7 @@ async function setDefaultReviewers(currentUser, data) { scorecardId: Joi.string().required(), isMemberReview: Joi.boolean().required(), isAIReviewer: Joi.boolean().default(false), - shouldOpenOpportunity: Joi.boolean().default(false), + shouldOpenOpportunity: Joi.boolean().default(true), memberReviewerCount: Joi.when("isMemberReview", { is: true, then: Joi.number().integer().min(1).required(),