Merge pull request #14 from myrle-krantz/develop
Progress on triggering interest calculations via rhythm.
diff --git a/service/src/main/java/io/mifos/portfolio/service/internal/command/handler/InitializeCommandHandler.java b/service/src/main/java/io/mifos/portfolio/service/internal/command/handler/InitializeCommandHandler.java
index ba049a5..b0803fd 100644
--- a/service/src/main/java/io/mifos/portfolio/service/internal/command/handler/InitializeCommandHandler.java
+++ b/service/src/main/java/io/mifos/portfolio/service/internal/command/handler/InitializeCommandHandler.java
@@ -40,6 +40,7 @@
private final FlywayFactoryBean flywayFactoryBean;
private final RhythmAdapter rhythmAdapter;
+ @SuppressWarnings("SpringJavaAutowiringInspection")
@Autowired
public InitializeCommandHandler(@Qualifier(ServiceConstants.LOGGER_NAME) final Logger logger,
final DataSource dataSource,
@@ -55,7 +56,7 @@
@CommandHandler
@EventEmitter(selectorName = EventConstants.SELECTOR_NAME, selectorValue = EventConstants.INITIALIZE)
public String initialize(final InitializeServiceCommand initializeServiceCommand) {
- this.logger.debug("Start service migration.");
+ this.logger.info("Start service migration.");
this.flywayFactoryBean.create(this.dataSource).migrate();
rhythmAdapter.request24Beats();
return EventConstants.INITIALIZE;
diff --git a/service/src/main/java/io/mifos/portfolio/service/internal/util/AccountingAdapter.java b/service/src/main/java/io/mifos/portfolio/service/internal/util/AccountingAdapter.java
index 97165c8..9d33487 100644
--- a/service/src/main/java/io/mifos/portfolio/service/internal/util/AccountingAdapter.java
+++ b/service/src/main/java/io/mifos/portfolio/service/internal/util/AccountingAdapter.java
@@ -70,7 +70,7 @@
public boolean accountAssignmentRepresentsRealAccount(final AccountAssignment accountAssignment) {
if (accountAssignment.getAccountIdentifier() != null) {
try {
- //ledgerManager.findAccount(accountAssignment.getAccountIdentifier());
+ ledgerManager.findAccount(accountAssignment.getAccountIdentifier());
return true;
}
catch (final AccountNotFoundException e){
@@ -79,7 +79,7 @@
}
else if (accountAssignment.getLedgerIdentifier() != null) {
try {
- //ledgerManager.findLedger(accountAssignment.getLedgerIdentifier());
+ ledgerManager.findLedger(accountAssignment.getLedgerIdentifier());
return true;
}
catch (final LedgerNotFoundException e){
diff --git a/service/src/main/java/io/mifos/portfolio/service/internal/util/RhythmAdapter.java b/service/src/main/java/io/mifos/portfolio/service/internal/util/RhythmAdapter.java
index eccaa1b..0d9716f 100644
--- a/service/src/main/java/io/mifos/portfolio/service/internal/util/RhythmAdapter.java
+++ b/service/src/main/java/io/mifos/portfolio/service/internal/util/RhythmAdapter.java
@@ -58,7 +58,7 @@
private void createBeat(final Beat beat) {
try {
- //rhythmManager.createBeat(applicationName.toString(), beat);
+ rhythmManager.createBeat(applicationName.toString(), beat);
}
catch (final Exception e) {
logger.error("Creating interest calculation beat {} failed with exception e.", beat, e);
diff --git a/service/src/test/java/io/mifos/individuallending/internal/service/Fixture.java b/service/src/test/java/io/mifos/individuallending/internal/service/Fixture.java
index 9ab9956..2dc3d1c 100644
--- a/service/src/test/java/io/mifos/individuallending/internal/service/Fixture.java
+++ b/service/src/test/java/io/mifos/individuallending/internal/service/Fixture.java
@@ -15,13 +15,12 @@
*/
package io.mifos.individuallending.internal.service;
-import io.mifos.portfolio.api.v1.domain.BalanceRange;
-import io.mifos.portfolio.api.v1.domain.ChargeDefinition;
-import io.mifos.portfolio.api.v1.domain.PaymentCycle;
-import io.mifos.portfolio.api.v1.domain.TermRange;
import io.mifos.individuallending.api.v1.domain.caseinstance.CaseParameters;
import io.mifos.individuallending.api.v1.domain.product.AccountDesignators;
import io.mifos.individuallending.api.v1.domain.workflow.Action;
+import io.mifos.portfolio.api.v1.domain.ChargeDefinition;
+import io.mifos.portfolio.api.v1.domain.PaymentCycle;
+import io.mifos.portfolio.api.v1.domain.TermRange;
import org.junit.Assert;
import java.math.BigDecimal;
@@ -42,8 +41,7 @@
{
final CaseParameters ret = new CaseParameters(generateRandomIdentifier("fred"));
- ret.setInitialBalance(fixScale(BigDecimal.valueOf(2000L)));
- ret.setBalanceRange(new BalanceRange(fixScale(BigDecimal.ZERO), fixScale(BigDecimal.valueOf(2000L))));
+ ret.setMaximumBalance(fixScale(BigDecimal.valueOf(2000L)));
ret.setTermRange(new TermRange(ChronoUnit.DAYS, 2));
ret.setPaymentCycle(new PaymentCycle(ChronoUnit.DAYS, 1, 1, null, null));
diff --git a/service/src/test/java/io/mifos/individuallending/internal/service/IndividualLoanServiceTest.java b/service/src/test/java/io/mifos/individuallending/internal/service/IndividualLoanServiceTest.java
index ff639b5..b43882c 100644
--- a/service/src/test/java/io/mifos/individuallending/internal/service/IndividualLoanServiceTest.java
+++ b/service/src/test/java/io/mifos/individuallending/internal/service/IndividualLoanServiceTest.java
@@ -131,7 +131,7 @@
final CaseParameters caseParameters = Fixture.getTestCaseParameters();
caseParameters.setTermRange(new TermRange(ChronoUnit.YEARS, 1));
caseParameters.setPaymentCycle(new PaymentCycle(ChronoUnit.MONTHS, 1, 0, null, null));
- caseParameters.setInitialBalance(BigDecimal.valueOf(200000));
+ caseParameters.setMaximumBalance(BigDecimal.valueOf(200000));
final Map<Action, List<ChargeDefinition>> chargeDefinitionsMappedByAction = new HashMap<>();
chargeDefinitionsMappedByAction.put(Action.APPLY_INTEREST, getInterestChargeDefinition(0.10, ChronoUnit.YEARS));
@@ -149,7 +149,7 @@
final CaseParameters caseParameters = Fixture.getTestCaseParameters();
caseParameters.setTermRange(new TermRange(ChronoUnit.MONTHS, 6));
caseParameters.setPaymentCycle(new PaymentCycle(ChronoUnit.WEEKS, 1, 1, 0, 0));
- caseParameters.setInitialBalance(BigDecimal.valueOf(2000));
+ caseParameters.setMaximumBalance(BigDecimal.valueOf(2000));
final Map<Action, List<ChargeDefinition>> chargeDefinitionsMappedByAction = new HashMap<>();
chargeDefinitionsMappedByAction.put(Action.APPLY_INTEREST, getInterestChargeDefinition(0.05, ChronoUnit.YEARS));
