commit 9388eb0280a4beafcd5387139e8e0358de139118
author Markus Geiss <markus.geiss@kuelap.io> Wed Sep 27 07:42:31 2017 +0200
committer GitHub <noreply@github.com> Wed Sep 27 07:42:31 2017 +0200
tree 20c5d4990935dc37259e0f8d027f17f20a1c7a3b
parent 0362703be50757b77c55322e4dc9059f57541808
parent 3c848f005f510e026d1d9cfadb3505f93f42a8d0

Merge pull request #4 from markusgeiss/develop

accrued interest will be payed even if product is not active

service/src/main/java/io/mifos/deposit/service/internal/command/handler/InterestCalculator.java

diff --git a/service/src/main/java/io/mifos/deposit/service/internal/command/handler/InterestCalculator.java b/service/src/main/java/io/mifos/deposit/service/internal/command/handler/InterestCalculator.java
index 4ac279d..8f8ffd4 100644
--- a/service/src/main/java/io/mifos/deposit/service/internal/command/handler/InterestCalculator.java
+++ b/service/src/main/java/io/mifos/deposit/service/internal/command/handler/InterestCalculator.java
@@ -210,44 +210,42 @@
               this.productInstanceRepository.findByProductDefinition(productDefinitionEntity);
 
           productInstanceEntities.forEach(productInstanceEntity -> {
-            if (productInstanceEntity.getState().equals(ACTIVE)) {
-              final Optional<AccruedInterestEntity> optionalAccruedInterestEntity =
-                  this.accruedInterestRepository.findByCustomerAccountIdentifier(productInstanceEntity.getAccountIdentifier());
+            final Optional<AccruedInterestEntity> optionalAccruedInterestEntity =
+                this.accruedInterestRepository.findByCustomerAccountIdentifier(productInstanceEntity.getAccountIdentifier());
 
-              if (optionalAccruedInterestEntity.isPresent()) {
-                final AccruedInterestEntity accruedInterestEntity = optionalAccruedInterestEntity.get();
+            if (optionalAccruedInterestEntity.isPresent()) {
+              final AccruedInterestEntity accruedInterestEntity = optionalAccruedInterestEntity.get();
 
-                final String roundedAmount =
-                    BigDecimal.valueOf(accruedInterestEntity.getAmount())
-                        .setScale(2, BigDecimal.ROUND_HALF_EVEN).toString();
+              final String roundedAmount =
+                  BigDecimal.valueOf(accruedInterestEntity.getAmount())
+                      .setScale(2, BigDecimal.ROUND_HALF_EVEN).toString();
 
-                final JournalEntry accrueToExpenseJournalEntry = new JournalEntry();
-                accrueToExpenseJournalEntry.setTransactionIdentifier(RandomStringUtils.randomAlphanumeric(32));
-                accrueToExpenseJournalEntry.setTransactionDate(DateConverter.toIsoString(LocalDateTime.now(Clock.systemUTC())));
-                accrueToExpenseJournalEntry.setTransactionType("INTR");
-                accrueToExpenseJournalEntry.setClerk(UserContextHolder.checkedGetUser());
-                accrueToExpenseJournalEntry.setNote("Interest paid.");
+              final JournalEntry accrueToExpenseJournalEntry = new JournalEntry();
+              accrueToExpenseJournalEntry.setTransactionIdentifier(RandomStringUtils.randomAlphanumeric(32));
+              accrueToExpenseJournalEntry.setTransactionDate(DateConverter.toIsoString(LocalDateTime.now(Clock.systemUTC())));
+              accrueToExpenseJournalEntry.setTransactionType("INTR");
+              accrueToExpenseJournalEntry.setClerk(UserContextHolder.checkedGetUser());
+              accrueToExpenseJournalEntry.setNote("Interest paid.");
 
-                final Debtor accrueDebtor = new Debtor();
-                accrueDebtor.setAccountNumber(accruedInterestEntity.getAccrueAccountIdentifier());
-                accrueDebtor.setAmount(roundedAmount);
-                accrueToExpenseJournalEntry.setDebtors(Sets.newHashSet(accrueDebtor));
+              final Debtor accrueDebtor = new Debtor();
+              accrueDebtor.setAccountNumber(accruedInterestEntity.getAccrueAccountIdentifier());
+              accrueDebtor.setAmount(roundedAmount);
+              accrueToExpenseJournalEntry.setDebtors(Sets.newHashSet(accrueDebtor));
 
-                final Creditor expenseCreditor = new Creditor();
-                expenseCreditor.setAccountNumber(productDefinitionEntity.getExpenseAccountIdentifier());
-                expenseCreditor.setAmount(roundedAmount);
-                accrueToExpenseJournalEntry.setCreditors(Sets.newHashSet(expenseCreditor));
+              final Creditor expenseCreditor = new Creditor();
+              expenseCreditor.setAccountNumber(productDefinitionEntity.getExpenseAccountIdentifier());
+              expenseCreditor.setAmount(roundedAmount);
+              accrueToExpenseJournalEntry.setCreditors(Sets.newHashSet(expenseCreditor));
 
-                this.accruedInterestRepository.delete(accruedInterestEntity);
+              this.accruedInterestRepository.delete(accruedInterestEntity);
 
-                this.accountingService.post(accrueToExpenseJournalEntry);
+              this.accountingService.post(accrueToExpenseJournalEntry);
 
-                this.payoutInterest(
-                    productDefinitionEntity.getExpenseAccountIdentifier(),
-                    accruedInterestEntity.getCustomerAccountIdentifier(),
-                    roundedAmount
-                );
-              }
+              this.payoutInterest(
+                  productDefinitionEntity.getExpenseAccountIdentifier(),
+                  accruedInterestEntity.getCustomerAccountIdentifier(),
+                  roundedAmount
+              );
             }
           });
         }