CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

Merge pull request #996 from vishwasbabu/develop

Browse Source 
cleaning up MIFOSX-1399
This commit is contained in:
Vishwas Babu A J
2014-07-02 14:47:14 -07:00
parent 78284b8115 6a14031ac3
commit a30f46f5d8
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java
+11 -2
View File
@@ -79,10 +79,19 @@ public class GuarantorWritePlatformServiceJpaRepositoryIImpl implements Guaranto
final List<Guarantor> existGuarantorList = this.guarantorRepository.findByLoan(loan); final List<Guarantor> existGuarantorList = this.guarantorRepository.findByLoan(loan);
final Long entityId = guarantorCommand.getEntityId(); final Long entityId = guarantorCommand.getEntityId();
final Integer guarantorTypeId = guarantorCommand.getGuarantorTypeId();
for (final Guarantor guarantor : existGuarantorList) { for (final Guarantor guarantor : existGuarantorList) {
if (guarantor.getLoanId() == loanId && entityId !=null && guarantor.getEntityId() == entityId) { if (guarantor.getLoanId() == loanId && entityId != null && guarantor.getEntityId() == entityId
String defaultUserMessage = this.clientRepositoryWrapper.findOneWithNotFoundDetection(entityId).getDisplayName(); && guarantor.getGurantorType() == guarantorTypeId) {
/** Get the right guarantor based on guarantorType **/
String defaultUserMessage = null;
if (guarantorTypeId == GuarantorType.STAFF.getValue()) {
defaultUserMessage = this.staffRepositoryWrapper.findOneWithNotFoundDetection(entityId).displayName();
} else {
defaultUserMessage = this.clientRepositoryWrapper.findOneWithNotFoundDetection(entityId).getDisplayName();
}
defaultUserMessage = defaultUserMessage + " is already exist as a guarantor for this loan"; defaultUserMessage = defaultUserMessage + " is already exist as a guarantor for this loan";
final String action = loan.client() != null ? "client.guarantor" : "group.guarantor"; final String action = loan.client() != null ? "client.guarantor" : "group.guarantor";
throw new DuplicateGuarantorException(action, "is.already.exist.same.loan", defaultUserMessage, entityId, loanId); throw new DuplicateGuarantorException(action, "is.already.exist.same.loan", defaultUserMessage, entityId, loanId);