From 1679ea9237c7e0f7243827e5547fb089ca9c8121 Mon Sep 17 00:00:00 2001 From: Boris Litvin Date: Thu, 16 May 2024 13:16:31 +0300 Subject: [PATCH] FINERACT-2078: Remove hardcoded use of RoundingMode outside of MoneyHelper --- .../loanaccount/loanschedule/domain/AprCalculator.java | 4 ++-- .../search/service/SearchReadPlatformServiceImpl.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AprCalculator.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AprCalculator.java index 500bdc074..331c0418c 100644 --- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AprCalculator.java +++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AprCalculator.java @@ -19,7 +19,7 @@ package org.apache.fineract.portfolio.loanaccount.loanschedule.domain; import java.math.BigDecimal; -import java.math.RoundingMode; +import org.apache.fineract.organisation.monetary.domain.MoneyHelper; import org.apache.fineract.portfolio.common.domain.PeriodFrequencyType; import org.springframework.stereotype.Component; @@ -44,7 +44,7 @@ public class AprCalculator { break; case WHOLE_TERM: final BigDecimal ratePerPeriod = interestRatePerPeriod.divide(BigDecimal.valueOf(numberOfRepayments * repaymentEvery), 8, - RoundingMode.HALF_UP); + MoneyHelper.getRoundingMode()); switch (repaymentPeriodFrequencyType) { case DAYS: diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java index b22999bd0..5c5a0642c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java @@ -19,7 +19,6 @@ package org.apache.fineract.portfolio.search.service; import java.math.BigDecimal; -import java.math.RoundingMode; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; @@ -29,6 +28,7 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; +import org.apache.fineract.organisation.monetary.domain.MoneyHelper; import org.apache.fineract.organisation.office.data.OfficeData; import org.apache.fineract.organisation.office.service.OfficeReadPlatformService; import org.apache.fineract.portfolio.client.domain.ClientEnumerations; @@ -314,9 +314,9 @@ public class SearchReadPlatformServiceImpl implements SearchReadPlatformService final String loanProductName = rs.getString("productName"); final Integer count = JdbcSupport.getInteger(rs, "count"); final BigDecimal loanOutStanding = JdbcSupport.getBigDecimalDefaultToZeroIfNull(rs, "outstanding").setScale(2, - RoundingMode.HALF_UP); - final Double percentage = JdbcSupport.getBigDecimalDefaultToZeroIfNull(rs, "percentOut").setScale(2, RoundingMode.HALF_UP) - .doubleValue(); + MoneyHelper.getRoundingMode()); + final Double percentage = JdbcSupport.getBigDecimalDefaultToZeroIfNull(rs, "percentOut") + .setScale(2, MoneyHelper.getRoundingMode()).doubleValue(); return AdHocSearchQueryData.matchedResult(officeName, loanProductName, count, loanOutStanding, percentage); }