From b438747608f6cdb88e31d08e9cec42894b6ff89a Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Thu, 13 Sep 2012 15:02:37 +0100 Subject: [PATCH] update data parameter repaymentStrategyOptions --- .../platform/api/LoansApiResource.java | 24 ++++++++++--------- .../platform/api/data/LoanAccountData.java | 4 ++-- .../GoogleGsonApiJsonSerializerService.java | 2 +- 3 files changed, 16 insertions(+), 14 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 758f04de8..8d8e1028f 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 @@ -129,7 +129,7 @@ public class LoansApiResource { boolean prettyPrint = ApiParameterHelper.prettyPrint(uriInfo.getQueryParameters()); responseParameters.addAll(Arrays.asList("productOptions", "amortizationTypeOptions", "interestTypeOptions", "interestCalculationPeriodTypeOptions", - "repaymentFrequencyTypeOptions", "interestRateFrequencyTypeOptions", "fundOptions", "transactionProcessingStrategyOptions", "chargeOptions", + "repaymentFrequencyTypeOptions", "interestRateFrequencyTypeOptions", "fundOptions", "repaymentStrategyOptions", "chargeOptions", "chargeTemplate")); // tempate related @@ -143,7 +143,7 @@ public class LoansApiResource { CollectioninterestCalculationPeriodTypeOptions = dropdownReadPlatformService.retrieveLoanInterestRateCalculatedInPeriodOptions(); Collection fundOptions = this.fundReadPlatformService.retrieveAllFunds(); - Collection transactionProcessingStrategyOptions = this.dropdownReadPlatformService.retreiveTransactionProcessingStrategies(); + Collection repaymentStrategyOptions = this.dropdownReadPlatformService.retreiveTransactionProcessingStrategies(); Collection chargeOptions = this.chargeReadPlatformService.retrieveLoanApplicableCharges(); ChargeData chargeTemplate = this.chargeReadPlatformService.retrieveLoanChargeTemplate(); @@ -161,7 +161,7 @@ public class LoansApiResource { final LoanAccountData newLoanAccount = new LoanAccountData(loanBasicDetails, convenienceDataRequired, null, null, null, null, charges, productOptions, loanTermFrequencyTypeOptions, repaymentFrequencyTypeOptions, - transactionProcessingStrategyOptions, interestRateFrequencyTypeOptions, + repaymentStrategyOptions, interestRateFrequencyTypeOptions, amortizationTypeOptions, interestTypeOptions, interestCalculationPeriodTypeOptions, fundOptions, chargeOptions, chargeTemplate, allowedLoanOfficers); return this.apiJsonSerializerService.serialzieLoanAccountDataToJson(prettyPrint, responseParameters, newLoanAccount); @@ -227,9 +227,9 @@ public class LoansApiResource { } Collection productOptions = new ArrayList(); - Collection loanTermFrequencyTypeOptions = new ArrayList(); + Collection loanTermFrequencyTypeOptions = null; Collection repaymentFrequencyTypeOptions = new ArrayList(); - Collection transactionProcessingStrategyOptions = new ArrayList(); + Collection repaymentStrategyOptions = null; Collection interestRateFrequencyTypeOptions = new ArrayList(); Collection amortizationTypeOptions = new ArrayList(); @@ -242,10 +242,12 @@ public class LoansApiResource { final boolean template = ApiParameterHelper.template(uriInfo.getQueryParameters()); if(template) { - responseParameters.addAll(Arrays.asList("productOptions", "amortizationTypeOptions", "interestTypeOptions", "interestCalculationPeriodTypeOptions", - "repaymentFrequencyTypeOptions", "interestRateFrequencyTypeOptions", "fundOptions", "transactionProcessingStrategyOptions", "chargeOptions", - "loanOfficerOptions", "chargeTemplate")); - + responseParameters.addAll( + Arrays.asList("productOptions", "amortizationTypeOptions", "interestTypeOptions", "interestCalculationPeriodTypeOptions", + "repaymentFrequencyTypeOptions", "interestRateFrequencyTypeOptions", "fundOptions", + "repaymentStrategyOptions", "chargeOptions", "loanOfficerOptions") + ); + productOptions = this.loanProductReadPlatformService.retrieveAllLoanProductsForLookup(); loanTermFrequencyTypeOptions = dropdownReadPlatformService.retrieveLoanTermFrequencyTypeOptions(); repaymentFrequencyTypeOptions = dropdownReadPlatformService.retrieveRepaymentFrequencyTypeOptions(); @@ -256,7 +258,7 @@ public class LoansApiResource { interestCalculationPeriodTypeOptions = dropdownReadPlatformService.retrieveLoanInterestRateCalculatedInPeriodOptions(); fundOptions = this.fundReadPlatformService.retrieveAllFunds(); - transactionProcessingStrategyOptions = this.dropdownReadPlatformService.retreiveTransactionProcessingStrategies(); + repaymentStrategyOptions = this.dropdownReadPlatformService.retreiveTransactionProcessingStrategies(); chargeOptions = this.chargeReadPlatformService.retrieveLoanApplicableCharges(); if (charges != null) { chargeOptions.removeAll(charges); @@ -267,7 +269,7 @@ public class LoansApiResource { final LoanAccountData loanAccount = new LoanAccountData(loanBasicDetails, convenienceDataRequired, summary, repaymentSchedule, loanRepayments, permissions, charges, productOptions, loanTermFrequencyTypeOptions, repaymentFrequencyTypeOptions, - transactionProcessingStrategyOptions, interestRateFrequencyTypeOptions, + repaymentStrategyOptions, interestRateFrequencyTypeOptions, amortizationTypeOptions, interestTypeOptions, interestCalculationPeriodTypeOptions, fundOptions, chargeOptions, chargeTemplate, allowedLoanOfficers); return this.apiJsonSerializerService.serialzieLoanAccountDataToJson(prettyPrint, responseParameters, loanAccount); diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java index c58c764b7..464beafd2 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/data/LoanAccountData.java @@ -84,7 +84,7 @@ public class LoanAccountData { final Collection productOptions, final Collection termFrequencyTypeOptions, final Collection repaymentFrequencyTypeOptions, - final Collection transactionProcessingStrategyOptions, + final Collection repaymentStrategyOptions, final Collection interestRateFrequencyTypeOptions, final Collection amortizationTypeOptions, final Collection interestTypeOptions, @@ -101,7 +101,7 @@ public class LoanAccountData { this.productOptions = productOptions; this.termFrequencyTypeOptions = termFrequencyTypeOptions; this.repaymentFrequencyTypeOptions = repaymentFrequencyTypeOptions; - this.repaymentStrategyOptions = transactionProcessingStrategyOptions; + this.repaymentStrategyOptions = repaymentStrategyOptions; this.interestRateFrequencyTypeOptions = interestRateFrequencyTypeOptions; this.amortizationTypeOptions = amortizationTypeOptions; this.interestTypeOptions = interestTypeOptions; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonApiJsonSerializerService.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonApiJsonSerializerService.java index f99c6756f..eb5de371a 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonApiJsonSerializerService.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/GoogleGsonApiJsonSerializerService.java @@ -150,7 +150,7 @@ public class GoogleGsonApiJsonSerializerService implements ApiJsonSerializerServ "lifeCycleStatusDate", "summary", "repaymentSchedule", "loanRepayments", "permissions", "convenienceData", "charges", "productOptions", "amortizationTypeOptions", "interestTypeOptions", "interestCalculationPeriodTypeOptions", - "repaymentFrequencyTypeOptions", "interestRateFrequencyTypeOptions", "fundOptions", "transactionProcessingStrategyOptions", "chargeOptions", + "repaymentFrequencyTypeOptions", "interestRateFrequencyTypeOptions", "fundOptions", "repaymentStrategyOptions", "chargeOptions", "loanOfficerId", "loanOfficerName", "loanOfficerOptions", "chargeTemplate")); private static final Set LOAN_TRANSACTION_DATA_PARAMETERS = new HashSet(