Skip to content

Commit 589600a

Browse files
Aman-MittalAman-Mittal
authored
Merge branch 'apache:develop' into FINERACT-2421/maintainability-refractor-phase-5
2 parents c1f049c + 3a6f805 commit 589600a

29 files changed

Lines changed: 1095 additions & 129 deletions

File tree

‎.github/workflows/build-cucumber.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
distribution: 'zulu'
4040

4141
- name: Cache Gradle dependencies
42-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v4
42+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v4
4343
with:
4444
path: |
4545
~/.gradle/caches

‎.github/workflows/build-mariadb.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
distribution: 'zulu'
5757

5858
- name: Cache Gradle dependencies
59-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v4
59+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v4
6060
with:
6161
path: |
6262
~/.gradle/caches

‎.github/workflows/build-mysql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
distribution: 'zulu'
5757

5858
- name: Cache Gradle dependencies
59-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v4
59+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v4
6060
with:
6161
path: |
6262
~/.gradle/caches

‎.github/workflows/build-postgresql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
distribution: 'zulu'
5858

5959
- name: Cache Gradle dependencies
60-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v4
60+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v4
6161
with:
6262
path: |
6363
~/.gradle/caches

‎.github/workflows/liquibase-only-postgresql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
distribution: 'zulu'
3939

4040
- name: Cache Gradle dependencies
41-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v4
41+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v4
4242
with:
4343
path: |
4444
~/.gradle/caches

‎build.gradle‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ buildscript {
3737
'fineract-charge',
3838
'fineract-rates',
3939
'fineract-tax',
40+
'fineract-loan-origination',
4041
'fineract-loan',
4142
'fineract-savings',
4243
'fineract-report',
@@ -67,6 +68,7 @@ buildscript {
6768
'fineract-charge',
6869
'fineract-rates',
6970
'fineract-tax',
71+
'fineract-loan-origination',
7072
'fineract-loan',
7173
'fineract-savings',
7274
'fineract-report',
@@ -117,6 +119,7 @@ plugins {
117119
id 'org.openapi.generator' version '7.8.0' apply false
118120
id 'com.gradleup.shadow' version '8.3.5' apply false
119121
id 'me.champeau.jmh' version '0.7.1' apply false
122+
id 'org.cyclonedx.bom' version '3.1.0' apply false
120123
}
121124

122125
apply from: "${rootDir}/buildSrc/src/main/groovy/org.apache.fineract.release.gradle"
@@ -886,6 +889,16 @@ configure(project.fineractPublishProjects) {
886889
}
887890
}
888891

892+
// Configuration for CycloneDX SBOM generator
893+
// https://github.com/CycloneDX/cyclonedx-gradle-plugin
894+
apply plugin: 'org.cyclonedx.bom'
895+
896+
cyclonedxBom {
897+
projectType = "application"
898+
includeBomSerialNumber = true
899+
includeLicenseText = true
900+
}
901+
889902
task printSourceSetInformation() {
890903
doLast{
891904
sourceSets.each { srcSet ->

‎fineract-core/src/main/java/org/apache/fineract/infrastructure/core/config/FineractProperties.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@ public static class FineractModulesProperties {
600600

601601
private FineractInvestorModuleProperties investor;
602602
private FineractSelfServiceModuleProperties selfService;
603+
private FineractLoanOriginationModuleProperties loanOrigination;
603604
}
604605

605606
@Getter
@@ -614,6 +615,12 @@ public static class FineractSelfServiceModuleProperties extends AbstractFineract
614615

615616
}
616617

618+
@Getter
619+
@Setter
620+
public static class FineractLoanOriginationModuleProperties extends AbstractFineractModuleProperties {
621+
622+
}
623+
617624
@Getter
618625
@Setter
619626
public static class FineractSqlValidationProperties {

‎fineract-e2e-tests-runner/src/test/resources/features/LoanReAging.feature‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7257,26 +7257,28 @@ Then Loan Repayment schedule has 4 periods, with the following data for periods:
72577257
| 01 April 2024 | Chargeback | 12.0 | 11.42 | 0.58 | 0.0 | 0.0 | 144.99 | false | false |
72587258

72597259
# --- undo last disbursement --- #
7260-
# When Admin successfully undo last disbursal
7261-
# Then Loan Repayment schedule has 8 periods, with the following data for periods:
7262-
# | Nr | Days | Date | Paid date | Balance of loan | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
7263-
# | | | 01 January 2024 | | 100.0 | | | 0.0 | | 0.0 | 0.0 | | | |
7264-
# | 1 | 31 | 01 February 2024 | 01 February 2024 | 83.57 | 16.43 | 0.58 | 0.0 | 0.0 | 17.01 | 17.01 | 0.0 | 0.0 | 0.0 |
7265-
# | 2 | 29 | 01 March 2024 | 15 March 2024 | 83.57 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 |
7266-
# | 3 | 14 | 15 March 2024 | | 69.64 | 13.93 | 0.25 | 0.0 | 0.0 | 14.18 | 0.0 | 0.0 | 0.0 | 14.18 |
7267-
# | 4 | 31 | 15 April 2024 | | 55.71 | 13.93 | 0.25 | 0.0 | 0.0 | 14.18 | 0.0 | 0.0 | 0.0 | 14.18 |
7268-
# | 5 | 30 | 15 May 2024 | | 41.78 | 13.93 | 0.25 | 0.0 | 0.0 | 14.18 | 0.0 | 0.0 | 0.0 | 14.18 |
7269-
# | 6 | 31 | 15 June 2024 | | 27.85 | 13.93 | 0.25 | 0.0 | 0.0 | 14.18 | 0.0 | 0.0 | 0.0 | 14.18 |
7270-
# | 7 | 30 | 15 July 2024 | | 13.92 | 13.93 | 0.25 | 0.0 | 0.0 | 14.18 | 0.0 | 0.0 | 0.0 | 14.18 |
7271-
# | 8 | 31 | 15 August 2024 | | 0.0 | 13.92 | 0.26 | 0.0 | 0.0 | 14.18 | 0.0 | 0.0 | 0.0 | 14.18 |
7272-
# Then Loan Repayment schedule has the following data in Total row:
7273-
# | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
7274-
# | 100.0 | 2.09 | 0.0 | 0.0 | 102.09 | 17.01 | 0.0 | 0.0 | 85.08 |
7275-
# Then Loan Transactions tab has the following data:
7276-
# | Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance | Reverted | Replayed |
7277-
# | 01 January 2024 | Disbursement | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | 100.0 | false | false |
7278-
# | 01 February 2024 | Repayment | 17.01 | 16.43 | 0.58 | 0.0 | 0.0 | 83.57 | false | false |
7279-
# | 15 March 2024 | Re-age | 85.08 | 83.57 | 1.51 | 0.0 | 0.0 | 0.0 | false | false |
7260+
When Admin successfully undo last disbursal
7261+
Then Loan Repayment schedule has 9 periods, with the following data for periods:
7262+
| Nr | Days | Date | Paid date | Balance of loan | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
7263+
| | | 01 January 2024 | | 100.0 | | | 0.0 | | 0.0 | 0.0 | | | |
7264+
| 1 | 31 | 01 February 2024 | 01 February 2024 | 83.57 | 16.43 | 0.58 | 0.0 | 0.0 | 17.01 | 17.01 | 0.0 | 0.0 | 0.0 |
7265+
| 2 | 29 | 01 March 2024 | 15 March 2024 | 83.57 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 |
7266+
| 3 | 14 | 15 March 2024 | 15 March 2024 | 83.57 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 |
7267+
| 4 | 17 | 01 April 2024 | | 70.25 | 13.32 | 0.98 | 0.0 | 0.0 | 14.3 | 0.0 | 0.0 | 0.0 | 14.3 |
7268+
| 5 | 30 | 01 May 2024 | | 56.43 | 25.24 | 1.06 | 0.0 | 0.0 | 26.3 | 0.0 | 0.0 | 0.0 | 26.3 |
7269+
| 6 | 31 | 01 June 2024 | | 42.46 | 13.97 | 0.33 | 0.0 | 0.0 | 14.3 | 0.0 | 0.0 | 0.0 | 14.3 |
7270+
| 7 | 30 | 01 July 2024 | | 28.41 | 14.05 | 0.25 | 0.0 | 0.0 | 14.3 | 0.0 | 0.0 | 0.0 | 14.3 |
7271+
| 8 | 31 | 01 August 2024 | | 14.28 | 14.13 | 0.17 | 0.0 | 0.0 | 14.3 | 0.0 | 0.0 | 0.0 | 14.3 |
7272+
| 9 | 31 | 01 September 2024 | | 0.0 | 14.28 | 0.08 | 0.0 | 0.0 | 14.36 | 0.0 | 0.0 | 0.0 | 14.36 |
7273+
Then Loan Repayment schedule has the following data in Total row:
7274+
| Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
7275+
| 111.42 | 3.45 | 0.0 | 0.0 | 114.87 | 17.01 | 0.0 | 0.0 | 97.86 |
7276+
Then Loan Transactions tab has the following data:
7277+
| Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance | Reverted | Replayed |
7278+
| 01 January 2024 | Disbursement | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | 100.0 | false | false |
7279+
| 01 February 2024 | Repayment | 17.01 | 16.43 | 0.58 | 0.0 | 0.0 | 83.57 | false | false |
7280+
| 15 March 2024 | Re-age | 84.28 | 83.57 | 0.71 | 0.0 | 0.0 | 0.0 | false | true |
7281+
| 01 April 2024 | Chargeback | 12.0 | 11.42 | 0.58 | 0.0 | 0.0 | 94.99 | false | false |
72807282

72817283
When Loan Pay-off is made on "01 April 2024"
72827284
Then Loan is closed with zero outstanding balance and it's all installments have obligations met
@@ -9173,8 +9175,7 @@ Then Loan Repayment schedule has 4 periods, with the following data for periods:
91739175
When Loan Pay-off is made on "02 April 2024"
91749176
Then Loan is closed with zero outstanding balance and it's all installments have obligations met
91759177

9176-
# TODO check and unSkip when PS-2938 is done
9177-
@Skip @TestRailId:C4290
9178+
@TestRailId:C4290
91789179
Scenario: Verify Re-aging with loan reschedule: UC2.1: Interest handling: DEFAULT, reschedule - adjustedDueDate
91799180
When Admin sets the business date to "01 January 2024"
91809181
And Admin creates a client with random data
@@ -9285,31 +9286,30 @@ Then Loan Repayment schedule has 4 periods, with the following data for periods:
92859286
When Admin creates and approves Loan reschedule with the following data:
92869287
| rescheduleFromDate | submittedOnDate | adjustedDueDate | graceOnPrincipal | graceOnInterest | extraTerms | newInterestRate |
92879288
| 01 May 2024 | 02 April 2024 | 15 June 2024 | | | | |
9288-
# TODO check numbers
92899289
Then Loan Repayment schedule has 8 periods, with the following data for periods:
92909290
| Nr | Days | Date | Paid date | Balance of loan | Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
92919291
| | | 01 January 2024 | | 100.0 | | | 0.0 | | 0.0 | 0.0 | | | |
92929292
| 1 | 31 | 01 February 2024 | 01 February 2024 | 83.57 | 16.43 | 0.58 | 0.0 | 0.0 | 17.01 | 17.01 | 0.0 | 0.0 | 0.0 |
92939293
| 2 | 43 | 15 March 2024 | 15 March 2024 | 83.57 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 |
92949294
| 3 | 17 | 01 April 2024 | | 70.25 | 13.32 | 0.98 | 0.0 | 0.0 | 14.3 | 0.0 | 0.0 | 0.0 | 14.3 |
9295-
| 4 | 31 | 15 June 2024 | | 42.39 | 13.97 | 0.33 | 0.0 | 0.0 | 14.3 | 0.0 | 0.0 | 0.0 | 14.3 |
9296-
| 5 | 30 | 15 July 2024 | | 28.34 | 14.05 | 0.25 | 0.0 | 0.0 | 14.3 | 0.0 | 0.0 | 0.0 | 14.3 |
9297-
| 6 | 31 | 15 August 2024 | | 14.21 | 14.13 | 0.17 | 0.0 | 0.0 | 14.3 | 0.0 | 0.0 | 0.0 | 14.3 |
9298-
| 7 | 31 | 15 September 2024 | | 0.0 | 14.21 | 0.08 | 0.0 | 0.0 | 14.29 | 0.0 | 0.0 | 0.0 | 14.29 |
9299-
| 8 | 31 | 15 October 2024 | | 0.0 | 14.21 | 0.08 | 0.0 | 0.0 | 14.29 | 0.0 | 0.0 | 0.0 | 14.29 |
9295+
| 4 | 75 | 15 June 2024 | | 56.96 | 13.29 | 1.01 | 0.0 | 0.0 | 14.3 | 0.0 | 0.0 | 0.0 | 14.3 |
9296+
| 5 | 30 | 15 July 2024 | | 42.99 | 13.97 | 0.33 | 0.0 | 0.0 | 14.3 | 0.0 | 0.0 | 0.0 | 14.3 |
9297+
| 6 | 31 | 15 August 2024 | | 28.94 | 14.05 | 0.25 | 0.0 | 0.0 | 14.3 | 0.0 | 0.0 | 0.0 | 14.3 |
9298+
| 7 | 31 | 15 September 2024 | | 14.81 | 14.13 | 0.17 | 0.0 | 0.0 | 14.3 | 0.0 | 0.0 | 0.0 | 14.3 |
9299+
| 8 | 30 | 15 October 2024 | | 0.0 | 14.81 | 0.09 | 0.0 | 0.0 | 14.9 | 0.0 | 0.0 | 0.0 | 14.9 |
93009300
And Loan Repayment schedule has the following data in Total row:
9301-
| Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
9302-
| 100.0 | 2.8 | 0.0 | 0.0 | 102.8 | 17.01 | 0.0 | 0.0 | 85.79 |
9301+
| Principal due | Interest | Fees | Penalties | Due | Paid | In advance | Late | Outstanding |
9302+
| 100.0 | 3.41 | 0.0 | 0.0 | 103.41 | 17.01 | 0.0 | 0.0 | 86.4 |
93039303
And Loan Transactions tab has the following data:
93049304
| Transaction date | Transaction Type | Amount | Principal | Interest | Fees | Penalties | Loan Balance | Reverted | Replayed |
93059305
| 01 January 2024 | Disbursement | 100.0 | 0.0 | 0.0 | 0.0 | 0.0 | 100.0 | false | false |
93069306
| 01 February 2024 | Repayment | 17.01 | 16.43 | 0.58 | 0.0 | 0.0 | 83.57 | false | false |
9307-
| 15 March 2024 | Re-age | 84.28 | 83.57 | 0.71 | 0.0 | 0.0 | 0.0 | false | false |
9307+
| 15 March 2024 | Re-age | 84.27 | 83.57 | 0.7 | 0.0 | 0.0 | 0.0 | false | false |
93089308
# --- Close loan ---
93099309
When Loan Pay-off is made on "02 April 2024"
93109310
Then Loan is closed with zero outstanding balance and it's all installments have obligations met
93119311

9312-
# TODO check and unSkip when PS-2938 is done
9312+
# TODO check and unSkip when WAIVE_INTEREST strategy is implemented
93139313
@Skip @TestRailId:C4291
93149314
Scenario: Verify Re-aging with loan reschedule: UC2.2: Interest handling: WAIVE_INTEREST, reschedule - adjustedDueDate
93159315
When Admin sets the business date to "01 January 2024"

0 commit comments

Comments
 (0)