This is an automated email from the ASF dual-hosted git repository.
adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 0675da7aaf FINERACT-2455: Working Capital Loan action templates
0675da7aaf is described below
commit 0675da7aafe9958e8df35b0f61ee09e0eb7fb5a0
Author: Jose Alberto Hernandez <[email protected]>
AuthorDate: Thu Mar 19 23:33:52 2026 -0500
FINERACT-2455: Working Capital Loan action templates
---
.../loanaccount/data/LoanApprovalData.java | 6 +-
.../service/LoanReadPlatformServiceImpl.java | 2 +-
.../WorkingCapitalLoanConstants.java | 4 +
.../WorkingCapitalLoanTransactionsApiResource.java | 86 ++++++++++++++++++++++
.../WorkingCapitalLoanCommandTemplateData.java | 54 ++++++++++++++
...gCapitalLoanTransactionReadPlatformService.java | 27 +++++++
...italLoanTransactionReadPlatformServiceImpl.java | 59 +++++++++++++++
7 files changed, 236 insertions(+), 2 deletions(-)
diff --git
a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanApprovalData.java
b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanApprovalData.java
index 9f998a9cbf..3e84f3998f 100644
---
a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanApprovalData.java
+++
b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanApprovalData.java
@@ -33,6 +33,7 @@ public class LoanApprovalData {
private final BigDecimal approvalAmount;
private final BigDecimal netDisbursalAmount;
private final BigDecimal availableDisbursementAmountWithOverApplied;
+ private final LocalDate expectedDisbursementDate;
// import fields
private LocalDate approvedOnDate;
@@ -56,15 +57,18 @@ public class LoanApprovalData {
this.approvalDate = null;
this.netDisbursalAmount = null;
this.availableDisbursementAmountWithOverApplied = null;
+ this.expectedDisbursementDate = null;
}
public LoanApprovalData(final BigDecimal approvalAmount, final LocalDate
approvalDate, final BigDecimal netDisbursalAmount,
- final CurrencyData currency, final BigDecimal
availableDisbursementAmountWithOverApplied) {
+ final CurrencyData currency, final BigDecimal
availableDisbursementAmountWithOverApplied,
+ final LocalDate expectedDisbursementDate) {
this.approvalDate = approvalDate;
this.approvalAmount = approvalAmount;
this.netDisbursalAmount = netDisbursalAmount;
this.currency = currency;
this.availableDisbursementAmountWithOverApplied =
availableDisbursementAmountWithOverApplied;
+ this.expectedDisbursementDate = expectedDisbursementDate;
}
}
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
index 2ac10814c0..c9c478f491 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
@@ -647,7 +647,7 @@ public class LoanReadPlatformServiceImpl implements
LoanReadPlatformService, Loa
final BigDecimal availableDisbursementAmountWithOverApplied =
delinquencyReadPlatformService
.calculateAvailableDisbursementAmountWithOverApplied(loan);
return new LoanApprovalData(loan.getProposedPrincipal(),
DateUtils.getBusinessLocalDate(), loan.getNetDisbursalAmount(),
- appCurrency.toData(),
availableDisbursementAmountWithOverApplied);
+ appCurrency.toData(),
availableDisbursementAmountWithOverApplied, loan.getExpectedDisbursementDate());
}
@Override
diff --git
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/WorkingCapitalLoanConstants.java
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/WorkingCapitalLoanConstants.java
index 95266bdb5b..9bc368b2cc 100644
---
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/WorkingCapitalLoanConstants.java
+++
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/WorkingCapitalLoanConstants.java
@@ -42,4 +42,8 @@ public final class WorkingCapitalLoanConstants {
public static final String submittedOnNoteParameterName =
"submittedOnNote";
public static final String totalPaymentParamName = "totalPayment";
public static final String principalAmountParamName = "principalAmount";
+
+ // Loan commands
+ public static final String APPROVE_LOAN_COMMAND = "approve";
+ public static final String DISBURSE_LOAN_COMMAND = "disburse";
}
diff --git
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanTransactionsApiResource.java
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanTransactionsApiResource.java
new file mode 100644
index 0000000000..d0cbee0052
--- /dev/null
+++
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanTransactionsApiResource.java
@@ -0,0 +1,86 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.workingcapitalloan.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.UriInfo;
+import lombok.RequiredArgsConstructor;
+import
org.apache.fineract.infrastructure.core.exception.UnrecognizedQueryParamException;
+import org.apache.fineract.infrastructure.core.service.ExternalIdFactory;
+import
org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import
org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants;
+import
org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanCommandTemplateData;
+import
org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException;
+import
org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanApplicationReadPlatformService;
+import
org.apache.fineract.portfolio.workingcapitalloan.service.WorkingCapitalLoanTransactionReadPlatformService;
+import org.springframework.stereotype.Component;
+
+@Component
+@Path("/v1/working-capital-loans")
+@Tag(name = "Working Capital Loan Transactions", description = "Working
Capital Loan Transactions")
+@RequiredArgsConstructor
+public class WorkingCapitalLoanTransactionsApiResource {
+
+ private static final String RESOURCE_NAME_FOR_PERMISSIONS =
WorkingCapitalLoanConstants.WCL_RESOURCE_NAME;
+
+ private final PlatformSecurityContext context;
+ private final WorkingCapitalLoanApplicationReadPlatformService
readPlatformService;
+ private final WorkingCapitalLoanTransactionReadPlatformService
readTransactionPlatformService;
+
+ @GET
+ @Path("{loanId}/template")
+ @Consumes({ MediaType.APPLICATION_JSON })
+ @Produces({ MediaType.APPLICATION_JSON })
+ @Operation(operationId = "retrieveWorkingCapitalLoanTemplate", summary =
"Retrieve Working Capital Loan action template", description = "Returns loan
data for applying the proper loan action")
+ public WorkingCapitalLoanCommandTemplateData
retrieveWorkingCapitalLoanTemplate(
+ @PathParam("loanId") @Parameter(description = "loanId", required =
true) final Long loanId,
+ @QueryParam("templateType") @Parameter(description =
"templateType") final String templateType,
+ @Context final UriInfo uriInfo) {
+
this.context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSIONS);
+
+ return handleLoanTransactionTemplate(loanId, null, templateType);
+ }
+
+ private WorkingCapitalLoanCommandTemplateData
handleLoanTransactionTemplate(final Long loanId, final String loanExternalIdStr,
+ final String templateType) {
+ final Long resolvedLoanId = loanId != null ? loanId
+ :
readPlatformService.getResolvedLoanId(ExternalIdFactory.produce(loanExternalIdStr));
+ if (resolvedLoanId == null) {
+ throw new
WorkingCapitalLoanNotFoundException(ExternalIdFactory.produce(loanExternalIdStr));
+ }
+
+ final WorkingCapitalLoanCommandTemplateData
loanTransactionTemplateData = readTransactionPlatformService
+ .retrieveLoanTransactionTemplate(resolvedLoanId, templateType);
+ if (loanTransactionTemplateData == null) {
+ throw new UnrecognizedQueryParamException("command", templateType);
+ }
+
+ return loanTransactionTemplateData;
+ }
+}
diff --git
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanCommandTemplateData.java
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanCommandTemplateData.java
new file mode 100644
index 0000000000..9c6d638a98
--- /dev/null
+++
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanCommandTemplateData.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.workingcapitalloan.data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Collection;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.fineract.organisation.monetary.data.CurrencyData;
+import org.apache.fineract.portfolio.paymenttype.data.PaymentTypeData;
+
+/**
+ * Data Transfer Object for Working Capital Loan Transactions.
+ */
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WorkingCapitalLoanCommandTemplateData implements Serializable {
+
+ private Long loanId;
+ private LocalDate approvalDate;
+ private BigDecimal approvalAmount;
+
+ private LocalDate expectedDisbursementDate;
+ private BigDecimal expectedAmount;
+ private LocalDate expectedMaturityDate;
+
+ private CurrencyData currency;
+
+ private Collection<PaymentTypeData> paymentTypeOptions;
+}
diff --git
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformService.java
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformService.java
new file mode 100644
index 0000000000..5431ff2c55
--- /dev/null
+++
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformService.java
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.workingcapitalloan.service;
+
+import
org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanCommandTemplateData;
+
+public interface WorkingCapitalLoanTransactionReadPlatformService {
+
+ WorkingCapitalLoanCommandTemplateData retrieveLoanTransactionTemplate(Long
loanId, String command);
+
+}
diff --git
a/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformServiceImpl.java
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformServiceImpl.java
new file mode 100644
index 0000000000..13d5bd72a8
--- /dev/null
+++
b/fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanTransactionReadPlatformServiceImpl.java
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.workingcapitalloan.service;
+
+import java.time.LocalDate;
+import lombok.RequiredArgsConstructor;
+import
org.apache.fineract.portfolio.paymenttype.service.PaymentTypeReadService;
+import
org.apache.fineract.portfolio.workingcapitalloan.WorkingCapitalLoanConstants;
+import
org.apache.fineract.portfolio.workingcapitalloan.data.WorkingCapitalLoanCommandTemplateData;
+import
org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoan;
+import
org.apache.fineract.portfolio.workingcapitalloan.exception.WorkingCapitalLoanNotFoundException;
+import
org.apache.fineract.portfolio.workingcapitalloan.repository.WorkingCapitalLoanRepository;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class WorkingCapitalLoanTransactionReadPlatformServiceImpl implements
WorkingCapitalLoanTransactionReadPlatformService {
+
+ private final WorkingCapitalLoanRepository repository;
+ private final PaymentTypeReadService paymentTypeReadPlatformService;
+
+ @Override
+ public WorkingCapitalLoanCommandTemplateData
retrieveLoanTransactionTemplate(final Long loanId, final String command) {
+ final WorkingCapitalLoan wcLoan = retrieveWorkingCapitalLoan(loanId);
+
+ final LocalDate expectedDisbursementDate =
wcLoan.getDisbursementDetails().get(0).getExpectedDisbursementDate();
+ if (WorkingCapitalLoanConstants.APPROVE_LOAN_COMMAND.equals(command)) {
+ return
WorkingCapitalLoanCommandTemplateData.builder().approvalAmount(wcLoan.getProposedPrincipal())
+
.approvalDate(expectedDisbursementDate).expectedDisbursementDate(expectedDisbursementDate)
+
.currency(wcLoan.getLoanProduct().getCurrency().toData()).build();
+ } else if
(WorkingCapitalLoanConstants.DISBURSE_LOAN_COMMAND.equals(command)) {
+ return
WorkingCapitalLoanCommandTemplateData.builder().expectedAmount(wcLoan.getApprovedPrincipal())
+
.expectedDisbursementDate(expectedDisbursementDate).currency(wcLoan.getLoanProduct().getCurrency().toData())
+
.paymentTypeOptions(paymentTypeReadPlatformService.retrieveAllPaymentTypes()).build();
+ }
+ return null;
+ }
+
+ private WorkingCapitalLoan retrieveWorkingCapitalLoan(final Long loanId) {
+ return repository.findByIdWithFullDetails(loanId).orElseThrow(() ->
new WorkingCapitalLoanNotFoundException(loanId));
+ }
+
+}
