MIFOSX-247: ensure summary and transactions shown as part of retrieve savings account.

api-docs/apiLive.htm

@@ -7391,13 +7391,12 @@ Request Body:
 	        <code class="method-response">
 {
   "id": 1,
-  "accountNo": "SA000023",
+  "accountNo": "000000002",
-  "externalId": "SYS-23",
   "groupId": 0,
   "clientId": 1,
-  "clientName": "Client A AB",
+  "clientName": "Test b Client",
   "savingsProductId": 1,
-  "savingsProductName": "First",
+  "savingsProductName": "individual savings",
   "currency": {
     "code": "USD",
     "name": "US Dollar",
@@ -7406,19 +7405,25 @@ Request Body:
     "nameCode": "currency.USD",
     "displayLabel": "US Dollar ($)"
   },
-  "interestRate": 5.65,
+  "interestRate": 9.8,
   "interestRatePeriodFrequencyType": {
-    "id": 2,
+    "id": 3,
-    "code": "savings.interest.rate.periodFrequencyType.months",
+    "code": "savings.interest.rate.periodFrequencyType.years",
-    "value": "Per month"
+    "value": "Per year"
   },
-  "annualInterestRate": 67.8,
+  "annualInterestRate": 9.8,
-  "minRequiredOpeningBalance": 1000,
+  "summary": {
-  "lockinPeriodFrequency": 6,
+    "currency": {
-  "lockinPeriodFrequencyType": {
+      "code": "USD",
-    "id": 2,
+      "name": "US Dollar",
-    "code": "savings.interest.rate.periodFrequencyType.months",
+      "decimalPlaces": 2,
-    "value": "Per month"
+      "displaySymbol": "$",
+      "nameCode": "currency.USD",
+      "displayLabel": "US Dollar ($)"
+    },
+    "totalDeposits": 456.67,
+    "totalWithdrawals": 173,
+    "accountBalance": 283.67
   }
 }
 	        </code>

mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsApiConstants.java

@@ -16,7 +16,7 @@ public class SavingsApiConstants {
     // general
     public static final String localeParamName = "locale";
     public static final String dateFormatParamName = "dateFormat";
-    
+
     // savings product and account parameters
     public static final String idParamName = "id";
     public static final String accountNoParamName = "accountNo";
@@ -37,7 +37,7 @@ public class SavingsApiConstants {
     // transaction parameters
     public static final String transactionDateParamName = "transactionDate";
     public static final String transactionAmountParamName = "transactionAmount";
-    
+
     public static final Set<String> SAVINGS_PRODUCT_REQUEST_DATA_PARAMETERS = new HashSet<String>(Arrays.asList(localeParamName,
             nameParamName, descriptionParamName, currencyCodeParamName, digitsAfterDecimalParamName, interestRateParamName,
             interestRatePeriodFrequencyTypeParamName, minRequiredOpeningBalanceParamName, lockinPeriodFrequencyParamName,
@@ -67,8 +67,8 @@ public class SavingsApiConstants {
     public static final Set<String> SAVINGS_ACCOUNT_RESPONSE_DATA_PARAMETERS = new HashSet<String>(Arrays.asList(idParamName,
             accountNoParamName, externalIdParamName, clientIdParamName, "clientName", groupIdParamName, "groupName", "savingsProductId",
             "savingsProductName", "currency", interestRateParamName, interestRatePeriodFrequencyTypeParamName, "annualInterestRate",
-            minRequiredOpeningBalanceParamName, lockinPeriodFrequencyParamName, lockinPeriodFrequencyTypeParamName, "productOptions",
+            minRequiredOpeningBalanceParamName, lockinPeriodFrequencyParamName, lockinPeriodFrequencyTypeParamName, "summary",
-            "interestRatePeriodFrequencyTypeOptions", "lockinPeriodFrequencyTypeOptions"));
+            "transactions", "productOptions", "interestRatePeriodFrequencyTypeOptions", "lockinPeriodFrequencyTypeOptions"));
 
     public static final Set<String> SAVINGS_ACCOUNT_TRANSACTION_REQUEST_DATA_PARAMETERS = new HashSet<String>(Arrays.asList(
             localeParamName, dateFormatParamName, transactionDateParamName, transactionAmountParamName));