Skip to content

Commit b9bbe25

Browse files
FINERACT-2455: WCP - Product Configuration
1 parent 0ea65d8 commit b9bbe25

File tree

53 files changed

+6124
-2
lines changed

Some content is hidden

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

53 files changed

+6124
-2
lines changed

build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ buildscript {
5151
'fineract-e2e-tests-core',
5252
'fineract-e2e-tests-runner',
5353
'fineract-progressive-loan',
54-
'fineract-progressive-loan-embeddable-schedule-generator'
54+
'fineract-progressive-loan-embeddable-schedule-generator',
55+
'fineract-working-capital-loan'
5556
].contains(it.name)
5657
}
5758
fineractPublishProjects = subprojects.findAll{
@@ -77,7 +78,8 @@ buildscript {
7778
'fineract-branch',
7879
'fineract-document',
7980
'fineract-progressive-loan',
80-
'fineract-progressive-loan-embeddable-schedule-generator'
81+
'fineract-progressive-loan-embeddable-schedule-generator',
82+
'fineract-working-capital-loan'
8183
].contains(it.name)
8284
}
8385
npmRepository = 'https://npm.pkg.github.com'

fineract-client-feign/src/main/java/org/apache/fineract/client/feign/FineractFeignClient.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@
172172
import org.apache.fineract.client.feign.services.TwoFactorApi;
173173
import org.apache.fineract.client.feign.services.UserGeneratedDocumentsApi;
174174
import org.apache.fineract.client.feign.services.UsersApi;
175+
import org.apache.fineract.client.feign.services.WorkingCapitalLoanProductsApi;
175176
import org.apache.fineract.client.feign.services.WorkingDaysApi;
176177

177178
/**
@@ -837,6 +838,10 @@ public UsersApi users() {
837838
return create(UsersApi.class);
838839
}
839840

841+
public WorkingCapitalLoanProductsApi workingCapitalLoanProducts() {
842+
return create(WorkingCapitalLoanProductsApi.class);
843+
}
844+
840845
public WorkingDaysApi workingDays() {
841846
return create(WorkingDaysApi.class);
842847
}

fineract-core/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,30 @@ public CommandWrapperBuilder updateLoanProduct(final Long productId) {
554554
return this;
555555
}
556556

557+
public CommandWrapperBuilder createWorkingCapitalLoanProduct() {
558+
this.actionName = "CREATE";
559+
this.entityName = "WORKINGCAPITALLOANPRODUCT";
560+
this.entityId = null;
561+
this.href = "/workingcapitalloanproducts/template";
562+
return this;
563+
}
564+
565+
public CommandWrapperBuilder updateWorkingCapitalLoanProduct(final Long productId) {
566+
this.actionName = "UPDATE";
567+
this.entityName = "WORKINGCAPITALLOANPRODUCT";
568+
this.entityId = productId;
569+
this.href = "/workingcapitalloanproducts/" + productId;
570+
return this;
571+
}
572+
573+
public CommandWrapperBuilder deleteWorkingCapitalLoanProduct(final Long productId) {
574+
this.actionName = "DELETE";
575+
this.entityName = "WORKINGCAPITALLOANPRODUCT";
576+
this.entityId = productId;
577+
this.href = "/workingcapitalloanproducts/" + productId;
578+
return this;
579+
}
580+
557581
public CommandWrapperBuilder createClientIdentifier(final Long clientId) {
558582
this.actionName = "CREATE";
559583
this.entityName = "CLIENTIDENTIFIER";

fineract-core/src/main/java/org/apache/fineract/portfolio/fund/domain/Fund.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import jakarta.persistence.UniqueConstraint;
2525
import java.util.LinkedHashMap;
2626
import java.util.Map;
27+
import lombok.Getter;
2728
import org.apache.commons.lang3.StringUtils;
2829
import org.apache.fineract.infrastructure.core.api.JsonCommand;
2930
import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
@@ -33,6 +34,7 @@
3334
@UniqueConstraint(columnNames = { "external_id" }, name = "fund_externalid_org") })
3435
public class Fund extends AbstractPersistableCustom<Long> {
3536

37+
@Getter
3638
@Column(name = "name")
3739
private String name;
3840

fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/domain/FundRepository.java renamed to fineract-core/src/main/java/org/apache/fineract/portfolio/fund/domain/FundRepository.java

File renamed without changes.

fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/exception/FundNotFoundException.java renamed to fineract-core/src/main/java/org/apache/fineract/portfolio/fund/exception/FundNotFoundException.java

File renamed without changes.

fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundReadPlatformService.java renamed to fineract-core/src/main/java/org/apache/fineract/portfolio/fund/service/FundReadPlatformService.java

File renamed without changes.

fineract-provider/dependencies.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ dependencies {
4141
implementation(project(path: ':fineract-tax'))
4242
implementation(project(path: ':fineract-loan-origination'))
4343
implementation(project(path: ':fineract-security'))
44+
implementation(project(path: ':fineract-working-capital-loan'))
4445

4546
providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
4647

fineract-provider/src/main/resources/db/changelog/db.changelog-master.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<include file="/db/changelog/tenant/module/progressiveloan/module-changelog-master.xml" context="tenant_db AND !initial_switch"/>
4040
<include file="db/changelog/tenant/module/loanorigination/module-changelog-master.xml" context="tenant_db AND !initial_switch"/>
4141
<include file="db/changelog/tenant/module/command/module-changelog-master.xml" context="tenant_db AND !initial_switch"/>
42+
<include file="db/changelog/tenant/module/workingcapitalloan/module-changelog-master.xml" context="tenant_db AND !initial_switch"/>
4243
<!-- Scripts to run after the modules were initialized -->
4344
<include file="tenant/final-changelog-tenant.xml" relativeToChangelogFile="true" context="tenant_db AND !initial_switch"/>
4445
</databaseChangeLog>

fineract-provider/src/main/resources/jpa/static-weaving/module/fineract-provider/persistence.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,11 @@
219219
<class>org.apache.fineract.portfolio.collateralmanagement.domain.CollateralManagementDomain</class>
220220
<class>org.apache.fineract.portfolio.collateral.domain.LoanCollateral</class>
221221

222+
<!-- Working Capital Loan Module Entities -->
223+
<class>org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct</class>
224+
<class>org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WCPPaymentAllocationRule</class>
225+
<class>org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WCPConfigurableAttributes</class>
226+
222227
<!-- Loan Module Converters -->
223228
<class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
224229
<class>org.apache.fineract.portfolio.loanaccount.domain.AccountingRuleTypeConverter</class>
@@ -228,6 +233,9 @@
228233
<class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
229234
<class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
230235

236+
<!-- Working Capital Loan Module Converters -->
237+
<class>org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WCPPaymentAllocationTypeListConverter</class>
238+
231239
<!-- Document Module Entities -->
232240
<class>org.apache.fineract.infrastructure.documentmanagement.domain.Document</class>
233241

0 commit comments

Comments
 (0)