Skip to content

Commit 3f5dd9c

Browse files
Kengne-yvanaKengne-yvana
committed
[#FINERACT-2422] standardize use of aging vs. ageing
1 parent e17303f commit 3f5dd9c

File tree

71 files changed

+321
-321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+321
-321
lines changed

‎fineract-avro-schemas/src/main/avro/loan/v1/LoanAccountDataV1.avsc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@
413413
},
414414
{
415415
"default": null,
416-
"name": "graceOnArrearsAgeing",
416+
"name": "graceOnArrearsAging",
417417
"type": [
418418
"null",
419419
"int"

‎fineract-avro-schemas/src/main/avro/loan/v1/LoanProductDataV1.avsc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
},
390390
{
391391
"default": null,
392-
"name": "graceOnArrearsAgeing",
392+
"name": "graceOnArrearsAging",
393393
"type": [
394394
"null",
395395
"int"

‎fineract-core/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobName.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
public enum JobName {
2222

23-
UPDATE_LOAN_ARREARS_AGEING("Update Loan Arrears Ageing"), //
23+
UPDATE_LOAN_ARREARS_AGING("Update Loan Arrears Aging"), //
2424
APPLY_ANNUAL_FEE_FOR_SAVINGS("Apply Annual Fee For Savings"), //
2525
APPLY_HOLIDAYS_TO_LOANS("Apply Holidays To Loans"), //
2626
POST_INTEREST_FOR_SAVINGS("Post Interest For Savings"), //

‎fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanProductsRequestFactory.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1() {
180180
.daysInYearType(DAYS_IN_YEAR_TYPE)//
181181
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
182182
.canDefineInstallmentAmount(true)//
183-
.graceOnArrearsAgeing(3)//
183+
.graceOnArrearsAging(3)//
184184
.overdueDaysForNPA(179)//
185185
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
186186
.principalThresholdForLastInstallment(50)//
@@ -197,7 +197,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1() {
197197
.inArrearsTolerance(true)//
198198
.repaymentEvery(true)//
199199
.graceOnPrincipalAndInterestPayment(true)//
200-
.graceOnArrearsAgeing(true))//
200+
.graceOnArrearsAging(true))//
201201
.allowPartialPeriodInterestCalculation(true)//
202202
.maxTrancheCount(10)//
203203
.outstandingLoanBalance(10000.0)//
@@ -290,7 +290,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestFlat() {
290290
.daysInYearType(DAYS_IN_YEAR_TYPE)//
291291
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
292292
.canDefineInstallmentAmount(true)//
293-
.graceOnArrearsAgeing(3)//
293+
.graceOnArrearsAging(3)//
294294
.overdueDaysForNPA(179)//
295295
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
296296
.principalThresholdForLastInstallment(50)//
@@ -307,7 +307,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestFlat() {
307307
.inArrearsTolerance(true)//
308308
.repaymentEvery(true)//
309309
.graceOnPrincipalAndInterestPayment(true)//
310-
.graceOnArrearsAgeing(true))
310+
.graceOnArrearsAging(true))
311311
.allowPartialPeriodInterestCalculation(true)//
312312
.maxTrancheCount(10)//
313313
.outstandingLoanBalance(10000.0)//
@@ -398,7 +398,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestDeclining()
398398
.daysInYearType(DAYS_IN_YEAR_TYPE)//
399399
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
400400
.canDefineInstallmentAmount(true)//
401-
.graceOnArrearsAgeing(3)//
401+
.graceOnArrearsAging(3)//
402402
.overdueDaysForNPA(179)//
403403
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
404404
.principalThresholdForLastInstallment(50)//
@@ -415,7 +415,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestDeclining()
415415
.inArrearsTolerance(true)//
416416
.repaymentEvery(true)//
417417
.graceOnPrincipalAndInterestPayment(true)//
418-
.graceOnArrearsAgeing(true))
418+
.graceOnArrearsAging(true))
419419
.allowPartialPeriodInterestCalculation(true)//
420420
.maxTrancheCount(10)//
421421
.outstandingLoanBalance(10000.0)//
@@ -505,7 +505,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP11MonthInterestDeclin
505505
.daysInYearType(DAYS_IN_YEAR_TYPE)//
506506
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
507507
.canDefineInstallmentAmount(true)//
508-
.graceOnArrearsAgeing(3)//
508+
.graceOnArrearsAging(3)//
509509
.overdueDaysForNPA(179)//
510510
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
511511
.principalThresholdForLastInstallment(50)//
@@ -521,7 +521,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP11MonthInterestDeclin
521521
.inArrearsTolerance(true)//
522522
.repaymentEvery(true)//
523523
.graceOnPrincipalAndInterestPayment(true)//
524-
.graceOnArrearsAgeing(true))
524+
.graceOnArrearsAging(true))
525525
.outstandingLoanBalance(10000.0)//
526526
.charges(charges)//
527527
.accountingRule(LOAN_ACCOUNTING_RULE)//
@@ -618,7 +618,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestDecliningBal
618618
.daysInYearType(DAYS_IN_YEAR_TYPE)//
619619
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
620620
.canDefineInstallmentAmount(true)//
621-
.graceOnArrearsAgeing(3)//
621+
.graceOnArrearsAging(3)//
622622
.overdueDaysForNPA(179)//
623623
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
624624
.principalThresholdForLastInstallment(50)//
@@ -634,7 +634,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP1InterestDecliningBal
634634
.inArrearsTolerance(true)//
635635
.repaymentEvery(true)//
636636
.graceOnPrincipalAndInterestPayment(true)//
637-
.graceOnArrearsAgeing(true))
637+
.graceOnArrearsAging(true))
638638
.outstandingLoanBalance(10000.0)//
639639
.charges(charges)//
640640
.accountingRule(LOAN_ACCOUNTING_RULE)//
@@ -703,7 +703,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2InterestDailyRecalcu
703703
.inArrearsTolerance(true)//
704704
.repaymentEvery(true)//
705705
.graceOnPrincipalAndInterestPayment(true)//
706-
.graceOnArrearsAgeing(true))//
706+
.graceOnArrearsAging(true))//
707707
.allowPartialPeriodInterestCalculation(false)//
708708
.allowVariableInstallments(false)//
709709
.amortizationType(AMORTIZATION_TYPE)//
@@ -847,7 +847,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2() {
847847
.daysInYearType(DAYS_IN_YEAR_TYPE)//
848848
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
849849
.canDefineInstallmentAmount(true)//
850-
.graceOnArrearsAgeing(3)//
850+
.graceOnArrearsAging(3)//
851851
.overdueDaysForNPA(179)//
852852
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
853853
.principalThresholdForLastInstallment(50)//
@@ -864,7 +864,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2() {
864864
.inArrearsTolerance(true)//
865865
.repaymentEvery(true)//
866866
.graceOnPrincipalAndInterestPayment(true)//
867-
.graceOnArrearsAgeing(true))//
867+
.graceOnArrearsAging(true))//
868868
.allowPartialPeriodInterestCalculation(true)//
869869
.maxTrancheCount(10)//
870870
.outstandingLoanBalance(10000.0)//
@@ -960,7 +960,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2InterestFlat() {
960960
.daysInYearType(DAYS_IN_YEAR_TYPE)//
961961
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
962962
.canDefineInstallmentAmount(true)//
963-
.graceOnArrearsAgeing(3)//
963+
.graceOnArrearsAging(3)//
964964
.overdueDaysForNPA(179)//
965965
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
966966
.principalThresholdForLastInstallment(50)//
@@ -977,7 +977,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2InterestFlat() {
977977
.inArrearsTolerance(true)//
978978
.repaymentEvery(true)//
979979
.graceOnPrincipalAndInterestPayment(true)//
980-
.graceOnArrearsAgeing(true))
980+
.graceOnArrearsAging(true))
981981
.allowPartialPeriodInterestCalculation(true)//
982982
.maxTrancheCount(10)//
983983
.outstandingLoanBalance(10000.0)//
@@ -1071,7 +1071,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2Emi() {
10711071
.daysInYearType(DAYS_IN_YEAR_TYPE)//
10721072
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
10731073
.canDefineInstallmentAmount(true)//
1074-
.graceOnArrearsAgeing(3)//
1074+
.graceOnArrearsAging(3)//
10751075
.overdueDaysForNPA(179)//
10761076
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
10771077
.principalThresholdForLastInstallment(50)//
@@ -1088,7 +1088,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2Emi() {
10881088
.inArrearsTolerance(true)//
10891089
.repaymentEvery(true)//
10901090
.graceOnPrincipalAndInterestPayment(true)//
1091-
.graceOnArrearsAgeing(true))//
1091+
.graceOnArrearsAging(true))//
10921092
.allowPartialPeriodInterestCalculation(false)//
10931093
.maxTrancheCount(10)//
10941094
.outstandingLoanBalance(10000.0)//
@@ -1197,7 +1197,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2EmiWithChargeOff() {
11971197
.daysInYearType(DAYS_IN_YEAR_TYPE)//
11981198
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
11991199
.canDefineInstallmentAmount(true)//
1200-
.graceOnArrearsAgeing(3)//
1200+
.graceOnArrearsAging(3)//
12011201
.overdueDaysForNPA(179)//
12021202
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
12031203
.principalThresholdForLastInstallment(50)//
@@ -1218,7 +1218,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2EmiWithChargeOff() {
12181218
.inArrearsTolerance(true)//
12191219
.repaymentEvery(true)//
12201220
.graceOnPrincipalAndInterestPayment(true)//
1221-
.graceOnArrearsAgeing(true))//
1221+
.graceOnArrearsAging(true))//
12221222
.allowPartialPeriodInterestCalculation(false)//
12231223
.maxTrancheCount(10)//
12241224
.outstandingLoanBalance(10000.0)//
@@ -1319,7 +1319,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2ChargeOffReasonToExp
13191319
.daysInYearType(DAYS_IN_YEAR_TYPE)//
13201320
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
13211321
.canDefineInstallmentAmount(true)//
1322-
.graceOnArrearsAgeing(3)//
1322+
.graceOnArrearsAging(3)//
13231323
.overdueDaysForNPA(179)//
13241324
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
13251325
.principalThresholdForLastInstallment(50)//
@@ -1336,7 +1336,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2ChargeOffReasonToExp
13361336
.inArrearsTolerance(true)//
13371337
.repaymentEvery(true)//
13381338
.graceOnPrincipalAndInterestPayment(true)//
1339-
.graceOnArrearsAgeing(true))//
1339+
.graceOnArrearsAging(true))//
13401340
.allowPartialPeriodInterestCalculation(true)//
13411341
.maxTrancheCount(10)//
13421342
.outstandingLoanBalance(10000.0)//
@@ -1449,7 +1449,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2EmiCashAccounting()
14491449
.daysInYearType(DAYS_IN_YEAR_TYPE)//
14501450
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
14511451
.canDefineInstallmentAmount(true)//
1452-
.graceOnArrearsAgeing(3)//
1452+
.graceOnArrearsAging(3)//
14531453
.overdueDaysForNPA(179)//
14541454
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
14551455
.principalThresholdForLastInstallment(50)//
@@ -1470,7 +1470,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2EmiCashAccounting()
14701470
.inArrearsTolerance(true)//
14711471
.repaymentEvery(true)//
14721472
.graceOnPrincipalAndInterestPayment(true)//
1473-
.graceOnArrearsAgeing(true))//
1473+
.graceOnArrearsAging(true))//
14741474
.allowPartialPeriodInterestCalculation(false)//
14751475
.maxTrancheCount(10)//
14761476
.outstandingLoanBalance(10000.0)//
@@ -1558,7 +1558,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2CapitalizedIncome()
15581558
.daysInYearType(DAYS_IN_YEAR_TYPE)//
15591559
.daysInMonthType(DAYS_IN_MONTH_TYPE)//
15601560
.canDefineInstallmentAmount(true)//
1561-
.graceOnArrearsAgeing(3)//
1561+
.graceOnArrearsAging(3)//
15621562
.overdueDaysForNPA(179)//
15631563
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
15641564
.principalThresholdForLastInstallment(50)//
@@ -1575,7 +1575,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2CapitalizedIncome()
15751575
.inArrearsTolerance(true)//
15761576
.repaymentEvery(true)//
15771577
.graceOnPrincipalAndInterestPayment(true)//
1578-
.graceOnArrearsAgeing(true))//
1578+
.graceOnArrearsAging(true))//
15791579
.allowPartialPeriodInterestCalculation(true)//
15801580
.maxTrancheCount(10)//
15811581
.outstandingLoanBalance(10000.0)//
@@ -1696,7 +1696,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2BuyDownFees() {
16961696
.daysInYearType(DAYS_IN_YEAR_TYPE_360)//
16971697
.daysInMonthType(DAYS_IN_MONTH_TYPE_30)//
16981698
.canDefineInstallmentAmount(true)//
1699-
.graceOnArrearsAgeing(3)//
1699+
.graceOnArrearsAging(3)//
17001700
.overdueDaysForNPA(179)//
17011701
.accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
17021702
.principalThresholdForLastInstallment(50)//
@@ -1713,7 +1713,7 @@ public PostLoanProductsRequest defaultLoanProductsRequestLP2BuyDownFees() {
17131713
.inArrearsTolerance(true)//
17141714
.repaymentEvery(true)//
17151715
.graceOnPrincipalAndInterestPayment(true)//
1716-
.graceOnArrearsAgeing(true))//
1716+
.graceOnArrearsAging(true))//
17171717
.allowPartialPeriodInterestCalculation(false)//
17181718
.maxTrancheCount(10)//
17191719
.outstandingLoanBalance(10000.0)//

‎fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/LoanRequestFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public PostLoansRequest defaultLoansRequest(Long clientId) {
119119
.amortizationType(DEFAULT_AMORTIZATION_TYPE)//
120120
.transactionProcessingStrategyCode(DEFAULT_TRANSACTION_PROCESSING_STRATEGY_CODE)//
121121
.dateFormat(DATE_FORMAT)//
122-
.graceOnArrearsAgeing(3)//
122+
.graceOnArrearsAging(3)//
123123
.maxOutstandingLoanBalance(new BigDecimal(10000));
124124
}
125125

@@ -143,7 +143,7 @@ public PostLoansRequest defaultProgressiveLoansRequest(final Long clientId) {
143143
.amortizationType(DEFAULT_AMORTIZATION_TYPE)//
144144
.transactionProcessingStrategyCode(DEFAULT_PROGRESSIVE_TRANSACTION_PROCESSING_STRATEGY_CODE)//
145145
.dateFormat(DATE_FORMAT)//
146-
.graceOnArrearsAgeing(3)//
146+
.graceOnArrearsAging(3)//
147147
.maxOutstandingLoanBalance(new BigDecimal(10000));
148148
}
149149

@@ -172,7 +172,7 @@ public PutLoansLoanIdRequest modifySubmittedOnDateOnLoan(Long clientId, String n
172172
.amortizationType(DEFAULT_AMORTIZATION_TYPE)//
173173
.isEqualAmortization(false)//
174174
.transactionProcessingStrategyCode(DEFAULT_TRANSACTION_PROCESSING_STRATEGY_CODE)//
175-
.graceOnArrearsAgeing(3)//
175+
.graceOnArrearsAging(3)//
176176
.loanIdToClose(null)//
177177
.isTopup(null)//
178178
.maxOutstandingLoanBalance(10000L)//

‎fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/initializer/global/LoanProductGlobalInitializerStep.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4047,7 +4047,7 @@ public void initialize() throws Exception {
40474047
.inArrearsTolerance(10) //
40484048
.graceOnPrincipalPayment(1) //
40494049
.graceOnInterestPayment(1) //
4050-
.graceOnArrearsAgeing(3) //
4050+
.graceOnArrearsAging(3) //
40514051
.numberOfRepayments(6) //
40524052
.allowAttributeOverrides(new AllowAttributeOverrides() //
40534053
.amortizationType(true) //
@@ -4057,7 +4057,7 @@ public void initialize() throws Exception {
40574057
.inArrearsTolerance(true) //
40584058
.repaymentEvery(true) //
40594059
.graceOnPrincipalAndInterestPayment(true) //
4060-
.graceOnArrearsAgeing(true));
4060+
.graceOnArrearsAging(true));
40614061
final PostLoanProductsResponse responseWithOverrides = createLoanProductIdempotent(loanProductsRequestWithOverrides);
40624062
TestContext.INSTANCE.set(TestContextKey.DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP1_WITH_OVERRIDES, responseWithOverrides);
40634063

@@ -4070,7 +4070,7 @@ public void initialize() throws Exception {
40704070
.inArrearsTolerance(10) //
40714071
.graceOnPrincipalPayment(1) //
40724072
.graceOnInterestPayment(1) //
4073-
.graceOnArrearsAgeing(3) //
4073+
.graceOnArrearsAging(3) //
40744074
.numberOfRepayments(6) //
40754075
.allowAttributeOverrides(new AllowAttributeOverrides() //
40764076
.amortizationType(false) //
@@ -4080,7 +4080,7 @@ public void initialize() throws Exception {
40804080
.inArrearsTolerance(false) //
40814081
.repaymentEvery(false) //
40824082
.graceOnPrincipalAndInterestPayment(false) //
4083-
.graceOnArrearsAgeing(false));
4083+
.graceOnArrearsAging(false));
40844084
final PostLoanProductsResponse responseNoOverrides = createLoanProductIdempotent(loanProductsRequestNoOverrides);
40854085
TestContext.INSTANCE.set(TestContextKey.DEFAULT_LOAN_PRODUCT_CREATE_RESPONSE_LP1_NO_OVERRIDES, responseNoOverrides);
40864086

‎fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanOverrideFieldsStepDef.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private Integer getIntFieldValue(final GetLoansLoanIdResponse loanDetails, final
7272
case "inArrearsTolerance" -> loanDetails.getInArrearsTolerance();
7373
case "graceOnPrincipalPayment" -> loanDetails.getGraceOnPrincipalPayment();
7474
case "graceOnInterestPayment" -> loanDetails.getGraceOnInterestPayment();
75-
case "graceOnArrearsAgeing" -> loanDetails.getGraceOnArrearsAgeing();
75+
case "graceOnArrearsAging" -> loanDetails.getGraceOnArrearsAging();
7676
default -> throw new IllegalArgumentException("Unknown override field: " + fieldName);
7777
};
7878
}
@@ -113,7 +113,7 @@ private void applyOverrideField(final PostLoansRequest request, final String fie
113113
case "inArrearsTolerance" -> request.inArrearsTolerance(isNull ? null : new BigDecimal(value));
114114
case "graceOnInterestPayment" -> request.graceOnInterestPayment(isNull ? null : Integer.valueOf(value));
115115
case "graceOnPrincipalPayment" -> request.graceOnPrincipalPayment(isNull ? null : Integer.valueOf(value));
116-
case "graceOnArrearsAgeing" -> request.graceOnArrearsAgeing(isNull ? null : Integer.valueOf(value));
116+
case "graceOnArrearsAging" -> request.graceOnArrearsAging(isNull ? null : Integer.valueOf(value));
117117
default -> throw new IllegalArgumentException("Unknown override field: " + fieldName);
118118
}
119119
}

0 commit comments

Comments
 (0)