You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by al...@apache.org on 2022/03/24 14:28:21 UTC
[fineract] branch develop updated: Allow externalId to be provided when creating loan charges
This is an automated email from the ASF dual-hosted git repository.
aleks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new b0e37c2 Allow externalId to be provided when creating loan charges
b0e37c2 is described below
commit b0e37c24eb97e6154c75d742b2c58ec9da675ea3
Author: John Woodlock <jo...@gmail.com>
AuthorDate: Wed Mar 23 12:44:48 2022 +0000
Allow externalId to be provided when creating loan charges
---
.../portfolio/loanaccount/data/LoanChargeData.java | 11 +-
.../portfolio/loanaccount/domain/LoanCharge.java | 23 ++-
.../handler/AddLoanChargeCommandHandler.java | 32 +++-
.../serialization/LoanEventApiJsonValidator.java | 3 +-
.../service/LoanChargeReadPlatformServiceImpl.java | 9 +-
.../db/changelog/tenant/changelog-tenant.xml | 1 +
.../0008_loan_charge_add_external_id.xml} | 12 +-
.../ClientLoanChargeExternalIntegrationTest.java | 181 +++++++++++++++++++++
.../common/loans/LoanTransactionHelper.java | 9 +-
9 files changed, 265 insertions(+), 16 deletions(-)
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanChargeData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanChargeData.java
index d29a906..090f256 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanChargeData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanChargeData.java
@@ -81,6 +81,8 @@ public class LoanChargeData {
private BigDecimal amountUnrecognized;
+ private String externalId;
+
public static LoanChargeData template(final Collection<ChargeData> chargeOptions) {
return new LoanChargeData(null, null, null, null, null, null, null, null, chargeOptions, false, null, false, false, null, null,
null, null, null);
@@ -103,7 +105,7 @@ public class LoanChargeData {
final EnumOptionData chargeCalculationType, final BigDecimal percentage, final BigDecimal amountPercentageAppliedTo,
final boolean penalty, final EnumOptionData chargePaymentMode, final boolean paid, final boolean waived, final Long loanId,
final BigDecimal minCap, final BigDecimal maxCap, final BigDecimal amountOrPercentage,
- Collection<LoanInstallmentChargeData> installmentChargeData) {
+ Collection<LoanInstallmentChargeData> installmentChargeData, final String externalId) {
this.id = id;
this.chargeId = chargeId;
this.name = name;
@@ -140,6 +142,7 @@ public class LoanChargeData {
this.installmentChargeData = installmentChargeData;
this.amountAccrued = null;
this.amountUnrecognized = null;
+ this.externalId = externalId;
}
private LoanChargeData(final Long id, final Long chargeId, final String name, final CurrencyData currency, final BigDecimal amount,
@@ -306,6 +309,7 @@ public class LoanChargeData {
this.installmentChargeData = installmentChargeData;
this.amountAccrued = chargeData.amountAccrued;
this.amountUnrecognized = chargeData.amountUnrecognized;
+ this.externalId = chargeData.externalId;
}
public LoanChargeData(final Long id, final LocalDate dueAsOfDate, final BigDecimal amount, final EnumOptionData chargeCalculationType,
@@ -440,4 +444,9 @@ public class LoanChargeData {
public BigDecimal getAmountUnrecognized() {
return this.amountUnrecognized;
}
+
+ public String getExternalId() {
+ return externalId;
+ }
+
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
index 6943f44..c5e23a5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
@@ -42,6 +42,7 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import javax.persistence.UniqueConstraint;
import org.apache.fineract.infrastructure.core.api.JsonCommand;
import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
import org.apache.fineract.infrastructure.core.service.DateUtils;
@@ -57,7 +58,7 @@ import org.apache.fineract.portfolio.loanaccount.command.LoanChargeCommand;
import org.apache.fineract.portfolio.loanaccount.data.LoanChargePaidDetail;
@Entity
-@Table(name = "m_loan_charge")
+@Table(name = "m_loan_charge", uniqueConstraints = { @UniqueConstraint(columnNames = { "external_id" }, name = "external_id") })
public class LoanCharge extends AbstractPersistableCustom {
@ManyToOne(optional = false)
@@ -126,6 +127,9 @@ public class LoanCharge extends AbstractPersistableCustom {
@Column(name = "is_active", nullable = false)
private boolean active = true;
+ @Column(name = "external_id")
+ private String externalId;
+
@OneToOne(mappedBy = "loancharge", cascade = CascadeType.ALL, optional = true, orphanRemoval = true, fetch = FetchType.EAGER)
private LoanOverdueInstallmentCharge overdueInstallmentCharge;
@@ -204,8 +208,11 @@ public class LoanCharge extends AbstractPersistableCustom {
}
}
- return new LoanCharge(loan, chargeDefinition, amountPercentageAppliedTo, amount, chargeTime, chargeCalculation, dueDate,
- chargePaymentMode, null, loanCharge);
+ LoanCharge newLoanCharge = new LoanCharge(loan, chargeDefinition, amountPercentageAppliedTo, amount, chargeTime, chargeCalculation,
+ dueDate, chargePaymentMode, null, loanCharge);
+ final String externalId = command.stringValueOfParameterNamedAllowingNull("externalId");
+ newLoanCharge.setExternalId(externalId);
+ return newLoanCharge;
}
/*
@@ -264,6 +271,7 @@ public class LoanCharge extends AbstractPersistableCustom {
if (chargePaymentMode != null) {
this.chargePaymentMode = chargePaymentMode.getValue();
}
+
populateDerivedFields(loanPrincipal, chargeAmount, numberOfRepayments, loanCharge);
this.paid = determineIfFullyPaid();
}
@@ -1070,4 +1078,13 @@ public class LoanCharge extends AbstractPersistableCustom {
public void undoWaived() {
this.waived = false;
}
+
+ public String getExternalId() {
+ return externalId;
+ }
+
+ public void setExternalId(String externalId) {
+ this.externalId = externalId;
+ }
+
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/handler/AddLoanChargeCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/handler/AddLoanChargeCommandHandler.java
index 2d5e631..b93d90c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/handler/AddLoanChargeCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/handler/AddLoanChargeCommandHandler.java
@@ -22,8 +22,13 @@ import org.apache.fineract.commands.annotation.CommandType;
import org.apache.fineract.commands.handler.NewCommandSourceHandler;
import org.apache.fineract.infrastructure.core.api.JsonCommand;
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
import org.apache.fineract.portfolio.loanaccount.service.LoanWritePlatformService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +36,8 @@ import org.springframework.transaction.annotation.Transactional;
@CommandType(entity = "LOANCHARGE", action = "CREATE")
public class AddLoanChargeCommandHandler implements NewCommandSourceHandler {
+ private static final Logger LOG = LoggerFactory.getLogger(AddLoanChargeCommandHandler.class);
+
private final LoanWritePlatformService writePlatformService;
@Autowired
@@ -41,7 +48,30 @@ public class AddLoanChargeCommandHandler implements NewCommandSourceHandler {
@Transactional
@Override
public CommandProcessingResult processCommand(final JsonCommand command) {
+ try {
+ return this.writePlatformService.addLoanCharge(command.getLoanId(), command);
+ } catch (final JpaSystemException | DataIntegrityViolationException dve) {
+ handleDataIntegrityIssues(command, dve.getMostSpecificCause(), dve);
+ return CommandProcessingResult.empty();
+ }
+ }
+
+ private void handleDataIntegrityIssues(final JsonCommand command, final Throwable realCause, final Exception dve) {
+
+ if (realCause.getMessage().contains("external_id")) {
- return this.writePlatformService.addLoanCharge(command.getLoanId(), command);
+ final String externalId = command.stringValueOfParameterNamed("externalId");
+ throw new PlatformDataIntegrityException("error.msg.loan.charge.duplicate.externalId",
+ "Loan Charge with externalId `" + externalId + "` already exists", "externalId", externalId);
+ }
+
+ logAsErrorUnexpectedDataIntegrityException(dve);
+ throw new PlatformDataIntegrityException("error.msg.loan.charge.unknown.data.integrity.issue",
+ "Unknown data integrity issue with resource.");
+ }
+
+ private void logAsErrorUnexpectedDataIntegrityException(final Exception dve) {
+ LOG.error("Error occured.", dve);
}
+
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanEventApiJsonValidator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanEventApiJsonValidator.java
index 8de348f..a718606 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanEventApiJsonValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanEventApiJsonValidator.java
@@ -304,7 +304,8 @@ public final class LoanEventApiJsonValidator {
throw new InvalidJsonException();
}
- final Set<String> disbursementParameters = new HashSet<>(Arrays.asList("chargeId", "amount", "dueDate", "locale", "dateFormat"));
+ final Set<String> disbursementParameters = new HashSet<>(
+ Arrays.asList("chargeId", "amount", "dueDate", "locale", "dateFormat", "externalId"));
final Type typeOfMap = new TypeToken<Map<String, Object>>() {}.getType();
this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, disbursementParameters);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java
index fcded5b..2f3a6a8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java
@@ -68,9 +68,9 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform
private static final class LoanChargeMapper implements RowMapper<LoanChargeData> {
public String schema() {
- return "lc.id as id, c.id as chargeId, c.name as name, " + "lc.amount as amountDue, " + "lc.amount_paid_derived as amountPaid, "
- + "lc.amount_waived_derived as amountWaived, " + "lc.amount_writtenoff_derived as amountWrittenOff, "
- + "lc.amount_outstanding_derived as amountOutstanding, "
+ return "lc.id as id, lc.external_id as externalId, c.id as chargeId, c.name as name, " + "lc.amount as amountDue, "
+ + "lc.amount_paid_derived as amountPaid, " + "lc.amount_waived_derived as amountWaived, "
+ + "lc.amount_writtenoff_derived as amountWrittenOff, " + "lc.amount_outstanding_derived as amountOutstanding, "
+ "lc.calculation_percentage as percentageOf, lc.calculation_on_amount as amountPercentageAppliedTo, "
+ "lc.charge_time_enum as chargeTime, " + "lc.is_penalty as penalty, "
+ "lc.due_for_collection_as_of_date as dueAsOfDate, " + "lc.charge_calculation_enum as chargeCalculation, "
@@ -130,10 +130,11 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform
if (disbursementDate != null) {
dueAsOfDate = disbursementDate;
}
+ final String externalId = rs.getString("externalId");
return new LoanChargeData(id, chargeId, name, currency, amount, amountPaid, amountWaived, amountWrittenOff, amountOutstanding,
chargeTimeType, dueAsOfDate, chargeCalculationType, percentageOf, amountPercentageAppliedTo, penalty, paymentMode, paid,
- waived, null, minCap, maxCap, amountOrPercentage, null);
+ waived, null, minCap, maxCap, amountOrPercentage, null, externalId);
}
}
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
index d340eb2..8412d3a 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
@@ -27,4 +27,5 @@
<include file="parts/0005_savings_transaction_reversal.xml" relativeToChangelogFile="true"/>
<include file="parts/0006_product_loan_disallow_expected_disbursements.xml" relativeToChangelogFile="true"/>
<include file="parts/0007_product_loan_higher_than_applied_loan_amount_management.xml" relativeToChangelogFile="true"/>
+ <include file="parts/0008_loan_charge_add_external_id.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0008_loan_charge_add_external_id.xml
similarity index 68%
copy from fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
copy to fineract-provider/src/main/resources/db/changelog/tenant/parts/0008_loan_charge_add_external_id.xml
index d340eb2..3be9737 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0008_loan_charge_add_external_id.xml
@@ -22,9 +22,11 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
- <include file="parts/0003_postgresql_specific_initial_data.xml" relativeToChangelogFile="true"/>
- <include file="parts/0004_camelcase_column_renaming.xml" relativeToChangelogFile="true"/>
- <include file="parts/0005_savings_transaction_reversal.xml" relativeToChangelogFile="true"/>
- <include file="parts/0006_product_loan_disallow_expected_disbursements.xml" relativeToChangelogFile="true"/>
- <include file="parts/0007_product_loan_higher_than_applied_loan_amount_management.xml" relativeToChangelogFile="true"/>
+ <changeSet author="fineract" id="1">
+ <addColumn tableName="m_loan_charge">
+ <column name="external_id" type="VARCHAR(100)">
+ <constraints unique="true"/>
+ </column>
+ </addColumn>
+ </changeSet>
</databaseChangeLog>
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanChargeExternalIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanChargeExternalIntegrationTest.java
new file mode 100644
index 0000000..115c347
--- /dev/null
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanChargeExternalIntegrationTest.java
@@ -0,0 +1,181 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.integrationtests;
+
+import com.google.gson.Gson;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.specification.RequestSpecification;
+import io.restassured.specification.ResponseSpecification;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.apache.fineract.integrationtests.common.accounting.Account;
+import org.apache.fineract.integrationtests.common.charges.ChargesHelper;
+import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
+import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
+import org.apache.fineract.integrationtests.common.loans.LoanStatusChecker;
+import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class ClientLoanChargeExternalIntegrationTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(ClientLoanChargeExternalIntegrationTest.class);
+
+ public static final String MINIMUM_OPENING_BALANCE = "1000.0";
+ public static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL";
+ private static final String NONE = "1";
+
+ private ResponseSpecification responseSpec;
+ private RequestSpecification requestSpec;
+ private LoanTransactionHelper loanTransactionHelper;
+
+ @BeforeEach
+ public void setup() {
+ Utils.initializeRESTAssured();
+ this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
+ this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
+ this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
+ this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
+ }
+
+ @Test
+ public void checkNewClientLoanChargeSavesExternalId() {
+
+ final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
+ ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+
+ final Integer loanProductID = createLoanProduct(false, NONE);
+
+ List<HashMap> collaterals = new ArrayList<>();
+ final Integer loanID = applyForLoanApplication(clientID, loanProductID, null, null, "12,000.00", collaterals);
+ HashMap loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
+ LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+ loanStatusHashMap = this.loanTransactionHelper.disburseLoan("20 September 2011", loanID, "12,000.00");
+ LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+ final Integer charge = ChargesHelper.createCharges(requestSpec, responseSpec, ChargesHelper
+ .getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
+
+ final float amount = 1.0f;
+ final String externalId = "extId" + loanID.toString();
+ final Integer chargeID = this.loanTransactionHelper.addChargesForLoan(loanID,
+ getLoanChargeAsJSON(String.valueOf(charge), "22 September 2011", String.valueOf(amount), externalId));
+ Assertions.assertNotNull(chargeID);
+
+ HashMap loanChargeMap = this.loanTransactionHelper.getLoanCharge(loanID, chargeID);
+ Assertions.assertNotNull(loanChargeMap.get("externalId"));
+ Assertions.assertEquals(loanChargeMap.get("externalId"), externalId, "Incorrect External Id Saved");
+
+ }
+
+ @Test
+ public void checkNewClientLoanChargeFindsDuplicateExternalId() {
+
+ final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
+ ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+
+ final Integer loanProductID = createLoanProduct(false, NONE);
+
+ List<HashMap> collaterals = new ArrayList<>();
+ final Integer loanID = applyForLoanApplication(clientID, loanProductID, null, null, "12,000.00", collaterals);
+ HashMap loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
+ LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+ loanStatusHashMap = this.loanTransactionHelper.disburseLoan("20 September 2011", loanID, "12,000.00");
+ LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+ final Integer charge = ChargesHelper.createCharges(requestSpec, responseSpec, ChargesHelper
+ .getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
+
+ final String externalId = "extId" + loanID.toString();
+ final float amount = 1.0f;
+ final Integer chargeID = this.loanTransactionHelper.addChargesForLoan(loanID,
+ getLoanChargeAsJSON(String.valueOf(charge), "22 September 2011", String.valueOf(amount), externalId));
+ Assertions.assertNotNull(chargeID);
+
+ final float amount2 = 2.0f;
+ ResponseSpecification responseSpec403 = new ResponseSpecBuilder().expectStatusCode(403).build();
+ final Integer chargeID2 = this.loanTransactionHelper.addChargesForLoan(loanID,
+ getLoanChargeAsJSON(String.valueOf(charge), "23 September 2011", String.valueOf(amount2), externalId), responseSpec403);
+
+ Assertions.assertNull(chargeID2);
+ }
+
+ private static String getLoanChargeAsJSON(final String chargeId, final String dueDate, final String amount, final String externalId) {
+ final HashMap<String, String> map = new HashMap<>();
+ map.put("locale", "en_GB");
+ map.put("dateFormat", "dd MMMM yyyy");
+ map.put("amount", amount);
+ map.put("dueDate", dueDate);
+ map.put("chargeId", chargeId);
+ map.put("externalId", externalId);
+ String json = new Gson().toJson(map);
+ LOG.info("{}", json);
+ return json;
+ }
+
+ private Integer createLoanProduct(final boolean multiDisburseLoan, final String accountingRule, final Account... accounts) {
+ LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------");
+ LoanProductTestBuilder builder = new LoanProductTestBuilder() //
+ .withPrincipal("12,000.00") //
+ .withNumberOfRepayments("4") //
+ .withRepaymentAfterEvery("1") //
+ .withRepaymentTypeAsMonth() //
+ .withinterestRatePerPeriod("1") //
+ .withInterestRateFrequencyTypeAsMonths() //
+ .withAmortizationTypeAsEqualInstallments() //
+ .withInterestTypeAsDecliningBalance() //
+ .withTranches(multiDisburseLoan) //
+ .withAccounting(accountingRule, accounts);
+ if (multiDisburseLoan) {
+ builder = builder.withInterestCalculationPeriodTypeAsRepaymentPeriod(true);
+ }
+ final String loanProductJSON = builder.build(null);
+ return this.loanTransactionHelper.getLoanProductId(loanProductJSON);
+ }
+
+ private Integer applyForLoanApplication(final Integer clientID, final Integer loanProductID, List<HashMap> charges,
+ final String savingsId, String principal, List<HashMap> collaterals) {
+ LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
+ final String loanApplicationJSON = new LoanApplicationTestBuilder() //
+ .withPrincipal(principal) //
+ .withLoanTermFrequency("4") //
+ .withLoanTermFrequencyAsMonths() //
+ .withNumberOfRepayments("4") //
+ .withRepaymentEveryAfter("1") //
+ .withRepaymentFrequencyTypeAsMonths() //
+ .withInterestRatePerPeriod("2") //
+ .withAmortizationTypeAsEqualInstallments() //
+ .withInterestTypeAsDecliningBalance() //
+ .withInterestCalculationPeriodTypeSameAsRepaymentPeriod() //
+ .withExpectedDisbursementDate("20 September 2011") //
+ .withSubmittedOnDate("20 September 2011") //
+ .withCollaterals(collaterals).withCharges(charges).build(clientID.toString(), loanProductID.toString(), savingsId);
+ return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
+ }
+
+}
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
index afd4339..fdd9004 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
@@ -341,11 +341,18 @@ public class LoanTransactionHelper {
public Integer addChargesForLoan(final Integer loanId, final String request) {
LOG.info("--------------------------------- ADD CHARGES FOR LOAN --------------------------------");
- final String ADD_CHARGES_URL = "/fineract-provider/api/v1/loans/" + loanId + "/charges?" + Utils.TENANT_IDENTIFIER;
+ final String ADD_CHARGES_URL = LOAN_ACCOUNT_URL + "/" + loanId + "/charges?" + Utils.TENANT_IDENTIFIER;
final HashMap response = Utils.performServerPost(requestSpec, responseSpec, ADD_CHARGES_URL, request, "");
return (Integer) response.get("resourceId");
}
+ public Integer addChargesForLoan(final Integer loanId, final String request, final ResponseSpecification responseSpecParam) {
+ LOG.info("--------------------------------- ADD CHARGES FOR LOAN --------------------------------");
+ final String ADD_CHARGES_URL = LOAN_ACCOUNT_URL + "/" + loanId + "/charges?" + Utils.TENANT_IDENTIFIER;
+ final HashMap response = Utils.performServerPost(requestSpec, responseSpecParam, ADD_CHARGES_URL, request, "");
+ return (Integer) response.get("resourceId");
+ }
+
public Object addChargesForAllreadyDisursedLoan(final Integer loanId, final String request,
final ResponseSpecification responseSpecification) {
final String ADD_CHARGES_URL = "/fineract-provider/api/v1/loans/" + loanId + "/charges?" + Utils.TENANT_IDENTIFIER;