This is an automated email from the ASF dual-hosted git repository. awasum pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-group.git
commit 9484cac9da7c7cd79f3ab41ba38784116228b546 Author: kengneruphine <[email protected]> AuthorDate: Sat Jul 7 11:35:25 2018 +0100 modifying the implementation of updateGroupDefinition --- .../internal/command/handler/GroupAggregate.java | 32 +++++++++++----------- .../group/rest/GroupDefinitionRestController.java | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/GroupAggregate.java b/service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/GroupAggregate.java index 409aa66..b4a93d6 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/GroupAggregate.java +++ b/service/src/main/java/org/apache/fineract/cn/group/internal/command/handler/GroupAggregate.java @@ -138,22 +138,22 @@ public class GroupAggregate { @Transactional @CommandHandler - @EventEmitter(selectorName = EventConstants.SELECTOR_NAME, selectorValue = EventConstants.PUT_GROUP) + @EventEmitter(selectorName = EventConstants.SELECTOR_NAME, selectorValue = EventConstants.PUT_GROUP_DEFINITION) public String updateDefinition(final UpdateGroupDefinitionCommand updateGroupDefinitionCommand) { - final GroupDefinition updatedGroupDefinition = updateGroupDefinitionCommand.groupDefinition(); - final Cycle cycle = updatedGroupDefinition.getCycle(); - this.groupDefinitionRepository.findByIdentifier(updateGroupDefinitionCommand.identifier()) - .ifPresent(groupDefinitionEntity -> { - groupDefinitionEntity.setDescription(updatedGroupDefinition.getDescription()); - groupDefinitionEntity.setMinimalSize(updatedGroupDefinition.getMinimalSize()); - groupDefinitionEntity.setMaximalSize(updatedGroupDefinition.getMaximalSize()); - groupDefinitionEntity.setNumberOfMeetings(cycle.getNumberOfMeetings()); - groupDefinitionEntity.setFrequency(cycle.getFrequency()); - groupDefinitionEntity.setAdjustment(cycle.getAdjustment()); - this.groupDefinitionRepository.save(groupDefinitionEntity); - }); - return updateGroupDefinitionCommand.identifier(); - } + final GroupDefinition updatedGroupDefinition = updateGroupDefinitionCommand.groupDefinition(); + final Cycle cycle = updatedGroupDefinition.getCycle(); + this.groupDefinitionRepository.findByIdentifier(updateGroupDefinitionCommand.identifier()) + .ifPresent(groupDefinitionEntity -> { + groupDefinitionEntity.setDescription(updatedGroupDefinition.getDescription()); + groupDefinitionEntity.setMinimalSize(updatedGroupDefinition.getMinimalSize()); + groupDefinitionEntity.setMaximalSize(updatedGroupDefinition.getMaximalSize()); + groupDefinitionEntity.setNumberOfMeetings(cycle.getNumberOfMeetings()); + groupDefinitionEntity.setFrequency(cycle.getFrequency()); + groupDefinitionEntity.setAdjustment(cycle.getAdjustment()); + this.groupDefinitionRepository.save(groupDefinitionEntity); + }); + return updatedGroupDefinition.getIdentifier(); + } @Transactional @CommandHandler @@ -312,7 +312,7 @@ public class GroupAggregate { @Transactional @CommandHandler - @EventEmitter(selectorName = EventConstants.SELECTOR_NAME, selectorValue = EventConstants.PUT_GROUP) + @EventEmitter(selectorName = EventConstants.SELECTOR_NAME, selectorValue = EventConstants.PUT_MEETING) public String signOffMeeting(final SignOffMeetingCommand signOffMeetingCommand) { this.groupRepository.findByIdentifier(signOffMeetingCommand.groupIdentifier()) .ifPresent(groupEntity -> { diff --git a/service/src/main/java/org/apache/fineract/cn/group/rest/GroupDefinitionRestController.java b/service/src/main/java/org/apache/fineract/cn/group/rest/GroupDefinitionRestController.java index f520273..6bd9ecb 100644 --- a/service/src/main/java/org/apache/fineract/cn/group/rest/GroupDefinitionRestController.java +++ b/service/src/main/java/org/apache/fineract/cn/group/rest/GroupDefinitionRestController.java @@ -121,7 +121,7 @@ public class GroupDefinitionRestController { ) public @ResponseBody - ResponseEntity<Void> updateDefinition(@PathVariable("identifier") final String identifier, @RequestBody final GroupDefinition groupDefinition) { + ResponseEntity<Void> updateGroupDefinition(@PathVariable("identifier") final String identifier, @RequestBody final GroupDefinition groupDefinition) { if (this.groupDefinitionService.groupDefinitionExists(identifier)) { this.commandGateway.process(new UpdateGroupDefinitionCommand(identifier, groupDefinition)); } else {
