diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/Group.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/Group.java index b0874ce7d..1ef191105 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/Group.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/Group.java @@ -345,6 +345,18 @@ public final class Group extends AbstractPersistableCustom { this.accountNumber = StringUtils.defaultIfEmpty(newValue, null); } + if (command.isChangeInLocalDateParameterNamed(GroupingTypesApiConstants.submittedOnDateParamName, getSubmittedOnDate())) { + final String valueAsInput = command.stringValueOfParameterNamed(GroupingTypesApiConstants.submittedOnDateParamName); + actualChanges.put(GroupingTypesApiConstants.submittedOnDateParamName, valueAsInput); + actualChanges.put(GroupingTypesApiConstants.dateFormatParamName, dateFormatAsInput); + actualChanges.put(GroupingTypesApiConstants.localeParamName, localeAsInput); + + final LocalDate newValue = command.localDateValueOfParameterNamed(GroupingTypesApiConstants.submittedOnDateParamName); + if (newValue != null) { + this.submittedOnDate = newValue.toDate(); + } + } + return actualChanges; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/serialization/GroupingTypesDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/serialization/GroupingTypesDataValidator.java index a3184f254..af0686066 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/serialization/GroupingTypesDataValidator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/serialization/GroupingTypesDataValidator.java @@ -374,6 +374,12 @@ public final class GroupingTypesDataValidator { } } + if (this.fromApiJsonHelper.parameterExists(GroupingTypesApiConstants.submittedOnDateParamName, element)) { + final LocalDate submittedOnDate = this.fromApiJsonHelper.extractLocalDateNamed( + GroupingTypesApiConstants.submittedOnDateParamName, element); + baseDataValidator.reset().parameter(GroupingTypesApiConstants.submittedOnDateParamName).value(submittedOnDate).notNull(); + } + throwExceptionIfValidationWarningsExist(dataValidationErrors); }