CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity

[FINERACT-152][FINERACT-153] - Dormant Savings Issues Corrections

Browse Source
This commit is contained in:
Adi Narayana Raju
2016-05-11 13:15:29 +05:30
parent d2b853561f
commit 9353a52013
7 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java
+1 -1
View File
@@ -314,7 +314,7 @@ public class AccountingScenarioIntegrationTest {
ChargesHelper.getSavingsWithdrawalFeeJSON()); ChargesHelper.getSavingsWithdrawalFeeJSON());
Assert.assertNotNull(withdrawalChargeId); Assert.assertNotNull(withdrawalChargeId);
this.savingsAccountHelper.addChargesForSavings(savingsID, withdrawalChargeId); this.savingsAccountHelper.addChargesForSavings(savingsID, withdrawalChargeId, false);
ArrayList<HashMap> chargesPendingState = this.savingsAccountHelper.getSavingsCharges(savingsID); ArrayList<HashMap> chargesPendingState = this.savingsAccountHelper.getSavingsCharges(savingsID);
Assert.assertEquals(1, chargesPendingState.size()); Assert.assertEquals(1, chargesPendingState.size());
HashMap savingsChargeForPay = chargesPendingState.get(0); HashMap savingsChargeForPay = chargesPendingState.get(0);
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java
+6 -6
View File
@@ -238,7 +238,7 @@ public class ClientSavingsIntegrationTest {
ChargesHelper.getSavingsActivationFeeJSON()); ChargesHelper.getSavingsActivationFeeJSON());
Assert.assertNotNull(savingsActivationChargeId); Assert.assertNotNull(savingsActivationChargeId);
this.savingsAccountHelper.addChargesForSavings(savingsId, savingsActivationChargeId); this.savingsAccountHelper.addChargesForSavings(savingsId, savingsActivationChargeId, true);
savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId); savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId);
SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap); SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap);
@@ -521,7 +521,7 @@ public class ClientSavingsIntegrationTest {
ChargesHelper.getSavingsWithdrawalFeeJSON()); ChargesHelper.getSavingsWithdrawalFeeJSON());
Assert.assertNotNull(withdrawalChargeId); Assert.assertNotNull(withdrawalChargeId);
this.savingsAccountHelper.addChargesForSavings(savingsId, withdrawalChargeId); this.savingsAccountHelper.addChargesForSavings(savingsId, withdrawalChargeId, false);
ArrayList<HashMap> chargesPendingState = this.savingsAccountHelper.getSavingsCharges(savingsId); ArrayList<HashMap> chargesPendingState = this.savingsAccountHelper.getSavingsCharges(savingsId);
Assert.assertEquals(1, chargesPendingState.size()); Assert.assertEquals(1, chargesPendingState.size());
@@ -547,7 +547,7 @@ public class ClientSavingsIntegrationTest {
ArrayList<HashMap> charges = this.savingsAccountHelper.getSavingsCharges(savingsId); ArrayList<HashMap> charges = this.savingsAccountHelper.getSavingsCharges(savingsId);
Assert.assertTrue(charges == null || charges.size() == 0); Assert.assertTrue(charges == null || charges.size() == 0);
this.savingsAccountHelper.addChargesForSavings(savingsId, chargeId); this.savingsAccountHelper.addChargesForSavings(savingsId, chargeId, true);
charges = this.savingsAccountHelper.getSavingsCharges(savingsId); charges = this.savingsAccountHelper.getSavingsCharges(savingsId);
Assert.assertEquals(1, charges.size()); Assert.assertEquals(1, charges.size());
@@ -592,7 +592,7 @@ public class ClientSavingsIntegrationTest {
ChargesHelper.getSavingsMonthlyFeeJSON()); ChargesHelper.getSavingsMonthlyFeeJSON());
Assert.assertNotNull(monthlyFeechargeId); Assert.assertNotNull(monthlyFeechargeId);
this.savingsAccountHelper.addChargesForSavings(savingsId, monthlyFeechargeId); this.savingsAccountHelper.addChargesForSavings(savingsId, monthlyFeechargeId, true);
charges = this.savingsAccountHelper.getSavingsCharges(savingsId); charges = this.savingsAccountHelper.getSavingsCharges(savingsId);
Assert.assertEquals(2, charges.size()); Assert.assertEquals(2, charges.size());
@@ -618,7 +618,7 @@ public class ClientSavingsIntegrationTest {
ChargesHelper.getSavingsWeeklyFeeJSON()); ChargesHelper.getSavingsWeeklyFeeJSON());
Assert.assertNotNull(weeklyFeeId); Assert.assertNotNull(weeklyFeeId);
this.savingsAccountHelper.addChargesForSavings(savingsId, weeklyFeeId); this.savingsAccountHelper.addChargesForSavings(savingsId, weeklyFeeId, true);
charges = this.savingsAccountHelper.getSavingsCharges(savingsId); charges = this.savingsAccountHelper.getSavingsCharges(savingsId);
Assert.assertEquals(3, charges.size()); Assert.assertEquals(3, charges.size());
@@ -924,7 +924,7 @@ public class ClientSavingsIntegrationTest {
ACCOUNT_TYPE_INDIVIDUAL); ACCOUNT_TYPE_INDIVIDUAL);
Assert.assertTrue(modifications.containsKey("submittedOnDate")); Assert.assertTrue(modifications.containsKey("submittedOnDate"));
this.savingsAccountHelper.addChargesForSavings(savingsId, savingsChargeId); this.savingsAccountHelper.addChargesForSavings(savingsId, savingsChargeId, false);
HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId); HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId);
SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap); SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupSavingsIntegrationTest.java
+4 -4
View File
@@ -439,7 +439,7 @@ public class GroupSavingsIntegrationTest {
ChargesHelper.getSavingsWithdrawalFeeJSON()); ChargesHelper.getSavingsWithdrawalFeeJSON());
Assert.assertNotNull(withdrawalChargeId); Assert.assertNotNull(withdrawalChargeId);
this.savingsAccountHelper.addChargesForSavings(savingsId, withdrawalChargeId); this.savingsAccountHelper.addChargesForSavings(savingsId, withdrawalChargeId, false);
ArrayList<HashMap> chargesPendingState = this.savingsAccountHelper.getSavingsCharges(savingsId); ArrayList<HashMap> chargesPendingState = this.savingsAccountHelper.getSavingsCharges(savingsId);
Assert.assertEquals(1, chargesPendingState.size()); Assert.assertEquals(1, chargesPendingState.size());
@@ -465,7 +465,7 @@ public class GroupSavingsIntegrationTest {
ArrayList<HashMap> charges = this.savingsAccountHelper.getSavingsCharges(savingsId); ArrayList<HashMap> charges = this.savingsAccountHelper.getSavingsCharges(savingsId);
Assert.assertTrue(charges == null || charges.size() == 0); Assert.assertTrue(charges == null || charges.size() == 0);
this.savingsAccountHelper.addChargesForSavings(savingsId, chargeId); this.savingsAccountHelper.addChargesForSavings(savingsId, chargeId, true);
charges = this.savingsAccountHelper.getSavingsCharges(savingsId); charges = this.savingsAccountHelper.getSavingsCharges(savingsId);
Assert.assertEquals(1, charges.size()); Assert.assertEquals(1, charges.size());
@@ -486,7 +486,7 @@ public class GroupSavingsIntegrationTest {
ChargesHelper.getSavingsMonthlyFeeJSON()); ChargesHelper.getSavingsMonthlyFeeJSON());
Assert.assertNotNull(monthlyFeechargeId); Assert.assertNotNull(monthlyFeechargeId);
this.savingsAccountHelper.addChargesForSavings(savingsId, monthlyFeechargeId); this.savingsAccountHelper.addChargesForSavings(savingsId, monthlyFeechargeId, true);
charges = this.savingsAccountHelper.getSavingsCharges(savingsId); charges = this.savingsAccountHelper.getSavingsCharges(savingsId);
Assert.assertEquals(2, charges.size()); Assert.assertEquals(2, charges.size());
@@ -504,7 +504,7 @@ public class GroupSavingsIntegrationTest {
final Integer weeklyFeeId = ChargesHelper.createCharges(this.requestSpec, this.responseSpec, ChargesHelper.getSavingsWeeklyFeeJSON()); final Integer weeklyFeeId = ChargesHelper.createCharges(this.requestSpec, this.responseSpec, ChargesHelper.getSavingsWeeklyFeeJSON());
Assert.assertNotNull(weeklyFeeId); Assert.assertNotNull(weeklyFeeId);
this.savingsAccountHelper.addChargesForSavings(savingsId, weeklyFeeId); this.savingsAccountHelper.addChargesForSavings(savingsId, weeklyFeeId, true);
charges = this.savingsAccountHelper.getSavingsCharges(savingsId); charges = this.savingsAccountHelper.getSavingsCharges(savingsId);
Assert.assertEquals(3, charges.size()); Assert.assertEquals(3, charges.size());
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java
+2 -2
View File
@@ -126,7 +126,7 @@ public class SchedulerJobsTestResults {
ChargesHelper.getSavingsAnnualFeeJSON()); ChargesHelper.getSavingsAnnualFeeJSON());
Assert.assertNotNull(annualFeeChargeId); Assert.assertNotNull(annualFeeChargeId);
this.savingsAccountHelper.addChargesForSavings(savingsId, annualFeeChargeId); this.savingsAccountHelper.addChargesForSavings(savingsId, annualFeeChargeId, true);
ArrayList<HashMap> chargesPendingState = this.savingsAccountHelper.getSavingsCharges(savingsId); ArrayList<HashMap> chargesPendingState = this.savingsAccountHelper.getSavingsCharges(savingsId);
Assert.assertEquals(1, chargesPendingState.size()); Assert.assertEquals(1, chargesPendingState.size());
@@ -347,7 +347,7 @@ public class SchedulerJobsTestResults {
ChargesHelper.getSavingsSpecifiedDueDateJSON()); ChargesHelper.getSavingsSpecifiedDueDateJSON());
Assert.assertNotNull(specifiedDueDateChargeId); Assert.assertNotNull(specifiedDueDateChargeId);
this.savingsAccountHelper.addChargesForSavings(savingsId, specifiedDueDateChargeId); this.savingsAccountHelper.addChargesForSavings(savingsId, specifiedDueDateChargeId, true);
ArrayList<HashMap> chargesPendingState = this.savingsAccountHelper.getSavingsCharges(savingsId); ArrayList<HashMap> chargesPendingState = this.savingsAccountHelper.getSavingsCharges(savingsId);
Assert.assertEquals(1, chargesPendingState.size()); Assert.assertEquals(1, chargesPendingState.size());
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java
+6 -4
View File
@@ -196,10 +196,10 @@ public class SavingsAccountHelper {
getCalculatedInterestForSavingsApplicationAsJSON(), ""); getCalculatedInterestForSavingsApplicationAsJSON(), "");
} }
public Integer addChargesForSavings(final Integer savingsId, final Integer chargeId) { public Integer addChargesForSavings(final Integer savingsId, final Integer chargeId, boolean addDueDate) {
System.out.println("--------------------------------- ADD CHARGES FOR SAVINGS --------------------------------"); System.out.println("--------------------------------- ADD CHARGES FOR SAVINGS --------------------------------");
return (Integer) performSavingActions(SAVINGS_ACCOUNT_URL + "/" + savingsId + "/charges?" + Utils.TENANT_IDENTIFIER, return (Integer) performSavingActions(SAVINGS_ACCOUNT_URL + "/" + savingsId + "/charges?" + Utils.TENANT_IDENTIFIER,
getPeriodChargeRequestJSON(chargeId), CommonConstants.RESPONSE_RESOURCE_ID); getPeriodChargeRequestJSON(chargeId, addDueDate), CommonConstants.RESPONSE_RESOURCE_ID);
} }
public Integer payCharge(final Integer chargeId, final Integer savingsId, String amount, String dueDate) { public Integer payCharge(final Integer chargeId, final Integer savingsId, String amount, String dueDate) {
@@ -419,7 +419,7 @@ public class SavingsAccountHelper {
getCloseAccountJSON(withdrawBalance, closedOnDate), jsonAttributeToGetBack); getCloseAccountJSON(withdrawBalance, closedOnDate), jsonAttributeToGetBack);
} }
private String getPeriodChargeRequestJSON(Integer chargeId) { private String getPeriodChargeRequestJSON(Integer chargeId, boolean addDueDate) {
final HashMap<String, Object> map = new HashMap<>(); final HashMap<String, Object> map = new HashMap<>();
map.put("chargeId", chargeId); map.put("chargeId", chargeId);
map.put("amount", 100); map.put("amount", 100);
@@ -427,7 +427,9 @@ public class SavingsAccountHelper {
map.put("locale", CommonConstants.locale); map.put("locale", CommonConstants.locale);
map.put("monthDayFormat", "dd MMMM"); map.put("monthDayFormat", "dd MMMM");
map.put("dateFormat", "dd MMMM yyy"); map.put("dateFormat", "dd MMMM yyy");
map.put("dueDate", "10 January 2013"); if(addDueDate){
map.put("dueDate", "10 January 2013");
}
String json = new Gson().toJson(map); String json = new Gson().toJson(map);
return json; return json;
} }
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountCharge.java
-3
View File
@@ -226,9 +226,6 @@ public class SavingsAccountCharge extends AbstractPersistable<Long> {
populateDerivedFields(transactionAmount, chargeAmount); populateDerivedFields(transactionAmount, chargeAmount);
if (this.isWithdrawalFee() if (this.isWithdrawalFee()
|| this.isOverdraftFee()
|| this.isSavingsActivation()
|| this.isSavingsClosure()
|| this.isSavingsNoActivity()) { || this.isSavingsNoActivity()) {
this.amountOutstanding = BigDecimal.ZERO; this.amountOutstanding = BigDecimal.ZERO;
} }
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java
+1 -4
View File
@@ -789,10 +789,7 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi
Integer chargeTimeType = chargeDefinition.getChargeTimeType(); Integer chargeTimeType = chargeDefinition.getChargeTimeType();
LocalDate dueAsOfDateParam = command.localDateValueOfParameterNamed(dueAsOfDateParamName); LocalDate dueAsOfDateParam = command.localDateValueOfParameterNamed(dueAsOfDateParamName);
if((chargeTimeType.equals(ChargeTimeType.WITHDRAWAL_FEE.getValue()) if((chargeTimeType.equals(ChargeTimeType.WITHDRAWAL_FEE.getValue())
|| chargeTimeType.equals(ChargeTimeType.OVERDRAFT_FEE.getValue()) || chargeTimeType.equals(ChargeTimeType.SAVINGS_NOACTIVITY_FEE.getValue()))
|| chargeTimeType.equals(ChargeTimeType.SAVINGS_ACTIVATION.getValue())
|| chargeTimeType.equals(ChargeTimeType.SAVINGS_NOACTIVITY_FEE.getValue())
|| chargeTimeType.equals(ChargeTimeType.SAVINGS_CLOSURE.getValue()))
&& dueAsOfDateParam != null){ && dueAsOfDateParam != null){
baseDataValidator.reset().parameter(dueAsOfDateParamName).value(dueAsOfDateParam.toString(fmt)) baseDataValidator.reset().parameter(dueAsOfDateParamName).value(dueAsOfDateParam.toString(fmt))
.failWithCodeNoParameterAddedToErrorCode("charge.due.date.is.invalid.for." + ChargeTimeType.fromInt(chargeTimeType).getCode()); .failWithCodeNoParameterAddedToErrorCode("charge.due.date.is.invalid.for." + ChargeTimeType.fromInt(chargeTimeType).getCode());