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 b9cfa470ff FINERACT-2169: Apply dto in
LoanCollateralManagementApiResource
b9cfa470ff is described below
commit b9cfa470ffe9955b9eb6dc2b56f4e228b51857d0
Author: oleksandr.masliuk <oleksandr.masl...@onix-systems.com>
AuthorDate: Sun Mar 30 20:04:33 2025 +0300
FINERACT-2169: Apply dto in LoanCollateralManagementApiResource
---
.../api/LoanCollateralManagementApiResource.java | 20 +++++---------------
.../data/LoanCollateralResponseData.java | 13 ++++---------
2 files changed, 9 insertions(+), 24 deletions(-)
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/LoanCollateralManagementApiResource.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/LoanCollateralManagementApiResource.java
index 029d752cb9..6d0d9ca409 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/LoanCollateralManagementApiResource.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/LoanCollateralManagementApiResource.java
@@ -32,11 +32,7 @@ import lombok.RequiredArgsConstructor;
import org.apache.fineract.commands.domain.CommandWrapper;
import org.apache.fineract.commands.service.CommandWrapperBuilder;
import
org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
-import
org.apache.fineract.infrastructure.codes.service.CodeValueReadPlatformService;
-import org.apache.fineract.infrastructure.core.api.ApiRequestParameterHelper;
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
-import
org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer;
-import
org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
import
org.apache.fineract.portfolio.collateralmanagement.data.LoanCollateralResponseData;
import
org.apache.fineract.portfolio.collateralmanagement.service.LoanCollateralManagementReadPlatformService;
import org.springframework.stereotype.Component;
@@ -47,24 +43,19 @@ import org.springframework.stereotype.Component;
@RequiredArgsConstructor
public class LoanCollateralManagementApiResource {
- private final DefaultToApiJsonSerializer<LoanCollateralResponseData>
apiJsonSerializerService;
- private final ApiRequestParameterHelper apiRequestParameterHelper;
private final PortfolioCommandSourceWritePlatformService
commandsSourceWritePlatformService;
- private final PlatformSecurityContext context;
private final LoanCollateralManagementReadPlatformService
loanCollateralManagementReadPlatformService;
- private final CodeValueReadPlatformService codeValueReadPlatformService;
@DELETE
@Path("{id}")
@Produces({ MediaType.APPLICATION_JSON })
@Consumes({ MediaType.APPLICATION_JSON })
@Operation(description = "Delete Loan Collateral", summary = "Delete Loan
Collateral")
- public String deleteLoanCollateral(@PathParam("loanId")
@Parameter(description = "loanId") final Long loanId,
+ public CommandProcessingResult deleteLoanCollateral(@PathParam("loanId")
@Parameter(description = "loanId") final Long loanId,
@PathParam("id") @Parameter(description = "loan collateral id")
final Long id) {
final CommandWrapper commandWrapper = new
CommandWrapperBuilder().deleteLoanCollateral(loanId, id).build();
- final CommandProcessingResult commandProcessingResult =
this.commandsSourceWritePlatformService.logCommandSource(commandWrapper);
- return
this.apiJsonSerializerService.serialize(commandProcessingResult);
+ return
this.commandsSourceWritePlatformService.logCommandSource(commandWrapper);
}
@GET
@@ -72,10 +63,9 @@ public class LoanCollateralManagementApiResource {
@Produces({ MediaType.APPLICATION_JSON })
@Consumes({ MediaType.APPLICATION_JSON })
@Operation(description = "Get Loan Collateral Details", summary = "Get
Loan Collateral Details")
- public String getLoanCollateral(@PathParam("collateralId")
@Parameter(description = "collateralId") final Long collateralId) {
- final LoanCollateralResponseData loanCollateralResponseData =
this.loanCollateralManagementReadPlatformService
- .getLoanCollateralResponseData(collateralId);
- return
this.apiJsonSerializerService.serialize(loanCollateralResponseData);
+ public LoanCollateralResponseData getLoanCollateral(
+ @PathParam("collateralId") @Parameter(description =
"collateralId") final Long collateralId) {
+ return
this.loanCollateralManagementReadPlatformService.getLoanCollateralResponseData(collateralId);
}
}
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/data/LoanCollateralResponseData.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/data/LoanCollateralResponseData.java
index db66ed8d48..67b3047f8e 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/data/LoanCollateralResponseData.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/data/LoanCollateralResponseData.java
@@ -19,9 +19,13 @@
package org.apache.fineract.portfolio.collateralmanagement.data;
import java.math.BigDecimal;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
import
org.apache.fineract.portfolio.loanaccount.data.LoanCollateralManagementData;
import
org.apache.fineract.portfolio.loanaccount.domain.LoanCollateralManagement;
+@Getter
+@AllArgsConstructor
public final class LoanCollateralResponseData {
private Long collateralId;
@@ -34,15 +38,6 @@ public final class LoanCollateralResponseData {
private Long clientCollateralId;
- private LoanCollateralResponseData(final Long collateralId, final
BigDecimal quantity, final BigDecimal total,
- final BigDecimal totalCollateral, final Long clientCollateralId) {
- this.collateralId = collateralId;
- this.quantity = quantity;
- this.total = total;
- this.totalCollateral = totalCollateral;
- this.clientCollateralId = clientCollateralId;
- }
-
public static LoanCollateralResponseData instanceOf(final
LoanCollateralManagement loanCollateralManagement, final BigDecimal total,
final BigDecimal totalCollateral) {
return new
LoanCollateralResponseData(loanCollateralManagement.getId(),
loanCollateralManagement.getQuantity(), total,
