From 59e19e005e4a9a32635bf2c8493eeb88e1c6c722 Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Tue, 25 Sep 2012 09:47:38 +0100
Subject: [PATCH] mifosx-58: add interest repayment and total repayment details
 correctly to new loan schedule been returned.

---
 .../platform/api/LoansApiResource.java        | 19 ++++++++-------
 .../api/data/LoanSchedulePeriodData.java      | 24 ++++++++++++-------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java
index 45cca82b3..772e6196c 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java
@@ -188,6 +188,7 @@ public class LoansApiResource {
         boolean convenienceDataRequired = false;
 		final Set<String> associationParameters = ApiParameterHelper.extractAssociationsForResponseIfProvided(uriInfo.getQueryParameters());
 		if (!associationParameters.isEmpty()) {
+			
 			if (associationParameters.contains("all")) {
 				responseParameters.addAll(Arrays.asList("repaymentSchedule", "loanRepayments", "permissions", "convenienceData", "charges"));
 			} else {
@@ -200,16 +201,18 @@ public class LoansApiResource {
 				loanRepaymentsCount = loanRepayments.size();
 			}
 			
-			DisbursementData singleDisbursement = loanBasicDetails.toDisburementData();
-			repaymentSchedule = this.loanReadPlatformService.retrieveRepaymentSchedule(loanId, loanBasicDetails.getCurrency(), 
+			if (responseParameters.contains("repaymentSchedule")) {
+				DisbursementData singleDisbursement = loanBasicDetails.toDisburementData();
+				repaymentSchedule = this.loanReadPlatformService.retrieveRepaymentSchedule(loanId, loanBasicDetails.getCurrency(), 
 					singleDisbursement, loanBasicDetails.getTotalDisbursementCharges(), loanBasicDetails.getInArrearsTolerance());
+				
+				MoneyData tolerance = MoneyData.of(loanBasicDetails.getCurrency(), loanBasicDetails.getInArrearsTolerance());
+				MoneyData totalOutstandingMoney = MoneyData.of(loanBasicDetails.getCurrency(), repaymentSchedule.totalOutstanding());
+				boolean isWaiveAllowed = totalOutstandingMoney.isGreaterThanZero() && (tolerance.isGreaterThan(totalOutstandingMoney) || tolerance.isEqualTo(totalOutstandingMoney));
 
-			MoneyData tolerance = MoneyData.of(loanBasicDetails.getCurrency(), loanBasicDetails.getInArrearsTolerance());
-			MoneyData totalOutstandingMoney = MoneyData.of(loanBasicDetails.getCurrency(), repaymentSchedule.totalOutstanding());
-			boolean isWaiveAllowed = totalOutstandingMoney.isGreaterThanZero() && (tolerance.isGreaterThan(totalOutstandingMoney) || tolerance.isEqualTo(totalOutstandingMoney));
-
-			permissions = this.loanReadPlatformService.retrieveLoanPermissions(loanBasicDetails, isWaiveAllowed, loanRepaymentsCount);
-			convenienceDataRequired = true;
+				permissions = this.loanReadPlatformService.retrieveLoanPermissions(loanBasicDetails, isWaiveAllowed, loanRepaymentsCount);
+				convenienceDataRequired = true;
+			}
 			
             charges = this.chargeReadPlatformService.retrieveLoanCharges(loanId);
             if (CollectionUtils.isEmpty(charges)) {
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanSchedulePeriodData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanSchedulePeriodData.java
index 47dd80435..05bb31368 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanSchedulePeriodData.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanSchedulePeriodData.java
@@ -77,8 +77,8 @@ public class LoanSchedulePeriodData {
 		
 		return new LoanSchedulePeriodData(periodNumber, fromDate, dueDate, 
 				principalOriginalDue, principalPaid, principalOutstanding, outstandingPrincipalBalanceOfLoan, 
-				interestDueOnPrincipalOutstanding, 
-				totalDueForPeriod);
+				interestDueOnPrincipalOutstanding, interestPaid, interestWaived, interestOutstanding,
+				totalDueForPeriod, totalPaid, totalWaived, totalOutstanding);
 	}
 	
 	/*
@@ -184,7 +184,13 @@ public class LoanSchedulePeriodData {
 			final BigDecimal principalOutstanding, 
 			final BigDecimal principalLoanBalanceOutstanding, 
 			final BigDecimal interestDueOnPrincipalOutstanding, 
-			final BigDecimal totalDueForPeriod) {
+			final BigDecimal interestPaid,
+			final BigDecimal interestWaived, 
+			final BigDecimal interestOutstanding,
+			final BigDecimal totalDueForPeriod,
+			final BigDecimal totalPaid, 
+			final BigDecimal totalWaived,
+			final BigDecimal totalOutstanding) {
 		this.period = periodNumber;
 		this.fromDate = fromDate;
 		this.dueDate = dueDate;
@@ -202,9 +208,9 @@ public class LoanSchedulePeriodData {
 		
 		this.interestOriginalDue = interestDueOnPrincipalOutstanding;
 		this.interestDue = interestDueOnPrincipalOutstanding;
-		this.interestPaid = BigDecimal.ZERO;
-		this.interestWaived = BigDecimal.ZERO;
-		this.interestOutstanding = interestDueOnPrincipalOutstanding;
+		this.interestPaid = interestPaid;
+		this.interestWaived = interestWaived;
+		this.interestOutstanding = interestOutstanding;
 	
 		this.chargesDue = BigDecimal.ZERO;
 		this.chargesPaid = BigDecimal.ZERO;
@@ -212,9 +218,9 @@ public class LoanSchedulePeriodData {
 		
 		this.totalOriginalDueForPeriod = totalDueForPeriod;
 		this.totalDueForPeriod = totalDueForPeriod;
-		this.totalPaidForPeriod = BigDecimal.ZERO;
-		this.totalWaivedForPeriod = BigDecimal.ZERO;
-		this.totalOutstandingForPeriod = totalDueForPeriod;
+		this.totalPaidForPeriod = totalPaid;
+		this.totalWaivedForPeriod = totalWaived;
+		this.totalOutstandingForPeriod = totalOutstanding;
 		
 		if (dueDate.isBefore(new LocalDate())) {
 			this.totalOverdue = this.totalOutstandingForPeriod;