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

Merge pull request #913 from pramodn02/MIFOSX-1187

Browse Source 
MIFOSX-1187 - added null checks before compare with min and max values
This commit is contained in:
Vishwas Babu A J
2014-05-19 09:48:05 +05:30
parent 0a3e039122 99822a32e2
commit a86ef1da2d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/data/DepositProductDataValidator.java
+1 -1
View File
@@ -377,7 +377,7 @@ public class DepositProductDataValidator {
} }
final Integer minDepositTermType = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(minDepositTermTypeIdParamName, element); final Integer minDepositTermType = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(minDepositTermTypeIdParamName, element);
baseDataValidator.reset().parameter(minDepositTermTypeIdParamName).value(minDepositTermType) baseDataValidator.reset().parameter(minDepositTermTypeIdParamName).value(minDepositTermType).ignoreIfNull()
.isOneOfTheseValues(SavingsPeriodFrequencyType.integerValues()); .isOneOfTheseValues(SavingsPeriodFrequencyType.integerValues());
if (fromApiJsonHelper.parameterExists(maxDepositTermTypeIdParamName, element)) { if (fromApiJsonHelper.parameterExists(maxDepositTermTypeIdParamName, element)) {
mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositProductAssembler.java
+6 -6
View File
@@ -417,25 +417,25 @@ public class DepositProductAssembler {
if (command.parameterExists(minDepositTermParamName)) { if (command.parameterExists(minDepositTermParamName)) {
minDepositTerm = command.integerValueOfParameterNamed(minDepositTermParamName); minDepositTerm = command.integerValueOfParameterNamed(minDepositTermParamName);
} else { } else if(prodDepositTermDetail != null){
minDepositTerm = prodDepositTermDetail.minDepositTerm(); minDepositTerm = prodDepositTermDetail.minDepositTerm();
} }
if (command.parameterExists(maxDepositTermParamName)) { if (command.parameterExists(maxDepositTermParamName)) {
maxDepositTerm = command.integerValueOfParameterNamed(maxDepositTermParamName); maxDepositTerm = command.integerValueOfParameterNamed(maxDepositTermParamName);
} else { } else if(prodDepositTermDetail != null){
maxDepositTerm = prodDepositTermDetail.maxDepositTerm(); maxDepositTerm = prodDepositTermDetail.maxDepositTerm();
} }
if (command.parameterExists(minDepositTermTypeIdParamName)) { if (command.parameterExists(minDepositTermTypeIdParamName)) {
minDepositTermTypeId = command.integerValueOfParameterNamed(minDepositTermTypeIdParamName); minDepositTermTypeId = command.integerValueOfParameterNamed(minDepositTermTypeIdParamName);
} else { } else if(prodDepositTermDetail != null){
minDepositTermTypeId = prodDepositTermDetail.minDepositTermType(); minDepositTermTypeId = prodDepositTermDetail.minDepositTermType();
} }
if (command.parameterExists(maxDepositTermTypeIdParamName)) { if (command.parameterExists(maxDepositTermTypeIdParamName)) {
maxDepositTermTypeId = command.integerValueOfParameterNamed(maxDepositTermTypeIdParamName); maxDepositTermTypeId = command.integerValueOfParameterNamed(maxDepositTermTypeIdParamName);
} else { } else if(prodDepositTermDetail != null){
maxDepositTermTypeId = prodDepositTermDetail.maxDepositTermType(); maxDepositTermTypeId = prodDepositTermDetail.maxDepositTermType();
} }
@@ -447,13 +447,13 @@ public class DepositProductAssembler {
if (command.parameterExists(inMultiplesOfDepositTermParamName)) { if (command.parameterExists(inMultiplesOfDepositTermParamName)) {
inMultiplesOfDepositTerm = command.integerValueOfParameterNamed(inMultiplesOfDepositTermParamName); inMultiplesOfDepositTerm = command.integerValueOfParameterNamed(inMultiplesOfDepositTermParamName);
} else { } else if(prodDepositTermDetail != null){
inMultiplesOfDepositTerm = prodDepositTermDetail.inMultiplesOfDepositTerm(); inMultiplesOfDepositTerm = prodDepositTermDetail.inMultiplesOfDepositTerm();
} }
if (command.parameterExists(preClosurePenalApplicableParamName)) { if (command.parameterExists(preClosurePenalApplicableParamName)) {
inMultiplesOfDepositTermTypeId = command.integerValueOfParameterNamed(inMultiplesOfDepositTermTypeIdParamName); inMultiplesOfDepositTermTypeId = command.integerValueOfParameterNamed(inMultiplesOfDepositTermTypeIdParamName);
} else { } else if(prodDepositTermDetail != null){
inMultiplesOfDepositTermTypeId = prodDepositTermDetail.inMultiplesOfDepositTermType(); inMultiplesOfDepositTermTypeId = prodDepositTermDetail.inMultiplesOfDepositTermType();
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositTermDetail.java
+2 -2
View File
@@ -175,13 +175,13 @@ public class DepositTermDetail {
private boolean isEqualOrGreaterThanMin(LocalDate depositStartDate, LocalDate depositEndDate) { private boolean isEqualOrGreaterThanMin(LocalDate depositStartDate, LocalDate depositEndDate) {
final SavingsPeriodFrequencyType periodFrequencyType = SavingsPeriodFrequencyType.fromInt(this.minDepositTermType()); final SavingsPeriodFrequencyType periodFrequencyType = SavingsPeriodFrequencyType.fromInt(this.minDepositTermType());
final Integer depositPeriod = depositPeriod(depositStartDate, depositEndDate, periodFrequencyType); final Integer depositPeriod = depositPeriod(depositStartDate, depositEndDate, periodFrequencyType);
return depositPeriod.compareTo(minDepositTerm()) >= 0; return minDepositTerm() == null || depositPeriod.compareTo(minDepositTerm()) >= 0;
} }
private boolean isEqualOrLessThanMax(LocalDate depositStartDate, LocalDate depositEndDate) { private boolean isEqualOrLessThanMax(LocalDate depositStartDate, LocalDate depositEndDate) {
final SavingsPeriodFrequencyType periodFrequencyType = SavingsPeriodFrequencyType.fromInt(this.maxDepositTermType()); final SavingsPeriodFrequencyType periodFrequencyType = SavingsPeriodFrequencyType.fromInt(this.maxDepositTermType());
final Integer depositPeriod = depositPeriod(depositStartDate, depositEndDate, periodFrequencyType); final Integer depositPeriod = depositPeriod(depositStartDate, depositEndDate, periodFrequencyType);
return depositPeriod.compareTo(maxDepositTerm()) <= 0; return maxDepositTerm() == null || depositPeriod.compareTo(maxDepositTerm()) <= 0;
} }
public Integer depositPeriod(final LocalDate periodStartDate, final LocalDate periodEndDate, public Integer depositPeriod(final LocalDate periodStartDate, final LocalDate periodEndDate,