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

FINERACT-1724: Test enhancement

Browse Source
This commit is contained in:
Adam Saghy
2023-01-30 17:33:10 +01:00
committed by Arnold Gálovics
parent 18126f2a78
commit c1def37088
3 changed files with 166 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java
+21
View File
@@ -759,6 +759,25 @@ final class LoansApiResourceSwagger {
public BigDecimal amount; public BigDecimal amount;
} }
static final class GetLoansLoanIdLoanTransactionRelation {
private GetLoansLoanIdLoanTransactionRelation() {}
@Schema(example = "1")
public Long fromLoanTransaction;
@Schema(example = "10")
public Long toLoanTransaction;
@Schema(example = "10")
public Long toLoanCharge;
@Schema(example = "CHARGEBACK")
public String relationType;
@Schema(example = "100.00")
public Double amount;
@Schema(example = "Repayment Adjustment Chargeback")
public String paymentType;
}
@Schema(example = "1") @Schema(example = "1")
public Long id; public Long id;
@Schema(example = "1") @Schema(example = "1")
@@ -838,6 +857,8 @@ final class LoansApiResourceSwagger {
public String reversalExternalId; public String reversalExternalId;
@Schema(example = "[2022, 9, 19]") @Schema(example = "[2022, 9, 19]")
public LocalDate reversedOnDate; public LocalDate reversedOnDate;
@Schema(description = "List of GetLoansLoanIdLoanTransactionRelationData")
public Set<GetLoansLoanIdLoanTransactionRelation> transactionRelations;
} }
static final class GetLoansLoanIdLoanChargeData { static final class GetLoansLoanIdLoanChargeData {
integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
+143 -137
View File
@@ -54,6 +54,7 @@ import java.util.UUID;
import org.apache.fineract.accounting.glaccount.domain.GLAccountType; import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
import org.apache.fineract.client.models.BusinessDateRequest; import org.apache.fineract.client.models.BusinessDateRequest;
import org.apache.fineract.client.models.GetLoanTransactionRelation; import org.apache.fineract.client.models.GetLoanTransactionRelation;
import org.apache.fineract.client.models.GetLoansLoanIdLoanTransactionRelation;
import org.apache.fineract.client.models.GetLoansLoanIdRepaymentPeriod; import org.apache.fineract.client.models.GetLoansLoanIdRepaymentPeriod;
import org.apache.fineract.client.models.GetLoansLoanIdResponse; import org.apache.fineract.client.models.GetLoansLoanIdResponse;
import org.apache.fineract.client.models.GetLoansLoanIdSummary; import org.apache.fineract.client.models.GetLoansLoanIdSummary;
@@ -6108,164 +6109,169 @@ public class ClientLoanIntegrationTest {
@Test @Test
public void chargeAdjustmentForUnpaidCharge() { public void chargeAdjustmentForUnpaidCharge() {
GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.TRUE); try {
businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName()).date("2022.11.01") GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.TRUE);
.dateFormat("yyyy.MM.dd").locale("en")); businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
final Account assetAccount = this.accountHelper.createAssetAccount(); .date("2022.11.01").dateFormat("yyyy.MM.dd").locale("en"));
final Account incomeAccount = this.accountHelper.createIncomeAccount(); final Account assetAccount = this.accountHelper.createAssetAccount();
final Account expenseAccount = this.accountHelper.createExpenseAccount(); final Account incomeAccount = this.accountHelper.createIncomeAccount();
final Account overpaymentAccount = this.accountHelper.createLiabilityAccount(); final Account expenseAccount = this.accountHelper.createExpenseAccount();
final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
Integer penalty = ChargesHelper.createCharges(requestSpec, responseSpec, Integer penalty = ChargesHelper.createCharges(requestSpec, responseSpec,
ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", true)); ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", true));
final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount, expenseAccount, final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount,
overpaymentAccount); expenseAccount, overpaymentAccount);
final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011"); final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011");
final Integer loanID = applyForLoanApplication(clientID, loanProductID); final Integer loanID = applyForLoanApplication(clientID, loanProductID);
HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID); HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap); LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID); loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID);
LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap); LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap); LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000"); loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap); LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID); ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
assertEquals(2, loanSchedule.size()); assertEquals(2, loanSchedule.size());
assertEquals(0, loanSchedule.get(1).get("penaltyChargesDue")); assertEquals(0, loanSchedule.get(1).get("penaltyChargesDue"));
assertEquals(0, loanSchedule.get(1).get("penaltyChargesOutstanding")); assertEquals(0, loanSchedule.get(1).get("penaltyChargesOutstanding"));
assertEquals(1000.0f, loanSchedule.get(1).get("totalDueForPeriod")); assertEquals(1000.0f, loanSchedule.get(1).get("totalDueForPeriod"));
assertEquals(1000.0f, loanSchedule.get(1).get("totalOutstandingForPeriod")); assertEquals(1000.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
LocalDate targetDate = LocalDate.of(2022, 9, 7); LocalDate targetDate = LocalDate.of(2022, 9, 7);
final String penaltyCharge1AddedDate = dateFormatter.format(targetDate); final String penaltyCharge1AddedDate = dateFormatter.format(targetDate);
Integer penalty1LoanChargeId = this.loanTransactionHelper.addChargesForLoan(loanID, Integer penalty1LoanChargeId = this.loanTransactionHelper.addChargesForLoan(loanID,
LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10")); LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10"));
this.loanTransactionHelper.noAccrualTransactionForRepayment(loanID); this.loanTransactionHelper.noAccrualTransactionForRepayment(loanID);
loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID); loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
assertEquals(2, loanSchedule.size()); assertEquals(2, loanSchedule.size());
assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue")); assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding")); assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod")); assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
assertEquals(1010.0f, loanSchedule.get(1).get("totalOutstandingForPeriod")); assertEquals(1010.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
assertEquals(0, loanSchedule.get(1).get("totalWaivedForPeriod")); assertEquals(0, loanSchedule.get(1).get("totalWaivedForPeriod"));
HashMap loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary"); HashMap loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
assertEquals(10.0f, loanSummary.get("penaltyChargesCharged")); assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding")); assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
assertEquals(0.0f, loanSummary.get("penaltyChargesWaived")); assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
assertEquals(1010.0f, loanSummary.get("totalOutstanding")); assertEquals(1010.0f, loanSummary.get("totalOutstanding"));
assertEquals(0.0f, loanSummary.get("totalWaived")); assertEquals(0.0f, loanSummary.get("totalWaived"));
String externalId = UUID.randomUUID().toString(); String externalId = UUID.randomUUID().toString();
PostLoansLoanIdChargesChargeIdResponse chargeAdjustmentResponse = this.loanTransactionHelper.chargeAdjustment((long) loanID, PostLoansLoanIdChargesChargeIdResponse chargeAdjustmentResponse = this.loanTransactionHelper.chargeAdjustment((long) loanID,
(long) penalty1LoanChargeId, new PostLoansLoanIdChargesChargeIdRequest().amount(10.0).externalId(externalId)); (long) penalty1LoanChargeId, new PostLoansLoanIdChargesChargeIdRequest().amount(10.0).externalId(externalId));
loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID); loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
assertEquals(2, loanSchedule.size()); assertEquals(2, loanSchedule.size());
assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue")); assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesPaid")); assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesPaid"));
assertEquals(0.0f, loanSchedule.get(1).get("penaltyChargesOutstanding")); assertEquals(0.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod")); assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
assertEquals(1000.0f, loanSchedule.get(1).get("totalOutstandingForPeriod")); assertEquals(1000.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
assertEquals(10.0f, loanSchedule.get(1).get("totalPaidForPeriod")); assertEquals(10.0f, loanSchedule.get(1).get("totalPaidForPeriod"));
loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary"); loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
assertEquals(10.0f, loanSummary.get("penaltyChargesCharged")); assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
assertEquals(0.0f, loanSummary.get("penaltyChargesOutstanding")); assertEquals(0.0f, loanSummary.get("penaltyChargesOutstanding"));
assertEquals(10.0f, loanSummary.get("penaltyChargesPaid")); assertEquals(10.0f, loanSummary.get("penaltyChargesPaid"));
assertEquals(1000.0f, loanSummary.get("totalOutstanding")); assertEquals(1000.0f, loanSummary.get("totalOutstanding"));
GetLoansLoanIdTransactionsTransactionIdResponse chargeAdjustmentTransaction = this.loanTransactionHelper GetLoansLoanIdTransactionsTransactionIdResponse chargeAdjustmentTransaction = this.loanTransactionHelper
.getLoanTransactionDetails((long) loanID, chargeAdjustmentResponse.getSubResourceId()); .getLoanTransactionDetails((long) loanID, chargeAdjustmentResponse.getSubResourceId());
assertEquals(10.0, chargeAdjustmentTransaction.getAmount()); assertEquals(10.0, chargeAdjustmentTransaction.getAmount());
assertEquals(10.0, chargeAdjustmentTransaction.getPenaltyChargesPortion()); assertEquals(10.0, chargeAdjustmentTransaction.getPenaltyChargesPortion());
assertEquals("loanTransactionType.chargeAdjustment", chargeAdjustmentTransaction.getType().getCode()); assertEquals("loanTransactionType.chargeAdjustment", chargeAdjustmentTransaction.getType().getCode());
assertEquals(externalId, chargeAdjustmentTransaction.getExternalId()); assertEquals(externalId, chargeAdjustmentTransaction.getExternalId());
GetLoanTransactionRelation transactionRelation = chargeAdjustmentTransaction.getTransactionRelations().iterator().next(); GetLoanTransactionRelation transactionRelation = chargeAdjustmentTransaction.getTransactionRelations().iterator().next();
assertEquals(chargeAdjustmentResponse.getSubResourceId(), transactionRelation.getFromLoanTransaction()); assertEquals(chargeAdjustmentResponse.getSubResourceId(), transactionRelation.getFromLoanTransaction());
assertEquals((long) penalty1LoanChargeId, transactionRelation.getToLoanCharge()); assertEquals((long) penalty1LoanChargeId, transactionRelation.getToLoanCharge());
assertEquals("CHARGE_ADJUSTMENT", transactionRelation.getRelationType()); assertEquals("CHARGE_ADJUSTMENT", transactionRelation.getRelationType());
PostLoansLoanIdTransactionsResponse repaymentResult = loanTransactionHelper.makeLoanRepayment((long) loanID, PostLoansLoanIdTransactionsResponse repaymentResult = loanTransactionHelper.makeLoanRepayment((long) loanID,
new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy").transactionDate("06 September 2022").locale("en") new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy").transactionDate("06 September 2022").locale("en")
.transactionAmount(5.0)); .transactionAmount(5.0));
loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID); loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
assertEquals(2, loanSchedule.size()); assertEquals(2, loanSchedule.size());
assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue")); assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesPaid")); assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesPaid"));
assertEquals(0.0f, loanSchedule.get(1).get("penaltyChargesOutstanding")); assertEquals(0.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
assertEquals(1000.0f, loanSchedule.get(1).get("principalDue")); assertEquals(1000.0f, loanSchedule.get(1).get("principalDue"));
assertEquals(5.0f, loanSchedule.get(1).get("principalPaid")); assertEquals(5.0f, loanSchedule.get(1).get("principalPaid"));
assertEquals(995.0f, loanSchedule.get(1).get("principalOutstanding")); assertEquals(995.0f, loanSchedule.get(1).get("principalOutstanding"));
assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod")); assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
assertEquals(995.0f, loanSchedule.get(1).get("totalOutstandingForPeriod")); assertEquals(995.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
assertEquals(15.0f, loanSchedule.get(1).get("totalPaidForPeriod")); assertEquals(15.0f, loanSchedule.get(1).get("totalPaidForPeriod"));
loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary"); loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
assertEquals(10.0f, loanSummary.get("penaltyChargesCharged")); assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
assertEquals(0.0f, loanSummary.get("penaltyChargesOutstanding")); assertEquals(0.0f, loanSummary.get("penaltyChargesOutstanding"));
assertEquals(10.0f, loanSummary.get("penaltyChargesPaid")); assertEquals(10.0f, loanSummary.get("penaltyChargesPaid"));
assertEquals(1000.0f, loanSummary.get("principalDisbursed")); assertEquals(1000.0f, loanSummary.get("principalDisbursed"));
assertEquals(995.0f, loanSummary.get("principalOutstanding")); assertEquals(995.0f, loanSummary.get("principalOutstanding"));
assertEquals(5.0f, loanSummary.get("principalPaid")); assertEquals(5.0f, loanSummary.get("principalPaid"));
assertEquals(995.0f, loanSummary.get("totalOutstanding")); assertEquals(995.0f, loanSummary.get("totalOutstanding"));
Long chargeAdjustmentTxnId = repaymentResult.getResourceId() + 1; GetLoansLoanIdResponse loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
chargeAdjustmentTransaction = this.loanTransactionHelper.getLoanTransactionDetails((long) loanID, chargeAdjustmentTxnId); GetLoansLoanIdTransactions replayedTransaction = loanDetails.getTransactions().stream()
assertEquals(10.0, chargeAdjustmentTransaction.getAmount()); .filter(t -> externalId.equals(t.getExternalId())).findFirst().get();
assertEquals(5.0, chargeAdjustmentTransaction.getPenaltyChargesPortion());
assertEquals(5.0, chargeAdjustmentTransaction.getPrincipalPortion());
assertEquals("loanTransactionType.chargeAdjustment", chargeAdjustmentTransaction.getType().getCode());
assertEquals(externalId, chargeAdjustmentTransaction.getExternalId());
Set<GetLoanTransactionRelation> transactionRelations = chargeAdjustmentTransaction.getTransactionRelations(); assertEquals(10.0, replayedTransaction.getAmount());
for (GetLoanTransactionRelation loanTransactionRelation : transactionRelations) { assertEquals(5.0, replayedTransaction.getPenaltyChargesPortion());
if (loanTransactionRelation.getRelationType().equals("CHARGE_ADJUSTMENT")) { assertEquals(5.0, replayedTransaction.getPrincipalPortion());
assertEquals(chargeAdjustmentTxnId, loanTransactionRelation.getFromLoanTransaction()); assertEquals("loanTransactionType.chargeAdjustment", replayedTransaction.getType().getCode());
assertEquals((long) penalty1LoanChargeId, loanTransactionRelation.getToLoanCharge()); assertEquals(externalId, replayedTransaction.getExternalId());
Set<GetLoansLoanIdLoanTransactionRelation> transactionRelations = replayedTransaction.getTransactionRelations();
for (GetLoansLoanIdLoanTransactionRelation loanTransactionRelation : transactionRelations) {
if ("CHARGE_ADJUSTMENT".equals(loanTransactionRelation.getRelationType())) {
assertEquals(replayedTransaction.getId(), loanTransactionRelation.getFromLoanTransaction());
assertEquals((long) penalty1LoanChargeId, loanTransactionRelation.getToLoanCharge());
}
} }
String uuid = UUID.randomUUID().toString();
this.loanTransactionHelper.reverseLoanTransaction((long) loanID, replayedTransaction.getId(),
new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat("dd MMMM yyyy").transactionDate("08 September 2022")
.transactionAmount(0.0).locale("en").reversalExternalId(uuid));
// Should fail due to external id collusion
assertThrows(CallFailedRuntimeException.class,
() -> this.loanTransactionHelper.reverseLoanTransaction((long) loanID, repaymentResult.getResourceId(),
new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat("dd MMMM yyyy")
.transactionDate("08 September 2022").transactionAmount(0.0).locale("en").reversalExternalId(uuid)));
loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
assertEquals(2, loanSchedule.size());
assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
assertEquals(5.0f, loanSchedule.get(1).get("penaltyChargesPaid"));
assertEquals(5.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
assertEquals(1000.0f, loanSchedule.get(1).get("principalDue"));
assertEquals(0, loanSchedule.get(1).get("principalPaid"));
assertEquals(1000.0f, loanSchedule.get(1).get("principalOutstanding"));
assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
assertEquals(1005.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
assertEquals(5.0f, loanSchedule.get(1).get("totalPaidForPeriod"));
loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
assertEquals(5.0f, loanSummary.get("penaltyChargesOutstanding"));
assertEquals(5.0f, loanSummary.get("penaltyChargesPaid"));
assertEquals(1000.0f, loanSummary.get("principalDisbursed"));
assertEquals(1000.0f, loanSummary.get("principalOutstanding"));
assertEquals(0.0f, loanSummary.get("principalPaid"));
assertEquals(1005.0f, loanSummary.get("totalOutstanding"));
} finally {
GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
} }
String uuid = UUID.randomUUID().toString();
this.loanTransactionHelper.reverseLoanTransaction((long) loanID, chargeAdjustmentTxnId,
new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat("dd MMMM yyyy").transactionDate("08 September 2022")
.transactionAmount(0.0).locale("en").reversalExternalId(uuid));
// Should fail due to external id collusion
assertThrows(CallFailedRuntimeException.class,
() -> this.loanTransactionHelper.reverseLoanTransaction((long) loanID, repaymentResult.getResourceId(),
new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat("dd MMMM yyyy")
.transactionDate("08 September 2022").transactionAmount(0.0).locale("en").reversalExternalId(uuid)));
loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
assertEquals(2, loanSchedule.size());
assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
assertEquals(5.0f, loanSchedule.get(1).get("penaltyChargesPaid"));
assertEquals(5.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
assertEquals(1000.0f, loanSchedule.get(1).get("principalDue"));
assertEquals(0, loanSchedule.get(1).get("principalPaid"));
assertEquals(1000.0f, loanSchedule.get(1).get("principalOutstanding"));
assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
assertEquals(1005.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
assertEquals(5.0f, loanSchedule.get(1).get("totalPaidForPeriod"));
loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
assertEquals(5.0f, loanSummary.get("penaltyChargesOutstanding"));
assertEquals(5.0f, loanSummary.get("penaltyChargesPaid"));
assertEquals(1000.0f, loanSummary.get("principalDisbursed"));
assertEquals(1000.0f, loanSummary.get("principalOutstanding"));
assertEquals(0.0f, loanSummary.get("principalPaid"));
assertEquals(1005.0f, loanSummary.get("totalOutstanding"));
GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
} }
@Test @Test
integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java
+2 -16
View File
@@ -1001,8 +1001,6 @@ public class SchedulerJobsTestResults {
this.loanTransactionHelper.approveLoan("02 September 2022", loanId); this.loanTransactionHelper.approveLoan("02 September 2022", loanId);
this.loanTransactionHelper.disburseLoan("03 September 2022", loanId, "1000", null); this.loanTransactionHelper.disburseLoan("03 September 2022", loanId, "1000", null);
this.schedulerJobHelper.updateSchedulerJob(16L, new PutJobsJobIDRequest().cronExpression("0/5 * * * * ?"));
businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName()) businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
.date("2022.09.05").dateFormat("yyyy.MM.dd").locale("en")); .date("2022.09.05").dateFormat("yyyy.MM.dd").locale("en"));
@@ -1011,23 +1009,11 @@ public class SchedulerJobsTestResults {
this.loanTransactionHelper.addChargesForLoan(loanId, LoanTransactionHelper this.loanTransactionHelper.addChargesForLoan(loanId, LoanTransactionHelper
.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10", null)); .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10", null));
this.schedulerJobHelper.updateSchedulerJob(16L, new PutJobsJobIDRequest().cronExpression("0/5 * * * * ?"));
Thread.sleep(6000); Thread.sleep(11000);
GetLoansLoanIdResponse loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanId); GetLoansLoanIdResponse loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanId);
assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(1).getDate()); assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(1).getDate());
businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
.date("2022.09.06").dateFormat("yyyy.MM.dd").locale("en"));
targetDate = LocalDate.of(2022, 9, 6);
penaltyCharge1AddedDate = dateFormatter.format(targetDate);
this.loanTransactionHelper.addChargesForLoan(loanId, LoanTransactionHelper
.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10", null));
Thread.sleep(6000);
loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanId);
assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(2).getDate());
} finally { } finally {
this.schedulerJobHelper.updateSchedulerJob(16L, new PutJobsJobIDRequest().cronExpression("0 2 0 1/1 * ? *")); this.schedulerJobHelper.updateSchedulerJob(16L, new PutJobsJobIDRequest().cronExpression("0 2 0 1/1 * ? *"));
GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE); GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);