From f829de15ea758eda46c07478589108020db59828 Mon Sep 17 00:00:00 2001 From: Aldo Canepa Date: Tue, 3 Oct 2023 23:00:27 +0700 Subject: [PATCH 1/2] Fix precission error --- src/libs/DistanceRequestUtils.js | 4 ++-- tests/unit/DistanceRequestUtilsTest.js | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 tests/unit/DistanceRequestUtilsTest.js diff --git a/src/libs/DistanceRequestUtils.js b/src/libs/DistanceRequestUtils.js index 7744ee3d8bb1..b27b41f2d08d 100644 --- a/src/libs/DistanceRequestUtils.js +++ b/src/libs/DistanceRequestUtils.js @@ -102,12 +102,12 @@ const getDistanceMerchant = (hasRoute, distanceInMeters, unit, rate, currency, t * @param {Number} distance - The distance traveled in meters * @param {'mi' | 'km'} unit - The unit of measurement for the distance * @param {Number} rate - Rate used for calculating the request amount - * @returns {Number} The computed request amount. + * @returns {Number} The computed request amount in "cents" (integer). */ const getDistanceRequestAmount = (distance, unit, rate) => { const convertedDistance = convertDistanceUnit(distance, unit); const roundedDistance = convertedDistance.toFixed(2); - return roundedDistance * rate; + return Math.round(roundedDistance * rate); }; export default {getDefaultMileageRate, getDistanceMerchant, getDistanceRequestAmount}; diff --git a/tests/unit/DistanceRequestUtilsTest.js b/tests/unit/DistanceRequestUtilsTest.js new file mode 100644 index 000000000000..4b657841f2be --- /dev/null +++ b/tests/unit/DistanceRequestUtilsTest.js @@ -0,0 +1,12 @@ +import DistanceRequestUtils from '../../src/libs/DistanceRequestUtils'; + +describe('DistanceRequestUtils', () => { + describe('getDistanceRequestAmount', () => { + test.each([ + [350, 8605.146, 'mi', 65.5], + [561, 8605.146, 'km', 65.1], + ])('Correctly calculates amount %s for %s%s at a rate of %s per unit', (expectedResult, distance, unit, rate) => { + expect(DistanceRequestUtils.getDistanceRequestAmount(distance, unit, rate)).toBe(expectedResult); + }); + }); +}); From 0b8c0ee830a4d9389b693cda1e07cd402a21c353 Mon Sep 17 00:00:00 2001 From: Aldo Canepa Garay <87341702+aldo-expensify@users.noreply.github.com> Date: Wed, 4 Oct 2023 21:13:56 +0700 Subject: [PATCH 2/2] Update comment Co-authored-by: Alex Beaman --- src/libs/DistanceRequestUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/DistanceRequestUtils.js b/src/libs/DistanceRequestUtils.js index b27b41f2d08d..9b875fb82004 100644 --- a/src/libs/DistanceRequestUtils.js +++ b/src/libs/DistanceRequestUtils.js @@ -102,7 +102,7 @@ const getDistanceMerchant = (hasRoute, distanceInMeters, unit, rate, currency, t * @param {Number} distance - The distance traveled in meters * @param {'mi' | 'km'} unit - The unit of measurement for the distance * @param {Number} rate - Rate used for calculating the request amount - * @returns {Number} The computed request amount in "cents" (integer). + * @returns {Number} The computed request amount (rounded) in "cents". */ const getDistanceRequestAmount = (distance, unit, rate) => { const convertedDistance = convertDistanceUnit(distance, unit);