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

tidy up validation order of staff.

Browse Source
This commit is contained in:
Keith Woodlock
2013-02-01 16:20:06 +00:00
parent 614cd93b2a
commit 7676172fb9
1 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/organisation/staff/serialization/StaffCommandFromApiJsonDeserializer.java
+8 -8
View File
@@ -46,15 +46,15 @@ public final class StaffCommandFromApiJsonDeserializer {
final JsonElement element = fromApiJsonHelper.parse(json); final JsonElement element = fromApiJsonHelper.parse(json);
final Long officeId = fromApiJsonHelper.extractLongNamed("officeId", element);
baseDataValidator.reset().parameter("officeId").value(officeId).notNull().integerGreaterThanZero();
final String firstname = fromApiJsonHelper.extractStringNamed("firstname", element); final String firstname = fromApiJsonHelper.extractStringNamed("firstname", element);
baseDataValidator.reset().parameter("firstname").value(firstname).notBlank().notExceedingLengthOf(50); baseDataValidator.reset().parameter("firstname").value(firstname).notBlank().notExceedingLengthOf(50);
final String lastname = fromApiJsonHelper.extractStringNamed("lastname", element); final String lastname = fromApiJsonHelper.extractStringNamed("lastname", element);
baseDataValidator.reset().parameter("lastname").value(lastname).notBlank().notExceedingLengthOf(50); baseDataValidator.reset().parameter("lastname").value(lastname).notBlank().notExceedingLengthOf(50);
final Long officeId = fromApiJsonHelper.extractLongNamed("officeId", element);
baseDataValidator.reset().parameter("officeId").value(officeId).notNull().integerGreaterThanZero();
if (fromApiJsonHelper.parameterExists("isLoanOfficer", element)) { if (fromApiJsonHelper.parameterExists("isLoanOfficer", element)) {
final Boolean loanOfficerFlag = fromApiJsonHelper.extractBooleanNamed("isLoanOfficer", element); final Boolean loanOfficerFlag = fromApiJsonHelper.extractBooleanNamed("isLoanOfficer", element);
baseDataValidator.reset().parameter("isLoanOfficer").value(loanOfficerFlag).notNull(); baseDataValidator.reset().parameter("isLoanOfficer").value(loanOfficerFlag).notNull();
@@ -73,6 +73,11 @@ public final class StaffCommandFromApiJsonDeserializer {
final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("staff"); final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("staff");
final JsonElement element = fromApiJsonHelper.parse(json); final JsonElement element = fromApiJsonHelper.parse(json);
if (fromApiJsonHelper.parameterExists("officeId", element)) {
final Long officeId = fromApiJsonHelper.extractLongNamed("officeId", element);
baseDataValidator.reset().parameter("officeId").value(officeId).notNull().integerGreaterThanZero();
}
if (fromApiJsonHelper.parameterExists("firstname", element)) { if (fromApiJsonHelper.parameterExists("firstname", element)) {
final String firstname = fromApiJsonHelper.extractStringNamed("firstname", element); final String firstname = fromApiJsonHelper.extractStringNamed("firstname", element);
baseDataValidator.reset().parameter("firstname").value(firstname).notBlank().notExceedingLengthOf(50); baseDataValidator.reset().parameter("firstname").value(firstname).notBlank().notExceedingLengthOf(50);
@@ -83,11 +88,6 @@ public final class StaffCommandFromApiJsonDeserializer {
baseDataValidator.reset().parameter("lastname").value(lastname).notBlank().notExceedingLengthOf(50); baseDataValidator.reset().parameter("lastname").value(lastname).notBlank().notExceedingLengthOf(50);
} }
if (fromApiJsonHelper.parameterExists("officeId", element)) {
final Long officeId = fromApiJsonHelper.extractLongNamed("officeId", element);
baseDataValidator.reset().parameter("officeId").value(officeId).notNull().integerGreaterThanZero();
}
if (fromApiJsonHelper.parameterExists("isLoanOfficer", element)) { if (fromApiJsonHelper.parameterExists("isLoanOfficer", element)) {
final Boolean loanOfficerFlag = fromApiJsonHelper.extractBooleanNamed("isLoanOfficer", element); final Boolean loanOfficerFlag = fromApiJsonHelper.extractBooleanNamed("isLoanOfficer", element);
baseDataValidator.reset().parameter("isLoanOfficer").value(loanOfficerFlag).notNull(); baseDataValidator.reset().parameter("isLoanOfficer").value(loanOfficerFlag).notNull();