FINERACT-618 Allow for Submitted On Date to be Edited for Groups

apache · Nov 28, 2018 · a149185 · a149185
1 parent 47e7f7e
commit a149185
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
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
@@ -345,6 +345,18 @@ public Map<String, Object> update(final JsonCommand command) {
             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/...in/java/org/apache/fineract/portfolio/group/serialization/GroupingTypesDataValidator.java b/...in/java/org/apache/fineract/portfolio/group/serialization/GroupingTypesDataValidator.java
@@ -374,6 +374,12 @@ public void validateForUpdateGroup(final JsonCommand command) {
             }
         }
 
+        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);
     }