saving account save api update
This commit is contained in:
-18
@@ -785,15 +785,6 @@ public final class SavingsAccountData implements Serializable {
|
||||
account.daysToDormancy, account.daysToEscheat, account.savingsAmountOnHold);
|
||||
copyPresentationFields(result, template);
|
||||
copyPresentationFields(result, account);
|
||||
result.setProductOptions(productOptions);
|
||||
result.setFieldOfficerOptions(fieldOfficerOptions);
|
||||
result.setInterestCompoundingPeriodTypeOptions(interestCompoundingPeriodTypeOptions);
|
||||
result.setInterestPostingPeriodTypeOptions(interestPostingPeriodTypeOptions);
|
||||
result.setInterestCalculationTypeOptions(interestCalculationTypeOptions);
|
||||
result.setInterestCalculationDaysInYearTypeOptions(interestCalculationDaysInYearTypeOptions);
|
||||
result.setLockinPeriodFrequencyTypeOptions(lockinPeriodFrequencyTypeOptions);
|
||||
result.setWithdrawalFeeTypeOptions(withdrawalFeeTypeOptions);
|
||||
result.setChargeOptions(chargeOptions);
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -824,15 +815,6 @@ public final class SavingsAccountData implements Serializable {
|
||||
account.isDormancyTrackingActive, account.daysToInactive, account.daysToDormancy, account.daysToEscheat,
|
||||
account.savingsAmountOnHold);
|
||||
copyPresentationFields(result, account);
|
||||
result.setProductOptions(productOptions);
|
||||
result.setFieldOfficerOptions(fieldOfficerOptions);
|
||||
result.setInterestCompoundingPeriodTypeOptions(interestCompoundingPeriodTypeOptions);
|
||||
result.setInterestPostingPeriodTypeOptions(interestPostingPeriodTypeOptions);
|
||||
result.setInterestCalculationTypeOptions(interestCalculationTypeOptions);
|
||||
result.setInterestCalculationDaysInYearTypeOptions(interestCalculationDaysInYearTypeOptions);
|
||||
result.setLockinPeriodFrequencyTypeOptions(lockinPeriodFrequencyTypeOptions);
|
||||
result.setWithdrawalFeeTypeOptions(withdrawalFeeTypeOptions);
|
||||
result.setChargeOptions(chargeOptions);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+16
-4
@@ -439,13 +439,25 @@ public class SavingsAccountAssembler {
|
||||
final JsonObject h = holdersArray.get(i).getAsJsonObject();
|
||||
final Long clientId = h.has("clientId") && !h.get("clientId").isJsonNull()
|
||||
? h.get("clientId").getAsLong() : null;
|
||||
final String cifNumber = h.has("cifNumber") ? h.get("cifNumber").getAsString() : null;
|
||||
final String displayName = h.has("displayName") ? h.get("displayName").getAsString() : null;
|
||||
final String cifNumber = h.has("cifNumber") && !h.get("cifNumber").isJsonNull()
|
||||
? h.get("cifNumber").getAsString() : null;
|
||||
final String displayName = h.has("displayName") && !h.get("displayName").isJsonNull()
|
||||
? h.get("displayName").getAsString() : null;
|
||||
final BigDecimal sharePercentage = h.has("sharePercentage") && !h.get("sharePercentage").isJsonNull()
|
||||
? h.get("sharePercentage").getAsBigDecimal() : null;
|
||||
final String signingAuthority = h.has("signingAuthority") ? h.get("signingAuthority").getAsString() : null;
|
||||
final String role = h.has("role") ? h.get("role").getAsString() : null;
|
||||
final boolean isPrimary = h.has("isPrimary") && h.get("isPrimary").getAsBoolean();
|
||||
String signingAuthority = h.has("signingAuthority") && !h.get("signingAuthority").isJsonNull()
|
||||
? h.get("signingAuthority").getAsString() : null;
|
||||
String role = h.has("role") && !h.get("role").isJsonNull()
|
||||
? h.get("role").getAsString() : null;
|
||||
|
||||
if (signingAuthority == null || signingAuthority.trim().isEmpty()) {
|
||||
signingAuthority = isPrimary ? "Mandatory" : "Optional";
|
||||
}
|
||||
if (role == null || role.trim().isEmpty()) {
|
||||
role = isPrimary ? "Primary Account Holder" : "Co-Holder";
|
||||
}
|
||||
|
||||
holders.add(new SavingsAccountJointHolder(account, clientId, cifNumber, displayName,
|
||||
sharePercentage, signingAuthority, role, isPrimary));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user