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

Cleaning up inconsistencies in ClientDataValidator.java

Browse Source
This commit is contained in:
Vishwas Babu A J
2014-07-03 11:33:24 -07:00
parent 530301cc59
commit 38481b03cf
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientDataValidator.java
+6
View File
@@ -332,34 +332,40 @@ public final class ClientDataValidator {
} }
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.staffIdParamName, element)) { if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.staffIdParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final Long staffId = this.fromApiJsonHelper.extractLongNamed(ClientApiConstants.staffIdParamName, element); final Long staffId = this.fromApiJsonHelper.extractLongNamed(ClientApiConstants.staffIdParamName, element);
baseDataValidator.reset().parameter(ClientApiConstants.staffIdParamName).value(staffId).ignoreIfNull().longGreaterThanZero(); baseDataValidator.reset().parameter(ClientApiConstants.staffIdParamName).value(staffId).ignoreIfNull().longGreaterThanZero();
} }
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.savingsProductIdParamName, element)) { if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.savingsProductIdParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final Long savingsProductId = this.fromApiJsonHelper.extractLongNamed(ClientApiConstants.savingsProductIdParamName, element); final Long savingsProductId = this.fromApiJsonHelper.extractLongNamed(ClientApiConstants.savingsProductIdParamName, element);
baseDataValidator.reset().parameter(ClientApiConstants.savingsProductIdParamName).value(savingsProductId).ignoreIfNull() baseDataValidator.reset().parameter(ClientApiConstants.savingsProductIdParamName).value(savingsProductId).ignoreIfNull()
.longGreaterThanZero(); .longGreaterThanZero();
} }
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.dateOfBirthParamName, element)) { if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.dateOfBirthParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final LocalDate dateOfBirth = this.fromApiJsonHelper.extractLocalDateNamed(ClientApiConstants.dateOfBirthParamName, element); final LocalDate dateOfBirth = this.fromApiJsonHelper.extractLocalDateNamed(ClientApiConstants.dateOfBirthParamName, element);
baseDataValidator.reset().parameter(ClientApiConstants.dateOfBirthParamName).value(dateOfBirth).notNull() baseDataValidator.reset().parameter(ClientApiConstants.dateOfBirthParamName).value(dateOfBirth).notNull()
.validateDateBefore(DateUtils.getLocalDateOfTenant()); .validateDateBefore(DateUtils.getLocalDateOfTenant());
} }
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.genderIdParamName, element)) { if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.genderIdParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final Integer genderId = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(ClientApiConstants.genderIdParamName, element); final Integer genderId = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(ClientApiConstants.genderIdParamName, element);
baseDataValidator.reset().parameter(ClientApiConstants.genderIdParamName).value(genderId).integerGreaterThanZero(); baseDataValidator.reset().parameter(ClientApiConstants.genderIdParamName).value(genderId).integerGreaterThanZero();
} }
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.clientTypeIdParamName, element)) { if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.clientTypeIdParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final Integer clientType = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(ClientApiConstants.clientTypeIdParamName, final Integer clientType = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(ClientApiConstants.clientTypeIdParamName,
element); element);
baseDataValidator.reset().parameter(ClientApiConstants.clientTypeIdParamName).value(clientType).integerGreaterThanZero(); baseDataValidator.reset().parameter(ClientApiConstants.clientTypeIdParamName).value(clientType).integerGreaterThanZero();
} }
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.clientClassificationIdParamName, element)) { if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.clientClassificationIdParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final Integer clientClassification = this.fromApiJsonHelper.extractIntegerSansLocaleNamed( final Integer clientClassification = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(
ClientApiConstants.clientClassificationIdParamName, element); ClientApiConstants.clientClassificationIdParamName, element);
baseDataValidator.reset().parameter(ClientApiConstants.clientClassificationIdParamName).value(clientClassification) baseDataValidator.reset().parameter(ClientApiConstants.clientClassificationIdParamName).value(clientClassification)