fixed calculation

folio-org · Jun 25, 2024 · b51e768 · b51e768
1 parent 99d2775
commit b51e768
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/org/folio/utils/CalculationUtils.java b/src/main/java/org/folio/utils/CalculationUtils.java
@@ -112,7 +112,7 @@ private static Map<String, BigDecimal> calculate(Double dInitialAllocation,
     BigDecimal unavailable = ensureNonNegative(encumbered.add(awaitingPayment).add(expended).subtract(credited));
     BigDecimal totalFunding = allocated.add(netTransfers);
     BigDecimal cashBalance = totalFunding.subtract(expended).add(credited);
-    BigDecimal available = totalFunding.subtract(encumbered.subtract(awaitingPayment).add(expended).subtract(credited));
+    BigDecimal available = totalFunding.subtract(encumbered.add(awaitingPayment).add(expended).subtract(credited));
     BigDecimal overExpended = expended.subtract(credited).add(awaitingPayment).subtract(totalFunding.max(BigDecimal.ZERO)).max(BigDecimal.ZERO);
     BigDecimal overCommitted = unavailable.subtract(totalFunding.max(BigDecimal.ZERO)).max(BigDecimal.ZERO);
     BigDecimal overEncumbered = overCommitted.subtract(overExpended);

diff --git a/src/main/java/org/folio/utils/MoneyUtils.java b/src/main/java/org/folio/utils/MoneyUtils.java
@@ -73,6 +73,6 @@ public static Money ensureNonNegative(Money amount, String currency) {
   }
 
   public static BigDecimal ensureNonNegative(BigDecimal amount) {
-    return amount.compareTo(BigDecimal.ZERO) > 0 ? amount : BigDecimal.ZERO;
+    return amount.max(BigDecimal.ZERO);
   }
 }