[fineract] branch develop updated: FINERACT-1755:withdrawal fee is not considered for interest calculation

[arnold]

This is an automated email from the ASF dual-hosted git repository.

arnold pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new 17e5eae7a FINERACT-1755:withdrawal fee is not considered for interest 
calculation
17e5eae7a is described below

commit 17e5eae7a326d96b098bed7b79b691734d7a8341
Author: logoutdhaval <dha...@fynarfin.io>
AuthorDate: Fri Sep 30 19:06:54 2022 +0530

    FINERACT-1755:withdrawal fee is not considered for interest calculation
---
 .../portfolio/savings/data/SavingsAccountTransactionEnumData.java   | 6 +++---
 .../integrationtests/SavingsInterestPostingJobIntegrationTest.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountTransactionEnumData.java
 
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountTransactionEnumData.java
index a73a6ebdd..49707c02a 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountTransactionEnumData.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountTransactionEnumData.java
@@ -89,15 +89,15 @@ public class SavingsAccountTransactionEnumData implements 
Serializable {
     }
 
     public boolean isAnnualFee() {
-        return 
this.value.equals(SavingsAccountTransactionType.ANNUAL_FEE.getValue().toString());
+        return 
Long.valueOf(SavingsAccountTransactionType.ANNUAL_FEE.getValue()).equals(this.id);
     }
 
     public boolean isPayCharge() {
-        return 
this.value.equals(SavingsAccountTransactionType.PAY_CHARGE.getValue().toString());
+        return 
Long.valueOf(SavingsAccountTransactionType.PAY_CHARGE.getValue()).equals(this.id);
     }
 
     public boolean isWithdrawalFee() {
-        return 
this.value.equals(SavingsAccountTransactionType.WITHDRAWAL_FEE.getValue().toString());
+        return 
Long.valueOf(SavingsAccountTransactionType.WITHDRAWAL_FEE.getValue()).equals(this.id);
     }
 
 }
diff --git 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsInterestPostingJobIntegrationTest.java
 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsInterestPostingJobIntegrationTest.java
index 3bd89a308..fce67b8bb 100644
--- 
a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsInterestPostingJobIntegrationTest.java
+++ 
b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsInterestPostingJobIntegrationTest.java
@@ -215,7 +215,7 @@ public class SavingsInterestPostingJobIntegrationTest {
         for (Map.Entry<String, Object> entry : 
interestPostingTransaction.entrySet()) {
             LOG.info("{} - {}", entry.getKey(), entry.getValue().toString());
         }
-        assertEquals("800.4932", 
interestPostingTransaction.get("runningBalance").toString(), "Equality check 
for Balance");
+        assertEquals("800.4384", 
interestPostingTransaction.get("runningBalance").toString(), "Equality check 
for Balance");
     }
 
     private Integer createSavingsAccountDailyPosting(final Integer clientID, 
final String startDate) {