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-payroll.git
commit 4cd0af44bb8cca897f4a74ee28976a7ee80d654b Author: Mark <[email protected]> AuthorDate: Tue Sep 19 14:19:17 2017 +0200 Remove dot from version to be consistent Flush payroll allocations to prevent saving of duplicate allocations Set createdBy from entity in mapper --- .../service/internal/command/handler/PayrollConfigurationAggregate.java | 2 ++ .../payroll/service/internal/mapper/PayrollConfigurationMapper.java | 2 +- shared.gradle | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java b/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java index d71fe45..43e954d 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java +++ b/service/src/main/java/io/mifos/payroll/service/internal/command/handler/PayrollConfigurationAggregate.java @@ -73,6 +73,8 @@ public class PayrollConfigurationAggregate { payrollConfigurationEntity = optionalPayrollConfiguration.get(); this.payrollAllocationRepository.deleteByPayrollConfiguration(payrollConfigurationEntity); + this.payrollAllocationRepository.flush(); + payrollConfigurationEntity.setLastModifiedBy(UserContextHolder.checkedGetUser()); payrollConfigurationEntity.setLastModifiedOn(LocalDateTime.now(Clock.systemUTC())); } else { diff --git a/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollConfigurationMapper.java b/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollConfigurationMapper.java index 140a2e0..69ba999 100644 --- a/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollConfigurationMapper.java +++ b/service/src/main/java/io/mifos/payroll/service/internal/mapper/PayrollConfigurationMapper.java @@ -28,7 +28,7 @@ public class PayrollConfigurationMapper { public static PayrollConfiguration map(final PayrollConfigurationEntity payrollConfigurationEntity) { final PayrollConfiguration payrollConfiguration = new PayrollConfiguration(); payrollConfiguration.setMainAccountNumber(payrollConfigurationEntity.getMainAccountNumber()); - payrollConfiguration.setCreatedBy(payrollConfiguration.getCreatedOn()); + payrollConfiguration.setCreatedBy(payrollConfigurationEntity.getCreatedBy()); payrollConfiguration.setCreatedOn(DateConverter.toIsoString(payrollConfigurationEntity.getCreatedOn())); if (payrollConfigurationEntity.getLastModifiedBy() != null) { payrollConfiguration.setLastModifiedBy(payrollConfigurationEntity.getLastModifiedBy()); diff --git a/shared.gradle b/shared.gradle index 831fede..ac8c7ea 100644 --- a/shared.gradle +++ b/shared.gradle @@ -1,5 +1,5 @@ group 'io.mifos.payroll' -version '0.1.0.BUILD-SNAPSHOT' +version '0.1.0-BUILD-SNAPSHOT' ext.versions = [ frameworkapi : '0.1.0-BUILD-SNAPSHOT',
