From 91a828c66a398461853b43d734ccdb23a5b93514 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Tue, 14 Nov 2023 11:32:19 +0600 Subject: [PATCH 1/4] fix: ensure cents are set in request Signed-off-by: Rakib Ansary --- .circleci/config.yml | 2 +- src/common/challenge-helper.js | 5 ++++- src/services/ChallengeService.js | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 17dcd01d..cc1a3e94 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,7 +90,7 @@ workflows: branches: only: - dev - - PLAT-3491 + - hotfix/budget-update - "build-qa": context: org-global diff --git a/src/common/challenge-helper.js b/src/common/challenge-helper.js index 4bca0223..8e89dec8 100644 --- a/src/common/challenge-helper.js +++ b/src/common/challenge-helper.js @@ -356,9 +356,12 @@ class ChallengeHelper { } if (data.prizeSets != null) { + this.convertPrizeSetValuesToCents(data.prizeSets) + console.log('Converted prizeSets to cents', data.prizeSets) data.prizeSetUpdate = { - prizeSets: data.prizeSets, + prizeSets: [...data.prizeSets], }; + console.log('prizeSetUpdate', data.prizeSetUpdate) delete data.prizeSets; } diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js index f616346a..f0f7b110 100644 --- a/src/services/ChallengeService.js +++ b/src/services/ChallengeService.js @@ -1890,9 +1890,6 @@ async function updateChallenge(currentUser, challengeId, data) { grpcMetadata.set("userId", currentUser.userId); grpcMetadata.set("token", await getM2MToken()); - if (updateInput.prizeSetUpdate != null) { - convertPrizeSetValuesToCents(updateInput.prizeSetUpdate.prizeSets); - } await challengeDomain.update( { filterCriteria: getScanCriteria({ id: challengeId }), From df4e5ace9963bed6e406a7005e37175c6bd8b825 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Tue, 14 Nov 2023 11:45:52 +0600 Subject: [PATCH 2/4] fix: reference Signed-off-by: Rakib Ansary --- src/common/challenge-helper.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/common/challenge-helper.js b/src/common/challenge-helper.js index 8e89dec8..05bf2365 100644 --- a/src/common/challenge-helper.js +++ b/src/common/challenge-helper.js @@ -356,7 +356,7 @@ class ChallengeHelper { } if (data.prizeSets != null) { - this.convertPrizeSetValuesToCents(data.prizeSets) + ChallengeHelper.convertPSValuesToCent(data.prizeSets) console.log('Converted prizeSets to cents', data.prizeSets) data.prizeSetUpdate = { prizeSets: [...data.prizeSets], @@ -468,11 +468,7 @@ class ChallengeHelper { } } - convertToISOString(startDate) { - return ChallengeHelper.convertDateToISOString(startDate); - } - - convertPrizeSetValuesToCents(prizeSets) { + static convertPSValuesToCents(prizeSets){ prizeSets.forEach((prizeSet) => { prizeSet.prizes.forEach((prize) => { prize.amountInCents = new Decimal(prize.value).mul(100).toNumber(); @@ -481,6 +477,14 @@ class ChallengeHelper { }); } + convertToISOString(startDate) { + return ChallengeHelper.convertDateToISOString(startDate); + } + + static convertPrizeSetValuesToCents(prizeSets) { + return ChallengeHelper.convertPSValuesToCents(prizeSets); + } + convertPrizeSetValuesToDollars(prizeSets, overview) { prizeSets.forEach((prizeSet) => { prizeSet.prizes.forEach((prize) => { From 3d4383afe387a63eaa204c8f315ca873a71289e4 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Tue, 14 Nov 2023 11:53:25 +0600 Subject: [PATCH 3/4] fix: typo Signed-off-by: Rakib Ansary --- src/common/challenge-helper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/challenge-helper.js b/src/common/challenge-helper.js index 05bf2365..9985425e 100644 --- a/src/common/challenge-helper.js +++ b/src/common/challenge-helper.js @@ -356,7 +356,7 @@ class ChallengeHelper { } if (data.prizeSets != null) { - ChallengeHelper.convertPSValuesToCent(data.prizeSets) + ChallengeHelper.convertPSValuesToCents(data.prizeSets) console.log('Converted prizeSets to cents', data.prizeSets) data.prizeSetUpdate = { prizeSets: [...data.prizeSets], From 66a1872e3b5766078267f1ffd2e3bede0971d865 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Tue, 14 Nov 2023 12:01:47 +0600 Subject: [PATCH 4/4] fix: reference Signed-off-by: Rakib Ansary --- src/common/challenge-helper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/challenge-helper.js b/src/common/challenge-helper.js index 9985425e..c7402ce9 100644 --- a/src/common/challenge-helper.js +++ b/src/common/challenge-helper.js @@ -481,7 +481,7 @@ class ChallengeHelper { return ChallengeHelper.convertDateToISOString(startDate); } - static convertPrizeSetValuesToCents(prizeSets) { + convertPrizeSetValuesToCents(prizeSets) { return ChallengeHelper.convertPSValuesToCents(prizeSets); }