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

MIFOSX-784: ensure validation is called on create and activate scenarios.

Browse Source
This commit is contained in:
Keith Woodlock
2013-11-14 13:28:53 +00:00
parent 61bb5c1302
commit dcbc64e30e
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/Client.java
+10 -12
View File
@@ -313,18 +313,6 @@ public final class Client extends AbstractPersistable<Long> {
throw new PlatformApiDataValidationException(dataValidationErrors); throw new PlatformApiDataValidationException(dataValidationErrors);
} }
if (isDateInTheFuture(activationLocalDate)) {
final String defaultUserMessage = "Activation date cannot be in the future.";
final ApiParameterError error = ApiParameterError.parameterError("error.msg.clients.activationDate.in.the.future",
defaultUserMessage, ClientApiConstants.activationDateParamName, activationLocalDate);
final List<ApiParameterError> dataValidationErrors = new ArrayList<ApiParameterError>();
dataValidationErrors.add(error);
throw new PlatformApiDataValidationException(dataValidationErrors);
}
this.activationDate = activationLocalDate.toDate(); this.activationDate = activationLocalDate.toDate();
this.activatedBy = currentUser; this.activatedBy = currentUser;
this.officeJoiningDate = this.activationDate; this.officeJoiningDate = this.activationDate;
@@ -472,6 +460,16 @@ public final class Client extends AbstractPersistable<Long> {
} }
private void validateActivationDate(final List<ApiParameterError> dataValidationErrors) { private void validateActivationDate(final List<ApiParameterError> dataValidationErrors) {
if (getActivationLocalDate() != null && isDateInTheFuture(getActivationLocalDate())) {
final String defaultUserMessage = "Activation date cannot be in the future.";
final ApiParameterError error = ApiParameterError.parameterError("error.msg.clients.activationDate.in.the.future",
defaultUserMessage, ClientApiConstants.activationDateParamName, getActivationLocalDate());
dataValidationErrors.add(error);
}
if (this.activationDate != null) { if (this.activationDate != null) {
if (this.office.isOpeningDateAfter(getActivationLocalDate())) { if (this.office.isOpeningDateAfter(getActivationLocalDate())) {
final String defaultUserMessage = "Client activation date cannot be a date before the office opening date."; final String defaultUserMessage = "Client activation date cannot be a date before the office opening date.";