diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java index 45a23ddd1..23810ac2d 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java @@ -217,6 +217,10 @@ public final class Group extends AbstractPersistable { final List dataValidationErrors = new ArrayList<>(); activate(currentUser, activationLocalDate, dataValidationErrors); + if (this.isCenter() && this.hasStaff()) { + Staff staff = this.getStaff(); + this.reassignStaff(staff, activationLocalDate); + } throwExceptionIfErrors(dataValidationErrors); } @@ -492,6 +496,11 @@ public final class Group extends AbstractPersistable { return this.groupMembers.contains(group); } + public boolean hasStaff() { + if (this.staff != null) { return true; } + return false; + } + public List associateGroups(final Set groupMembersSet) { final List differences = new ArrayList<>(); @@ -635,7 +644,7 @@ public final class Group extends AbstractPersistable { } // StaffAssignmentHistory[during center creation] - public void caputreStaffHistoryDuringCenterCreation(final Staff newStaff, final LocalDate assignmentDate) { + public void captureStaffHistoryDuringCenterCreation(final Staff newStaff, final LocalDate assignmentDate) { if (this.isCenter() && this.isActive() && staff != null) { this.staff = newStaff; final StaffAssignmentHistory staffAssignmentHistory = StaffAssignmentHistory.createNew(this, this.staff, assignmentDate); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java index 239561407..1667f9772 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java @@ -189,7 +189,7 @@ public class GroupingTypesWritePlatformServiceJpaRepositoryImpl implements Group newGroup.generateHierarchy(); this.groupRepository.saveAndFlush(newGroup); - newGroup.caputreStaffHistoryDuringCenterCreation(staff, activationDate); + newGroup.captureStaffHistoryDuringCenterCreation(staff, activationDate); return new CommandProcessingResultBuilder() // .withCommandId(command.commandId()) // .withOfficeId(groupOffice.getId()) //