From 48c40b5170bcad125972f9f46b397febb283854b Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Thu, 3 Jan 2013 14:35:54 +0000 Subject: [PATCH] small change to michals create individual loan application from group context work. --- .../mifosplatform/portfolio/loanaccount/domain/Loan.java | 2 +- .../portfolio/loanaccount/service/LoanAssembler.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java index fa0b7d8ae..ce429dce5 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java @@ -223,7 +223,7 @@ public class Loan extends AbstractAuditableCustom { return new Loan(null, group, fund, officer, transactionProcessingStrategy, loanProduct, loanRepaymentScheduleDetail, status, loanCharges); } - public static Loan newMemberLoanApplication(final Client client, final Group group, final LoanProduct loanProduct, final Fund fund, + public static Loan newIndividualLoanApplicationFromGroup(final Client client, final Group group, final LoanProduct loanProduct, final Fund fund, final Staff officer, final LoanTransactionProcessingStrategy transactionProcessingStrategy, final LoanSchedule loanSchedule, final Set loanCharges) { final LoanStatus status = null; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAssembler.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAssembler.java index b71cd8f3f..2eb302c18 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAssembler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAssembler.java @@ -117,9 +117,11 @@ public class LoanAssembler { loanSchedule, loanCharges); } - if (clientId != null && groupId != null){ + if (client != null && group != null){ + if (!group.hasClientAsMember(client)) { throw new ClientNotInGroupException(clientId, groupId); } - loanApplication = Loan.newMemberLoanApplication(client, group, loanProduct, fund, loanOfficer, loanTransactionProcessingStrategy, + + loanApplication = Loan.newIndividualLoanApplicationFromGroup(client, group, loanProduct, fund, loanOfficer, loanTransactionProcessingStrategy, loanSchedule, loanCharges); }