Skip to content

Revert "FINERACT-2422: standardize use of aging vs. ageing" #5301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
IOhacker wants to merge 1 commit into from
Closed

Revert "FINERACT-2422: standardize use of aging vs. ageing" #5301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fineract-avro-schemas/src/main/avro/loan/v1/LoanAccountDataV1.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@
},
{
"default": null,
"name": "graceOnArrearsAging",
"name": "graceOnArrearsAgeing",
"type": [
"null",
"int"
Expand Down
2 changes: 1 addition & 1 deletion fineract-avro-schemas/src/main/avro/loan/v1/LoanProductDataV1.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@
},
{
"default": null,
"name": "graceOnArrearsAging",
"name": "graceOnArrearsAgeing",
"type": [
"null",
"int"
Expand Down
2 changes: 1 addition & 1 deletion fineract-core/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

public enum JobName {

UPDATE_LOAN_ARREARS_AGING("Update Loan Arrears Aging"), //
UPDATE_LOAN_ARREARS_AGEING("Update Loan Arrears Ageing"), //
APPLY_ANNUAL_FEE_FOR_SAVINGS("Apply Annual Fee For Savings"), //
APPLY_HOLIDAYS_TO_LOANS("Apply Holidays To Loans"), //
POST_INTEREST_FOR_SAVINGS("Post Interest For Savings"), //
Expand Down
54 changes: 27 additions & 27 deletions ...tests-core/src/test/java/org/apache/fineract/test/factory/LoanProductsRequestFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1() {
.daysInYearType(DAYS_IN_YEAR_TYPE)//
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -199,7 +199,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1() {
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))//
.graceOnArrearsAgeing(true))//
.allowPartialPeriodInterestCalculation(true)//
.maxTrancheCount(10)//
.outstandingLoanBalance(10000.0)//
Expand Down Expand Up @@ -292,7 +292,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestFlat() {
.daysInYearType(DAYS_IN_YEAR_TYPE)//
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -309,7 +309,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestFlat() {
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))
.graceOnArrearsAgeing(true))
.allowPartialPeriodInterestCalculation(true)//
.maxTrancheCount(10)//
.outstandingLoanBalance(10000.0)//
Expand Down Expand Up @@ -400,7 +400,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestDeclining()
.daysInYearType(DAYS_IN_YEAR_TYPE)//
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -417,7 +417,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestDeclining()
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))
.graceOnArrearsAgeing(true))
.allowPartialPeriodInterestCalculation(true)//
.maxTrancheCount(10)//
.outstandingLoanBalance(10000.0)//
Expand Down Expand Up @@ -507,7 +507,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP11MonthInterestDeclin
.daysInYearType(DAYS_IN_YEAR_TYPE)//
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -523,7 +523,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP11MonthInterestDeclin
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))
.graceOnArrearsAgeing(true))
.outstandingLoanBalance(10000.0)//
.charges(charges)//
.accountingRule(LOAN_ACCOUNTING_RULE)//
Expand Down Expand Up @@ -620,7 +620,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestDecliningBal
.daysInYearType(DAYS_IN_YEAR_TYPE)//
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -636,7 +636,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestDecliningBal
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))
.graceOnArrearsAgeing(true))
.outstandingLoanBalance(10000.0)//
.charges(charges)//
.accountingRule(LOAN_ACCOUNTING_RULE)//
Expand Down Expand Up @@ -705,7 +705,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2InterestDailyRecalcu
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))//
.graceOnArrearsAgeing(true))//
.allowPartialPeriodInterestCalculation(false)//
.allowVariableInstallments(false)//
.amortizationType(AMORTIZATION_TYPE)//
Expand Down Expand Up @@ -849,7 +849,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2() {
.daysInYearType(DAYS_IN_YEAR_TYPE)//
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -866,7 +866,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2() {
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))//
.graceOnArrearsAgeing(true))//
.allowPartialPeriodInterestCalculation(true)//
.maxTrancheCount(10)//
.outstandingLoanBalance(10000.0)//
Expand Down Expand Up @@ -962,7 +962,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2InterestFlat() {
.daysInYearType(DAYS_IN_YEAR_TYPE)//
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -979,7 +979,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2InterestFlat() {
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))
.graceOnArrearsAgeing(true))
.allowPartialPeriodInterestCalculation(true)//
.maxTrancheCount(10)//
.outstandingLoanBalance(10000.0)//
Expand Down Expand Up @@ -1073,7 +1073,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2Emi() {
.daysInYearType(DAYS_IN_YEAR_TYPE)//
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -1090,7 +1090,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2Emi() {
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))//
.graceOnArrearsAgeing(true))//
.allowPartialPeriodInterestCalculation(false)//
.maxTrancheCount(10)//
.outstandingLoanBalance(10000.0)//
Expand Down Expand Up @@ -1199,7 +1199,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2EmiWithChargeOff() {
.daysInYearType(DAYS_IN_YEAR_TYPE)//
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -1220,7 +1220,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2EmiWithChargeOff() {
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))//
.graceOnArrearsAgeing(true))//
.allowPartialPeriodInterestCalculation(false)//
.maxTrancheCount(10)//
.outstandingLoanBalance(10000.0)//
Expand Down Expand Up @@ -1321,7 +1321,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2ChargeOffReasonToExp
.daysInYearType(DAYS_IN_YEAR_TYPE)//
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -1338,7 +1338,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2ChargeOffReasonToExp
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))//
.graceOnArrearsAgeing(true))//
.allowPartialPeriodInterestCalculation(true)//
.maxTrancheCount(10)//
.outstandingLoanBalance(10000.0)//
Expand Down Expand Up @@ -1451,7 +1451,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2EmiCashAccounting()
.daysInYearType(DAYS_IN_YEAR_TYPE)//
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -1472,7 +1472,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2EmiCashAccounting()
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))//
.graceOnArrearsAgeing(true))//
.allowPartialPeriodInterestCalculation(false)//
.maxTrancheCount(10)//
.outstandingLoanBalance(10000.0)//
Expand Down Expand Up @@ -1560,7 +1560,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2CapitalizedIncome()
.daysInYearType(DAYS_IN_YEAR_TYPE)//
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -1577,7 +1577,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2CapitalizedIncome()
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))//
.graceOnArrearsAgeing(true))//
.allowPartialPeriodInterestCalculation(true)//
.maxTrancheCount(10)//
.outstandingLoanBalance(10000.0)//
Expand Down Expand Up @@ -1698,7 +1698,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2BuyDownFees() {
.daysInYearType(DAYS_IN_YEAR_TYPE_360)//
.daysInMonthType(DAYS_IN_MONTH_TYPE_30)//
.canDefineInstallmentAmount(true)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.overdueDaysForNPA(179)//
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
.principalThresholdForLastInstallment(50)//
Expand All @@ -1715,7 +1715,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2BuyDownFees() {
.inArrearsTolerance(true)//
.repaymentEvery(true)//
.graceOnPrincipalAndInterestPayment(true)//
.graceOnArrearsAging(true))//
.graceOnArrearsAgeing(true))//
.allowPartialPeriodInterestCalculation(false)//
.maxTrancheCount(10)//
.outstandingLoanBalance(10000.0)//
Expand Down
6 changes: 3 additions & 3 deletions ...act-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanRequestFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public PostLoansRequest defaultLoansRequest(Long clientId) {
.amortizationType(DEFAULT_AMORTIZATION_TYPE)//
.transactionProcessingStrategyCode(DEFAULT_TRANSACTION_PROCESSING_STRATEGY_CODE)//
.dateFormat(DATE_FORMAT)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.maxOutstandingLoanBalance(new BigDecimal(10000));
}

Expand All @@ -143,7 +143,7 @@ public PostLoansRequest defaultProgressiveLoansRequest(final Long clientId) {
.amortizationType(DEFAULT_AMORTIZATION_TYPE)//
.transactionProcessingStrategyCode(DEFAULT_PROGRESSIVE_TRANSACTION_PROCESSING_STRATEGY_CODE)//
.dateFormat(DATE_FORMAT)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.maxOutstandingLoanBalance(new BigDecimal(10000));
}

Expand Down Expand Up @@ -172,7 +172,7 @@ public PutLoansLoanIdRequest modifySubmittedOnDateOnLoan(Long clientId, String n
.amortizationType(DEFAULT_AMORTIZATION_TYPE)//
.isEqualAmortization(false)//
.transactionProcessingStrategyCode(DEFAULT_TRANSACTION_PROCESSING_STRATEGY_CODE)//
.graceOnArrearsAging(3)//
.graceOnArrearsAgeing(3)//
.loanIdToClose(null)//
.isTopup(null)//
.maxOutstandingLoanBalance(10000L)//
Expand Down
8 changes: 4 additions & 4 deletions ...st/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4048,7 +4048,7 @@ public void initialize() throws Exception {
.inArrearsTolerance(10) //
.graceOnPrincipalPayment(1) //
.graceOnInterestPayment(1) //
.graceOnArrearsAging(3) //
.graceOnArrearsAgeing(3) //
.numberOfRepayments(6) //
.allowAttributeOverrides(new AllowAttributeOverrides() //
.amortizationType(true) //
Expand All @@ -4058,7 +4058,7 @@ public void initialize() throws Exception {
.inArrearsTolerance(true) //
.repaymentEvery(true) //
.graceOnPrincipalAndInterestPayment(true) //
.graceOnArrearsAging(true));
.graceOnArrearsAgeing(true));
final PostLoanProductsResponse responseWithOverrides = createLoanProductIdempotent(loanProductsRequestWithOverrides);
TestContext.INSTANCE.set(TestContextKey.DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP1_WITH_OVERRIDES, responseWithOverrides);

Expand All @@ -4071,7 +4071,7 @@ public void initialize() throws Exception {
.inArrearsTolerance(10) //
.graceOnPrincipalPayment(1) //
.graceOnInterestPayment(1) //
.graceOnArrearsAging(3) //
.graceOnArrearsAgeing(3) //
.numberOfRepayments(6) //
.allowAttributeOverrides(new AllowAttributeOverrides() //
.amortizationType(false) //
Expand All @@ -4081,7 +4081,7 @@ public void initialize() throws Exception {
.inArrearsTolerance(false) //
.repaymentEvery(false) //
.graceOnPrincipalAndInterestPayment(false) //
.graceOnArrearsAging(false));
.graceOnArrearsAgeing(false));
final PostLoanProductsResponse responseNoOverrides = createLoanProductIdempotent(loanProductsRequestNoOverrides);
TestContext.INSTANCE.set(TestContextKey.DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP1_NO_OVERRIDES, responseNoOverrides);

Expand Down
4 changes: 2 additions & 2 deletions ...s-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanOverrideFieldsStepDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ private Integer getIntFieldValue(final GetLoansLoanIdResponse loanDetails, final
case "inArrearsTolerance" -> loanDetails.getInArrearsTolerance();
case "graceOnPrincipalPayment" -> loanDetails.getGraceOnPrincipalPayment();
case "graceOnInterestPayment" -> loanDetails.getGraceOnInterestPayment();
case "graceOnArrearsAging" -> loanDetails.getGraceOnArrearsAging();
case "graceOnArrearsAgeing" -> loanDetails.getGraceOnArrearsAgeing();
default -> throw new IllegalArgumentException("Unknown override field: " + fieldName);
};
}
Expand Down Expand Up @@ -113,7 +113,7 @@ private void applyOverrideField(final PostLoansRequest request, final String fie
case "inArrearsTolerance" -> request.inArrearsTolerance(isNull ? null : new BigDecimal(value));
case "graceOnInterestPayment" -> request.graceOnInterestPayment(isNull ? null : Integer.valueOf(value));
case "graceOnPrincipalPayment" -> request.graceOnPrincipalPayment(isNull ? null : Integer.valueOf(value));
case "graceOnArrearsAging" -> request.graceOnArrearsAging(isNull ? null : Integer.valueOf(value));
case "graceOnArrearsAgeing" -> request.graceOnArrearsAgeing(isNull ? null : Integer.valueOf(value));
default -> throw new IllegalArgumentException("Unknown override field: " + fieldName);
}
}
Expand Down
Loading
Loading