FINERACT-2326: Fix rounding of BigDecimal when added to Money object

Author: adamsaghy

fineract-core/src/main/java/org/apache/fineract/organisation/monetary/domain/Money.java

@@ -254,16 +254,14 @@ public Money plus(final BigDecimal amountToAdd, MathContext mc) {
         if (amountToAdd == null || amountToAdd.compareTo(BigDecimal.ZERO) == 0) {
             return this;
         }
-        final BigDecimal newAmount = this.amount.add(amountToAdd);
-        return Money.of(getCurrencyData(), newAmount, mc);
+        return this.plus(Money.of(this.getCurrency(), amountToAdd, mc));
     }
 
     public Money plus(final double amountToAdd) {
         if (amountToAdd == 0) {
             return this;
         }
-        final BigDecimal newAmount = this.amount.add(BigDecimal.valueOf(amountToAdd));
-        return Money.of(getCurrencyData(), newAmount);
+        return this.plus(Money.of(this.getCurrency(), BigDecimal.valueOf(amountToAdd), mc));
     }
 
     public Money minus(final Money moneyToSubtract) {
@@ -298,8 +296,7 @@ public Money add(final BigDecimal amountToAdd, final MathContext mc) {
         if (amountToAdd == null || amountToAdd.compareTo(BigDecimal.ZERO) == 0) {
             return this;
         }
-        final BigDecimal newAmount = this.amount.add(amountToAdd);
-        return Money.of(getCurrencyData(), newAmount, mc);
+        return this.plus(Money.of(this.getCurrency(), amountToAdd, mc));
     }
 
     public Money minus(final BigDecimal amountToSubtract) {
@@ -310,8 +307,7 @@ public Money minus(final BigDecimal amountToSubtract, final MathContext mc) {
         if (amountToSubtract == null || amountToSubtract.compareTo(BigDecimal.ZERO) == 0) {
             return this;
         }
-        final BigDecimal newAmount = this.amount.subtract(amountToSubtract);
-        return Money.of(getCurrencyData(), newAmount, mc);
+        return this.minus(Money.of(this.getCurrency(), amountToSubtract, mc));
     }
 
     private Money checkCurrencyEqual(final Money money) {