From 5b909305c26af082d31053b626e7a3464de63f62 Mon Sep 17 00:00:00 2001 From: Christy Ninan Date: Fri, 18 Jul 2014 11:59:27 -0500 Subject: [PATCH] MIFOSX-1395 - Add Loan/Savings Product Short Name in ClientAccounts Response --- .../accountdetails/data/LoanAccountSummaryData.java | 4 +++- .../accountdetails/data/SavingsAccountSummaryData.java | 4 +++- ...untDetailsReadPlatformServiceJpaRepositoryImpl.java | 10 ++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/data/LoanAccountSummaryData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/data/LoanAccountSummaryData.java index 06e864746..b05126687 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/data/LoanAccountSummaryData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/data/LoanAccountSummaryData.java @@ -20,6 +20,7 @@ public class LoanAccountSummaryData { private final String externalId; private final Long productId; private final String productName; + private final String shortProductName; private final LoanStatusEnumData status; private final EnumOptionData loanType; private final Integer loanCycle; @@ -27,13 +28,14 @@ public class LoanAccountSummaryData { private final Boolean inArrears; public LoanAccountSummaryData(final Long id, final String accountNo, final String externalId, final Long productId, - final String loanProductName, final LoanStatusEnumData loanStatus, final EnumOptionData loanType, final Integer loanCycle, + final String loanProductName, final String shortLoanProductName, final LoanStatusEnumData loanStatus, final EnumOptionData loanType, final Integer loanCycle, final LoanApplicationTimelineData timeline, final Boolean inArrears) { this.id = id; this.accountNo = accountNo; this.externalId = externalId; this.productId = productId; this.productName = loanProductName; + this.shortProductName = shortLoanProductName; this.status = loanStatus; this.loanType = loanType; this.loanCycle = loanCycle; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/data/SavingsAccountSummaryData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/data/SavingsAccountSummaryData.java index db0063982..6b9087428 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/data/SavingsAccountSummaryData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/data/SavingsAccountSummaryData.java @@ -23,6 +23,7 @@ public class SavingsAccountSummaryData { private final String externalId; private final Long productId; private final String productName; + private final String shortProductName; private final SavingsAccountStatusEnumData status; private final CurrencyData currency; private final BigDecimal accountBalance; @@ -34,13 +35,14 @@ public class SavingsAccountSummaryData { private final EnumOptionData depositType; public SavingsAccountSummaryData(final Long id, final String accountNo, final String externalId, final Long productId, - final String productName, final SavingsAccountStatusEnumData status, final CurrencyData currency, + final String productName, final String shortProductName, final SavingsAccountStatusEnumData status, final CurrencyData currency, final BigDecimal accountBalance, final EnumOptionData accountType, final SavingsAccountApplicationTimelineData timeline, final EnumOptionData depositType) { this.id = id; this.accountNo = accountNo; this.externalId = externalId; this.productId = productId; this.productName = productName; + this.shortProductName = shortProductName; this.status = status; this.currency = currency; this.accountBalance = accountBalance; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java index 1e5d64347..ff52f39ce 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java @@ -141,7 +141,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou .append("sa.currency_code as currencyCode, sa.currency_digits as currencyDigits, sa.currency_multiplesof as inMultiplesOf, "); accountsSummary.append("curr.name as currencyName, curr.internationalized_name_code as currencyNameCode, "); accountsSummary.append("curr.display_symbol as currencyDisplaySymbol, "); - accountsSummary.append("sa.product_id as productId, p.name as productName, "); + accountsSummary.append("sa.product_id as productId, p.name as productName, p.short_name as shortProductName, "); accountsSummary.append("sa.deposit_type_enum as depositType "); accountsSummary.append("from m_savings_account sa "); accountsSummary.append("join m_savings_product as p on p.id = sa.product_id "); @@ -168,6 +168,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou final String externalId = rs.getString("externalId"); final Long productId = JdbcSupport.getLong(rs, "productId"); final String productName = rs.getString("productName"); + final String shortProductName = rs.getString("shortProductName"); final Integer statusId = JdbcSupport.getInteger(rs, "statusEnum"); final BigDecimal accountBalance = JdbcSupport.getBigDecimalDefaultToNullIfZero(rs, "accountBalance"); final SavingsAccountStatusEnumData status = SavingsEnumerations.status(statusId); @@ -222,7 +223,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou activatedByUsername, activatedByFirstname, activatedByLastname, closedOnDate, closedByUsername, closedByFirstname, closedByLastname); - return new SavingsAccountSummaryData(id, accountNo, externalId, productId, productName, status, currency, accountBalance, + return new SavingsAccountSummaryData(id, accountNo, externalId, productId, productName, shortProductName, status, currency, accountBalance, accountTypeData, timeline, depositTypeData); } } @@ -233,7 +234,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou final StringBuilder accountsSummary = new StringBuilder("l.id as id, l.account_no as accountNo, l.external_id as externalId,"); accountsSummary - .append(" l.product_id as productId, lp.name as productName,") + .append(" l.product_id as productId, lp.name as productName, lp.short_name as shortProductName,") .append(" l.loan_status_id as statusId, l.loan_type_enum as loanType,") .append(" l.loan_product_counter as loanCycle,") @@ -277,6 +278,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou final String externalId = rs.getString("externalId"); final Long productId = JdbcSupport.getLong(rs, "productId"); final String loanProductName = rs.getString("productName"); + final String shortLoanProductName = rs.getString("shortProductName"); final Integer loanStatusId = JdbcSupport.getInteger(rs, "statusId"); final LoanStatusEnumData loanStatus = LoanEnumerations.status(loanStatusId); final Integer loanTypeId = JdbcSupport.getInteger(rs, "loanType"); @@ -331,7 +333,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou disbursedByFirstname, disbursedByLastname, closedOnDate, closedByUsername, closedByFirstname, closedByLastname, expectedMaturityDate, writtenOffOnDate, closedByUsername, closedByFirstname, closedByLastname); - return new LoanAccountSummaryData(id, accountNo, externalId, productId, loanProductName, loanStatus, loanType, loanCycle, + return new LoanAccountSummaryData(id, accountNo, externalId, productId, loanProductName, shortLoanProductName, loanStatus, loanType, loanCycle, timeline, inArrears); } }