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 5483af5e9..4c97c19f9 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 @@ -94,6 +94,23 @@ public class LoansApiResource { @Autowired private StaffReadPlatformService staffReadPlatformService; + private final static Set typicalResponseParameters = new HashSet( + Arrays.asList("id", "externalId", "clientId", "clientName", "fundId", "fundName", + "loanProductId", "loanProductName", "loanProductDescription", + "loanOfficerName", "loanOfficerId", + "currency", "principal", + "inArrearsTolerance", "numberOfRepayments", + "repaymentEvery", "interestRatePerPeriod", + "annualInterestRate", "repaymentFrequencyType", + "interestRateFrequencyType", "amortizationType", + "interestType", "interestCalculationPeriodType", + "submittedOnDate", "approvedOnDate", + "expectedDisbursementDate", "actualDisbursementDate", + "expectedFirstRepaymentOnDate", "interestChargedFromDate", + "closedOnDate", "expectedMaturityDate", + "status", + "lifeCycleStatusDate")); + @GET @Path("template") @Consumes({ MediaType.APPLICATION_JSON }) @@ -103,24 +120,6 @@ public class LoansApiResource { @QueryParam("productId") final Long productId, @Context final UriInfo uriInfo) { - Set typicalResponseParameters = new HashSet( - Arrays.asList("id", "externalId", "clientId", "clientName", "fundId", "fundName", - "loanProductId", "loanProductName", "loanProductDescription", - "currency", "principal", - "inArrearsTolerance", "numberOfRepayments", - "repaymentEvery", "interestRatePerPeriod", - "annualInterestRate", "repaymentFrequencyType", - "interestRateFrequencyType", "amortizationType", - "interestType", "interestCalculationPeriodType", - "submittedOnDate", "approvedOnDate", - "expectedDisbursementDate", "actualDisbursementDate", - "expectedFirstRepaymentOnDate", "interestChargedFromDate", - "closedOnDate", "expectedMaturityDate", - "status", - "lifeCycleStatusDate", "summary", "repaymentSchedule", - "loanRepayments", "permissions", "convenienceData", "charges", - "loanOfficerOptions") - ); Set responseParameters = ApiParameterHelper.extractFieldsForResponseIfProvided(uriInfo.getQueryParameters()); if (responseParameters.isEmpty()) { @@ -156,7 +155,6 @@ public class LoansApiResource { final boolean convenienceDataRequired = false; Collection charges = loanBasicDetails.getCharges(); - // populate loan officers if query param is passed in Collection allowedLoanOfficers = this.staffReadPlatformService.retrieveAllLoanOfficersByOffice(loanBasicDetails.getClientOfficeId()); final LoanAccountData newLoanAccount = new LoanAccountData(loanBasicDetails, convenienceDataRequired, null, null, null, charges, @@ -175,17 +173,6 @@ public class LoansApiResource { @PathParam("loanId") final Long loanId, @Context final UriInfo uriInfo) { - Set typicalResponseParameters = new HashSet( - Arrays.asList("id", "externalId", "clientId", "clientName", "fundId", "fundName", "loanProductId", "loanProductName", "loanProductDescription", - "currency", - "principal", "inArrearsTolerance", "numberOfRepayments", - "repaymentEvery", "interestRatePerPeriod", "annualInterestRate", - "repaymentFrequencyType", "interestRateFrequencyType", "amortizationType", "interestType", "interestCalculationPeriodType", - "submittedOnDate", "approvedOnDate", "expectedDisbursementDate", "actualDisbursementDate", - "expectedFirstRepaymentOnDate", "interestChargedFromDate", "closedOnDate", "expectedMaturityDate", - "status", "lifeCycleStatusDate", "loanOfficerName", "loanOfficerId") - ); - Set responseParameters = ApiParameterHelper.extractFieldsForResponseIfProvided(uriInfo.getQueryParameters()); if (responseParameters.isEmpty()) { responseParameters.addAll(typicalResponseParameters);