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

Merge pull request #927 from lingalamadhukar/MIFOSX-1267

Browse Source 
MIFOSX-1288,MIFOSX-1280,build#699 testcase fixes
This commit is contained in:
Vishwas Babu A J
2014-06-05 14:37:04 -07:00
parent 7dcb9913a4 43225c38f6
commit d41cea8d46
8 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountingScenarioIntegrationTest.java
+1 -1
View File
@@ -452,7 +452,7 @@ public class AccountingScenarioIntegrationTest {
RecurringDepositAccountStatusChecker.verifyRecurringDepositIsActive(recurringDepositAccountStatusHashMap); RecurringDepositAccountStatusChecker.verifyRecurringDepositIsActive(recurringDepositAccountStatusHashMap);
HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, this.responseSpec, recurringDepositAccountId); HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, this.responseSpec, recurringDepositAccountId);
Float depositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float depositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Integer depositTransactionId = this.recurringDepositAccountHelper.depositToRecurringDepositAccount(recurringDepositAccountId, depositAmount, EXPECTED_FIRST_DEPOSIT_ON_DATE); Integer depositTransactionId = this.recurringDepositAccountHelper.depositToRecurringDepositAccount(recurringDepositAccountId, depositAmount, EXPECTED_FIRST_DEPOSIT_ON_DATE);
Assert.assertNotNull(depositTransactionId); Assert.assertNotNull(depositTransactionId);
mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/RecurringDepositTest.java
+14 -14
View File
@@ -681,7 +681,7 @@ public class RecurringDepositTest {
HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec,
this.responseSpec, recurringDepositAccountId); this.responseSpec, recurringDepositAccountId);
Float depositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float depositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Float maturityAmount = (Float) recurringDepositAccountData.get("maturityAmount"); Float maturityAmount = (Float) recurringDepositAccountData.get("maturityAmount");
Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod"); Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
@@ -761,7 +761,7 @@ public class RecurringDepositTest {
HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec,
this.responseSpec, recurringDepositAccountId); this.responseSpec, recurringDepositAccountId);
Float depositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float depositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Float maturityAmount = (Float) recurringDepositAccountData.get("maturityAmount"); Float maturityAmount = (Float) recurringDepositAccountData.get("maturityAmount");
Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod"); Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
@@ -938,7 +938,7 @@ public class RecurringDepositTest {
HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec,
this.responseSpec, recurringDepositAccountId); this.responseSpec, recurringDepositAccountId);
Float depositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float depositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod"); Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
Float preClosurePenalInterestRate = (Float) recurringDepositAccountData.get("preClosurePenalInterest"); Float preClosurePenalInterestRate = (Float) recurringDepositAccountData.get("preClosurePenalInterest");
@@ -1064,7 +1064,7 @@ public class RecurringDepositTest {
HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec,
this.responseSpec, recurringDepositAccountId); this.responseSpec, recurringDepositAccountId);
Float depositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float depositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod"); Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
Float preClosurePenalInterestRate = (Float) recurringDepositAccountData.get("preClosurePenalInterest"); Float preClosurePenalInterestRate = (Float) recurringDepositAccountData.get("preClosurePenalInterest");
@@ -1185,7 +1185,7 @@ public class RecurringDepositTest {
HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec,
this.responseSpec, recurringDepositAccountId); this.responseSpec, recurringDepositAccountId);
Float depositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float depositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
Float preClosurePenalInterestRate = (Float) recurringDepositAccountData.get("preClosurePenalInterest"); Float preClosurePenalInterestRate = (Float) recurringDepositAccountData.get("preClosurePenalInterest");
Integer daysInYear = (Integer) daysInYearMap.get("id"); Integer daysInYear = (Integer) daysInYearMap.get("id");
@@ -1319,7 +1319,7 @@ public class RecurringDepositTest {
HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, HashMap recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec,
this.responseSpec, recurringDepositAccountId); this.responseSpec, recurringDepositAccountId);
Float depositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float depositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
Float preClosurePenalInterestRate = (Float) recurringDepositAccountData.get("preClosurePenalInterest"); Float preClosurePenalInterestRate = (Float) recurringDepositAccountData.get("preClosurePenalInterest");
Integer daysInYear = (Integer) daysInYearMap.get("id"); Integer daysInYear = (Integer) daysInYearMap.get("id");
@@ -1444,7 +1444,7 @@ public class RecurringDepositTest {
this.responseSpec, recurringDepositAccountId); this.responseSpec, recurringDepositAccountId);
HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId); HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId);
Float principal = (Float) recurringDepositSummary.get("accountBalance"); Float principal = (Float) recurringDepositSummary.get("accountBalance");
Float recurringDepositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float recurringDepositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Float maturityAmount = (Float) recurringDepositAccountData.get("maturityAmount"); Float maturityAmount = (Float) recurringDepositAccountData.get("maturityAmount");
Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod"); Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
@@ -1524,7 +1524,7 @@ public class RecurringDepositTest {
this.responseSpec, recurringDepositAccountId); this.responseSpec, recurringDepositAccountId);
HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId); HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId);
Float principal = (Float) recurringDepositSummary.get("accountBalance"); Float principal = (Float) recurringDepositSummary.get("accountBalance");
Float recurringDepositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float recurringDepositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Float maturityAmount = (Float) recurringDepositAccountData.get("maturityAmount"); Float maturityAmount = (Float) recurringDepositAccountData.get("maturityAmount");
Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod"); Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
@@ -1611,7 +1611,7 @@ public class RecurringDepositTest {
this.responseSpec, recurringDepositAccountId); this.responseSpec, recurringDepositAccountId);
HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId); HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId);
Float principal = (Float) recurringDepositSummary.get("accountBalance"); Float principal = (Float) recurringDepositSummary.get("accountBalance");
Float recurringDepositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float recurringDepositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod"); Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
Integer daysInYear = (Integer) daysInYearMap.get("id"); Integer daysInYear = (Integer) daysInYearMap.get("id");
@@ -1697,7 +1697,7 @@ public class RecurringDepositTest {
this.responseSpec, recurringDepositAccountId); this.responseSpec, recurringDepositAccountId);
HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId); HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId);
Float principal = (Float) recurringDepositSummary.get("accountBalance"); Float principal = (Float) recurringDepositSummary.get("accountBalance");
Float recurringDepositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float recurringDepositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod"); Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
Integer daysInYear = (Integer) daysInYearMap.get("id"); Integer daysInYear = (Integer) daysInYearMap.get("id");
@@ -1783,7 +1783,7 @@ public class RecurringDepositTest {
HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId); HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId);
Float principal = (Float) recurringDepositSummary.get("accountBalance"); Float principal = (Float) recurringDepositSummary.get("accountBalance");
Float recurringDepositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float recurringDepositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod"); Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
Integer daysInYear = (Integer) daysInYearMap.get("id"); Integer daysInYear = (Integer) daysInYearMap.get("id");
@@ -1869,7 +1869,7 @@ public class RecurringDepositTest {
HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId); HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId);
Float principal = (Float) recurringDepositSummary.get("accountBalance"); Float principal = (Float) recurringDepositSummary.get("accountBalance");
Float recurringDepositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float recurringDepositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod"); Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
Integer daysInYear = (Integer) daysInYearMap.get("id"); Integer daysInYear = (Integer) daysInYearMap.get("id");
@@ -1955,7 +1955,7 @@ public class RecurringDepositTest {
this.responseSpec, recurringDepositAccountId); this.responseSpec, recurringDepositAccountId);
HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId); HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId);
Float principal = (Float) recurringDepositSummary.get("accountBalance"); Float principal = (Float) recurringDepositSummary.get("accountBalance");
Float recurringDepositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float recurringDepositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod"); Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
Integer daysInYear = (Integer) daysInYearMap.get("id"); Integer daysInYear = (Integer) daysInYearMap.get("id");
@@ -2041,7 +2041,7 @@ public class RecurringDepositTest {
this.responseSpec, recurringDepositAccountId); this.responseSpec, recurringDepositAccountId);
HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId); HashMap recurringDepositSummary = this.recurringDepositAccountHelper.getRecurringDepositSummary(recurringDepositAccountId);
Float principal = (Float) recurringDepositSummary.get("accountBalance"); Float principal = (Float) recurringDepositSummary.get("accountBalance");
Float recurringDepositAmount = (Float) recurringDepositAccountData.get("recurringDepositAmount"); Float recurringDepositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod"); Integer depositPeriod = (Integer) recurringDepositAccountData.get("depositPeriod");
HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType"); HashMap daysInYearMap = (HashMap) recurringDepositAccountData.get("interestCalculationDaysInYearType");
Integer daysInYear = (Integer) daysInYearMap.get("id"); Integer daysInYear = (Integer) daysInYearMap.get("id");
mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/fixeddeposit/FixedDepositAccountHelper.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class FixedDepositAccountHelper {
private String interestCompoundingPeriodType = MONTHLY; private String interestCompoundingPeriodType = MONTHLY;
private String interestPostingPeriodType = MONTHLY; private String interestPostingPeriodType = MONTHLY;
private String interestCalculationType = INTEREST_CALCULATION_USING_DAILY_BALANCE; private String interestCalculationType = INTEREST_CALCULATION_USING_DAILY_BALANCE;
private String lockinPeriodFrequency = "6"; private String lockinPeriodFrequency = "1";
private String lockingPeriodFrequencyType = MONTHS; private String lockingPeriodFrequencyType = MONTHS;
private final String minDepositTerm = "6"; private final String minDepositTerm = "6";
private final String minDepositTermTypeId = MONTHS; private final String minDepositTermTypeId = MONTHS;
mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/fixeddeposit/FixedDepositProductHelper.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class FixedDepositProductHelper {
private String interestPostingPeriodType = MONTHLY; private String interestPostingPeriodType = MONTHLY;
private String interestCalculationType = INTEREST_CALCULATION_USING_DAILY_BALANCE; private String interestCalculationType = INTEREST_CALCULATION_USING_DAILY_BALANCE;
private String accountingRule = NONE; private String accountingRule = NONE;
private String lockinPeriodFrequency = "6"; private String lockinPeriodFrequency = "1";
private String lockingPeriodFrequencyType = MONTHS; private String lockingPeriodFrequencyType = MONTHS;
private String minDepositTerm = "6"; private String minDepositTerm = "6";
private String minDepositTermTypeId = MONTHS; private String minDepositTermTypeId = MONTHS;
mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java
+9 -7
View File
@@ -66,7 +66,7 @@ public class RecurringDepositAccountHelper {
private String interestCompoundingPeriodType = MONTHLY; private String interestCompoundingPeriodType = MONTHLY;
private String interestPostingPeriodType = MONTHLY; private String interestPostingPeriodType = MONTHLY;
private String interestCalculationType = INTEREST_CALCULATION_USING_DAILY_BALANCE; private String interestCalculationType = INTEREST_CALCULATION_USING_DAILY_BALANCE;
private final String lockinPeriodFrequency = "6"; private final String lockinPeriodFrequency = "1";
private final String lockingPeriodFrequencyType = MONTHS; private final String lockingPeriodFrequencyType = MONTHS;
private final String minDepositTerm = "6"; private final String minDepositTerm = "6";
private final String minDepositTermTypeId = MONTHS; private final String minDepositTermTypeId = MONTHS;
@@ -82,11 +82,12 @@ public class RecurringDepositAccountHelper {
private final String depositAmount = "2000"; private final String depositAmount = "2000";
private final String depositPeriod = "14"; private final String depositPeriod = "14";
private final String depositPeriodFrequencyId = MONTHS; private final String depositPeriodFrequencyId = MONTHS;
private final String recurringDepositFrequency = "1"; private final String recurringFrequency = "1";
private final String recurringDepositFrequencyTypeId = MONTHS; private final String recurringFrequencyType = MONTHS;
private final String recurringDepositAmount = "2000"; private final String mandatoryRecommendedDepositAmount = "2000";
private String submittedOnDate = ""; private String submittedOnDate = "";
private String expectedFirstDepositOnDate = ""; private String expectedFirstDepositOnDate = "";
private boolean isCalendarInherited = false;
public String build(final String clientId, final String productId, final String validFrom, final String validTo, public String build(final String clientId, final String productId, final String validFrom, final String validTo,
final String penalInterestType) { final String penalInterestType) {
@@ -165,10 +166,11 @@ public class RecurringDepositAccountHelper {
map.put("depositPeriod", this.depositPeriod); map.put("depositPeriod", this.depositPeriod);
map.put("depositPeriodFrequencyId", this.depositPeriodFrequencyId); map.put("depositPeriodFrequencyId", this.depositPeriodFrequencyId);
map.put("submittedOnDate", this.submittedOnDate); map.put("submittedOnDate", this.submittedOnDate);
map.put("recurringDepositFrequency", this.recurringDepositFrequency); map.put("recurringFrequency", this.recurringFrequency);
map.put("recurringDepositFrequencyTypeId", this.recurringDepositFrequencyTypeId); map.put("recurringFrequencyType", this.recurringFrequencyType);
map.put("recurringDepositAmount", this.recurringDepositAmount); map.put("mandatoryRecommendedDepositAmount", this.mandatoryRecommendedDepositAmount);
map.put("expectedFirstDepositOnDate", this.expectedFirstDepositOnDate); map.put("expectedFirstDepositOnDate", this.expectedFirstDepositOnDate);
map.put("isCalendarInherited", this.isCalendarInherited);
String recurringDepositAccountJson = new Gson().toJson(map); String recurringDepositAccountJson = new Gson().toJson(map);
System.out.println(recurringDepositAccountJson); System.out.println(recurringDepositAccountJson);
mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/recurringdeposit/RecurringDepositProductHelper.java
+7 -9
View File
@@ -49,8 +49,6 @@ public class RecurringDepositProductHelper {
private static final String ACCRUAL_UPFRONT = "4"; private static final String ACCRUAL_UPFRONT = "4";
private static final String WHOLE_TERM = "1"; private static final String WHOLE_TERM = "1";
private static final String TILL_PREMATURE_WITHDRAWAL = "2"; private static final String TILL_PREMATURE_WITHDRAWAL = "2";
private static final String VOLUNTARY = "1";
private static final String MANDATORY = "2";
private final String name = Utils.randomNameGenerator("RECURRING_DEPOSIT_PRODUCT_", 6); private final String name = Utils.randomNameGenerator("RECURRING_DEPOSIT_PRODUCT_", 6);
private final String shortName = Utils.randomNameGenerator("", 4); private final String shortName = Utils.randomNameGenerator("", 4);
@@ -59,7 +57,7 @@ public class RecurringDepositProductHelper {
private final String interestPostingPeriodType = MONTHLY; private final String interestPostingPeriodType = MONTHLY;
private final String interestCalculationType = INTEREST_CALCULATION_USING_DAILY_BALANCE; private final String interestCalculationType = INTEREST_CALCULATION_USING_DAILY_BALANCE;
private String accountingRule = NONE; private String accountingRule = NONE;
private final String lockinPeriodFrequency = "6"; private final String lockinPeriodFrequency = "1";
private final String lockingPeriodFrequencyType = MONTHS; private final String lockingPeriodFrequencyType = MONTHS;
private final String minDepositTerm = "6"; private final String minDepositTerm = "6";
private final String minDepositTermTypeId = MONTHS; private final String minDepositTermTypeId = MONTHS;
@@ -72,9 +70,9 @@ public class RecurringDepositProductHelper {
private final boolean preClosurePenalApplicable = true; private final boolean preClosurePenalApplicable = true;
private final String currencyCode = USD; private final String currencyCode = USD;
private final String interestCalculationDaysInYearType = DAYS_365; private final String interestCalculationDaysInYearType = DAYS_365;
private final String recurringDepositTypeId = VOLUNTARY; private final boolean isMandatoryDeposit = false;
private final String recurringDepositFrequencyTypeId = MONTHS; private final String recurringFrequencyType = MONTHS;
private final String recurringDepositFrequency = "1"; private final String recurringFrequency = "1";
private final String depositAmount = "100000"; private final String depositAmount = "100000";
private final String minDepositAmount = "100"; private final String minDepositAmount = "100";
private final String maxDepositAmount = "1000000"; private final String maxDepositAmount = "1000000";
@@ -154,10 +152,10 @@ public class RecurringDepositProductHelper {
map.put("inMultiplesOfDepositTermTypeId", this.inMultiplesOfDepositTermTypeId); map.put("inMultiplesOfDepositTermTypeId", this.inMultiplesOfDepositTermTypeId);
map.put("preClosurePenalInterest", this.preClosurePenalInterest); map.put("preClosurePenalInterest", this.preClosurePenalInterest);
map.put("preClosurePenalInterestOnTypeId", this.preClosurePenalInterestOnTypeId); map.put("preClosurePenalInterestOnTypeId", this.preClosurePenalInterestOnTypeId);
map.put("recurringDepositTypeId", this.recurringDepositTypeId); map.put("isMandatoryDeposit", this.isMandatoryDeposit);
map.put("recurringDepositFrequencyTypeId", this.recurringDepositFrequencyTypeId); map.put("recurringFrequencyType", this.recurringFrequencyType);
map.put("depositAmount", this.depositAmount); map.put("depositAmount", this.depositAmount);
map.put("recurringDepositFrequency", this.recurringDepositFrequency); map.put("recurringFrequency", this.recurringFrequency);
map.put("depositAmount", this.depositAmount); map.put("depositAmount", this.depositAmount);
map.put("minDepositAmount", this.minDepositAmount); map.put("minDepositAmount", this.minDepositAmount);
map.put("maxDepositAmount", this.maxDepositAmount); map.put("maxDepositAmount", this.maxDepositAmount);
mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositAccountAssembler.java
+2 -3
View File
@@ -231,7 +231,6 @@ public class DepositAccountAssembler {
minRequiredOpeningBalance = product.minRequiredOpeningBalance(); minRequiredOpeningBalance = product.minRequiredOpeningBalance();
} }
@SuppressWarnings("unused")
Integer lockinPeriodFrequency = null; Integer lockinPeriodFrequency = null;
if (command.parameterExists(lockinPeriodFrequencyParamName)) { if (command.parameterExists(lockinPeriodFrequencyParamName)) {
lockinPeriodFrequency = command.integerValueOfParameterNamed(lockinPeriodFrequencyParamName); lockinPeriodFrequency = command.integerValueOfParameterNamed(lockinPeriodFrequencyParamName);
@@ -280,7 +279,7 @@ public class DepositAccountAssembler {
FixedDepositAccount fdAccount = FixedDepositAccount.createNewApplicationForSubmittal(client, group, product, fieldOfficer, FixedDepositAccount fdAccount = FixedDepositAccount.createNewApplicationForSubmittal(client, group, product, fieldOfficer,
accountNo, externalId, accountType, submittedOnDate, submittedBy, interestRate, interestCompoundingPeriodType, accountNo, externalId, accountType, submittedOnDate, submittedBy, interestRate, interestCompoundingPeriodType,
interestPostingPeriodType, interestCalculationType, interestCalculationDaysInYearType, minRequiredOpeningBalance, interestPostingPeriodType, interestCalculationType, interestCalculationDaysInYearType, minRequiredOpeningBalance,
lockinPeriodFrequencyTypeValue, lockinPeriodFrequencyType, iswithdrawalFeeApplicableForTransfer, charges, lockinPeriodFrequency, lockinPeriodFrequencyType, iswithdrawalFeeApplicableForTransfer, charges,
accountTermAndPreClosure, accountChart); accountTermAndPreClosure, accountChart);
accountTermAndPreClosure.updateAccountReference(fdAccount); accountTermAndPreClosure.updateAccountReference(fdAccount);
fdAccount.validateDomainRules(); fdAccount.validateDomainRules();
@@ -298,7 +297,7 @@ public class DepositAccountAssembler {
RecurringDepositAccount rdAccount = RecurringDepositAccount.createNewApplicationForSubmittal(client, group, product, RecurringDepositAccount rdAccount = RecurringDepositAccount.createNewApplicationForSubmittal(client, group, product,
fieldOfficer, accountNo, externalId, accountType, submittedOnDate, submittedBy, interestRate, fieldOfficer, accountNo, externalId, accountType, submittedOnDate, submittedBy, interestRate,
interestCompoundingPeriodType, interestPostingPeriodType, interestCalculationType, interestCalculationDaysInYearType, interestCompoundingPeriodType, interestPostingPeriodType, interestCalculationType, interestCalculationDaysInYearType,
minRequiredOpeningBalance, lockinPeriodFrequencyTypeValue, lockinPeriodFrequencyType, minRequiredOpeningBalance, lockinPeriodFrequency, lockinPeriodFrequencyType,
iswithdrawalFeeApplicableForTransfer, charges, accountTermAndPreClosure, accountRecurringDetail, accountChart); iswithdrawalFeeApplicableForTransfer, charges, accountTermAndPreClosure, accountRecurringDetail, accountChart);
accountTermAndPreClosure.updateAccountReference(rdAccount); accountTermAndPreClosure.updateAccountReference(rdAccount);
mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositAccountDomainServiceJpa.java
+10 -2
View File
@@ -33,7 +33,9 @@ import org.mifosplatform.portfolio.account.service.AccountTransfersWritePlatform
import org.mifosplatform.portfolio.client.domain.AccountNumberGenerator; import org.mifosplatform.portfolio.client.domain.AccountNumberGenerator;
import org.mifosplatform.portfolio.client.domain.AccountNumberGeneratorFactory; import org.mifosplatform.portfolio.client.domain.AccountNumberGeneratorFactory;
import org.mifosplatform.portfolio.paymentdetail.domain.PaymentDetail; import org.mifosplatform.portfolio.paymentdetail.domain.PaymentDetail;
import org.mifosplatform.portfolio.savings.DepositAccountOnClosureType;
import org.mifosplatform.portfolio.savings.DepositAccountType; import org.mifosplatform.portfolio.savings.DepositAccountType;
import org.mifosplatform.portfolio.savings.DepositsApiConstants;
import org.mifosplatform.portfolio.savings.SavingsApiConstants; import org.mifosplatform.portfolio.savings.SavingsApiConstants;
import org.mifosplatform.portfolio.savings.data.SavingsAccountTransactionDTO; import org.mifosplatform.portfolio.savings.data.SavingsAccountTransactionDTO;
import org.mifosplatform.useradministration.domain.AppUser; import org.mifosplatform.useradministration.domain.AppUser;
@@ -272,7 +274,10 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
// post interest // post interest
account.postPreMaturityInterest(closedDate); account.postPreMaturityInterest(closedDate);
if (account.isTransferToSavingsOnClosure()) { final Integer closureTypeValue = command.integerValueOfParameterNamed(DepositsApiConstants.onAccountClosureIdParamName);
DepositAccountOnClosureType closureType = DepositAccountOnClosureType.fromInt(closureTypeValue);
if (closureType.isTransferToSavings()) {
final Long toSavingsId = command.longValueOfParameterNamed(toSavingsAccountIdParamName); final Long toSavingsId = command.longValueOfParameterNamed(toSavingsAccountIdParamName);
final String transferDescription = command.stringValueOfParameterNamed(transferDescriptionParamName); final String transferDescription = command.stringValueOfParameterNamed(transferDescriptionParamName);
@@ -312,7 +317,10 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
// post interest // post interest
account.postPreMaturityInterest(closedDate); account.postPreMaturityInterest(closedDate);
if (account.isTransferToSavingsOnClosure()) { final Integer closureTypeValue = command.integerValueOfParameterNamed(DepositsApiConstants.onAccountClosureIdParamName);
DepositAccountOnClosureType closureType = DepositAccountOnClosureType.fromInt(closureTypeValue);
if (closureType.isTransferToSavings()) {
final Long toSavingsId = command.longValueOfParameterNamed(toSavingsAccountIdParamName); final Long toSavingsId = command.longValueOfParameterNamed(toSavingsAccountIdParamName);
final String transferDescription = command.stringValueOfParameterNamed(transferDescriptionParamName); final String transferDescription = command.stringValueOfParameterNamed(transferDescriptionParamName);
final SavingsAccount toSavingsAccount = this.depositAccountAssembler.assembleFrom(toSavingsId, final SavingsAccount toSavingsAccount = this.depositAccountAssembler.assembleFrom(toSavingsId,