[MODORDERS-989] - Rounding for the total estimated price of the order…

… line does not work after the rollover (#825)
folio-org · Jan 25, 2024 · 526b6c6 · 526b6c6
1 parent d250836
commit 526b6c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/org/folio/service/orders/OrderRolloverService.java b/src/main/java/org/folio/service/orders/OrderRolloverService.java
@@ -376,7 +376,9 @@ private CurrencyConversion retrieveCurrencyConversion(String systemCurrency, PoL
   }
 
   private MonetaryAmount amountWithConversion(BigDecimal totalInitialAmountEncumbered, PoLineEncumbrancesHolder holder) {
-    return Money.of(totalInitialAmountEncumbered, holder.getPoLine().getCost().getCurrency()).with(holder.getCurrencyConversion());
+    return Money.of(totalInitialAmountEncumbered, holder.getPoLine().getCost().getCurrency())
+      .with(holder.getCurrencyConversion())
+      .with(Monetary.getDefaultRounding());
   }
 
   private List<PoLineEncumbrancesHolder> buildPoLineEncumbrancesHolders(String  systemCurrency, List<PoLine> poLines,

diff --git a/src/test/java/org/folio/service/orders/OrderRolloverServiceTest.java b/src/test/java/org/folio/service/orders/OrderRolloverServiceTest.java
@@ -528,12 +528,9 @@ void shouldUpdateOrderLinesCostAndEncumbranceLinksWithExchangeRateAndPolCurrency
         assertThat(fundDistributionOngoing2.getEncumbrance(), equalTo(currEncumbrId2));
         assertThat(fundDistributionOngoing3.getEncumbrance(), equalTo(currEncumbrId3));
 
-        assertThat(BigDecimal.valueOf(costOneTime.getPoLineEstimatedPrice()).setScale(2, RoundingMode.HALF_EVEN),
-          equalTo(new BigDecimal("24.99").setScale(2, RoundingMode.HALF_EVEN)));
-        assertThat(BigDecimal.valueOf(costOngoing2.getPoLineEstimatedPrice()).setScale(2, RoundingMode.HALF_EVEN),
-          equalTo(new BigDecimal("24.99").setScale(2, RoundingMode.HALF_EVEN)));
-        assertThat(BigDecimal.valueOf(costOngoing3.getPoLineEstimatedPrice()).setScale(2, RoundingMode.HALF_EVEN),
-          equalTo(new BigDecimal("24.99").setScale(2, RoundingMode.HALF_EVEN)));
+        assertThat(BigDecimal.valueOf(costOneTime.getPoLineEstimatedPrice()), equalTo(new BigDecimal("24.99")));
+        assertThat(BigDecimal.valueOf(costOngoing2.getPoLineEstimatedPrice()), equalTo(new BigDecimal("24.99")));
+        assertThat(BigDecimal.valueOf(costOngoing3.getPoLineEstimatedPrice()), equalTo(new BigDecimal("24.99")));
 
         assertThat(costOneTime.getFyroAdjustmentAmount(), equalTo(0.0d));
         assertThat(costOngoing2.getFyroAdjustmentAmount(), equalTo(0.0d));