apache · avivijay19 · May 3, 2026
diff --git a/...provider/src/main/java/org/apache/fineract/infrastructure/core/config/SecurityConfig.java b/...provider/src/main/java/org/apache/fineract/infrastructure/core/config/SecurityConfig.java
@@ -273,6 +273,17 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                     .hasAnyAuthority(ALL_FUNCTIONS, ALL_FUNCTIONS_WRITE, "UPDATE_CLIENTIMAGE")
                     .requestMatchers(API_MATCHER.matcher(HttpMethod.DELETE, "/api/*/clients/*/images"))
                     .hasAnyAuthority(ALL_FUNCTIONS, ALL_FUNCTIONS_WRITE, "DELETE_CLIENTIMAGE")
+                    // collateral: clients
+                    .requestMatchers(API_MATCHER.matcher(HttpMethod.GET, "/api/*/clients/*/collaterals"))
+                    .hasAnyAuthority(ALL_FUNCTIONS, ALL_FUNCTIONS_READ, "READ_CLIENT_COLLATERAL_PRODUCT")
+                    .requestMatchers(API_MATCHER.matcher(HttpMethod.GET, "/api/*/clients/*/collaterals/*"))
+                    .hasAnyAuthority(ALL_FUNCTIONS, ALL_FUNCTIONS_READ, "READ_CLIENT_COLLATERAL_PRODUCT")
+                    .requestMatchers(API_MATCHER.matcher(HttpMethod.POST, "/api/*/clients/*/collaterals"))
+                    .hasAnyAuthority(ALL_FUNCTIONS, ALL_FUNCTIONS_WRITE, "CREATE_CLIENT_COLLATERAL_PRODUCT")
+                    .requestMatchers(API_MATCHER.matcher(HttpMethod.PUT, "/api/*/clients/*/collaterals/*"))
+                    .hasAnyAuthority(ALL_FUNCTIONS, ALL_FUNCTIONS_WRITE, "UPDATE_CLIENT_COLLATERAL_PRODUCT")
+                    .requestMatchers(API_MATCHER.matcher(HttpMethod.DELETE, "/api/*/clients/*/collaterals/*"))
+                    .hasAnyAuthority(ALL_FUNCTIONS, ALL_FUNCTIONS_WRITE, "DELETE_CLIENT_COLLATERAL_PRODUCT")
                     // image: staff
                     .requestMatchers(API_MATCHER.matcher(HttpMethod.GET, "/api/*/staff/*/images"))
                     .hasAnyAuthority(ALL_FUNCTIONS, ALL_FUNCTIONS_READ, "READ_DOCUMENT")

diff --git a/...he/fineract/portfolio/collateralmanagement/api/ClientCollateralManagementApiResource.java b/...he/fineract/portfolio/collateralmanagement/api/ClientCollateralManagementApiResource.java
@@ -34,113 +34,96 @@
 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 java.util.List;
 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.core.data.CommandProcessingResult;
-import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer;
-import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.command.core.CommandDispatcher;
+import org.apache.fineract.portfolio.collateralmanagement.command.ClientCollateralCreateCommand;
+import org.apache.fineract.portfolio.collateralmanagement.command.ClientCollateralDeleteCommand;
+import org.apache.fineract.portfolio.collateralmanagement.command.ClientCollateralUpdateCommand;
+import org.apache.fineract.portfolio.collateralmanagement.data.ClientCollateralCreateRequest;
+import org.apache.fineract.portfolio.collateralmanagement.data.ClientCollateralCreateResponse;
+import org.apache.fineract.portfolio.collateralmanagement.data.ClientCollateralDeleteRequest;
+import org.apache.fineract.portfolio.collateralmanagement.data.ClientCollateralDeleteResponse;
 import org.apache.fineract.portfolio.collateralmanagement.data.ClientCollateralManagementData;
-import org.apache.fineract.portfolio.collateralmanagement.data.ClientCollateralRequest;
+import org.apache.fineract.portfolio.collateralmanagement.data.ClientCollateralUpdateRequest;
+import org.apache.fineract.portfolio.collateralmanagement.data.ClientCollateralUpdateResponse;
 import org.apache.fineract.portfolio.collateralmanagement.data.LoanCollateralTemplateData;
-import org.apache.fineract.portfolio.collateralmanagement.data.UpdateClientCollateralRequest;
-import org.apache.fineract.portfolio.collateralmanagement.service.ClientCollateralManagementReadPlatformService;
+import org.apache.fineract.portfolio.collateralmanagement.service.ClientCollateralManagementReadService;
 import org.springframework.stereotype.Component;
 
 @Path("/v1/clients/{clientId}/collaterals")
 @Component
 @Tag(name = "Client Collateral Management", description = "Client Collateral Management is for managing collateral operations")
 @RequiredArgsConstructor
+@Consumes({ MediaType.APPLICATION_JSON })
+@Produces({ MediaType.APPLICATION_JSON })
 public class ClientCollateralManagementApiResource {
 
-    private final DefaultToApiJsonSerializer<ClientCollateralManagementData> apiJsonSerializerDataService;
-    private final DefaultToApiJsonSerializer<LoanCollateralTemplateData> apiJsonSerializerForLoanCollateralTemplateService;
-    private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
-    private final PlatformSecurityContext context;
-    private final ClientCollateralManagementReadPlatformService clientCollateralManagementReadPlatformService;
+    private final CommandDispatcher dispatcher;
+    private final ClientCollateralManagementReadService clientCollateralManagementReadService;
 
     @GET
-    @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Get Clients Collateral Products", operationId = "getClientCollateralProducts", description = "Get Collateral Product of a Client")
     public List<ClientCollateralManagementData> getClientCollateral(
-            @PathParam("clientId") @Parameter(description = "clientId") final Long clientId, @Context final UriInfo uriInfo,
+            @PathParam("clientId") @Parameter(description = "clientId") final Long clientId,
             @QueryParam("prodId") @Parameter(description = "prodId") final Long prodId) {
-
-        this.context.authenticatedUser()
-                .validateHasReadPermission(CollateralManagementJsonInputParams.CLIENT_COLLATERAL_PRODUCT_READ_PERMISSION.getValue());
-
-        return this.clientCollateralManagementReadPlatformService.getClientCollaterals(clientId, prodId);
+        return this.clientCollateralManagementReadService.getClientCollaterals(clientId, prodId);
     }
 
     @GET
     @Path("{clientCollateralId}")
-    @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Get Client Collateral Data", operationId = "getClientCollateralData", description = "Get Client Collateral Data")
     public ClientCollateralManagementData getClientCollateralData(
             @PathParam("clientId") @Parameter(description = "clientId") final Long clientId,
             @PathParam("clientCollateralId") @Parameter(description = "clientCollateralId") final Long collateralId) {
-
-        this.context.authenticatedUser()
-                .validateHasReadPermission(CollateralManagementJsonInputParams.CLIENT_COLLATERAL_PRODUCT_READ_PERMISSION.getValue());
-
-        return this.clientCollateralManagementReadPlatformService.getClientCollateralManagementData(collateralId);
+        return this.clientCollateralManagementReadService.getClientCollateralManagementData(collateralId);
     }
 
     @GET
     @Path("template")
-    @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Get Client Collateral Template", operationId = "getClientCollateralTemplate", description = "Get Client Collateral Template")
     public List<LoanCollateralTemplateData> getClientCollateralTemplate(
             @PathParam("clientId") @Parameter(description = "clientId") final Long clientId) {
-        return this.clientCollateralManagementReadPlatformService.getLoanCollateralTemplate(clientId);
+        return this.clientCollateralManagementReadService.getLoanCollateralTemplate(clientId);
     }
 
     @POST
-    @Produces({ MediaType.APPLICATION_JSON })
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Add New Collateral For a Client", operationId = "addClientCollateral", description = "Add New Collateral For a Client")
-    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ClientCollateralRequest.class)))
-    @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientCollateralManagementApiResourceSwagger.PostClientCollateralResponse.class)))
-    public CommandProcessingResult addCollateral(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId,
-            @Parameter(hidden = true) ClientCollateralRequest clientCollateralRequest) {
-        final CommandWrapper commandWrapper = new CommandWrapperBuilder().addClientCollateralProduct(clientId)
-                .withJson(apiJsonSerializerDataService.serialize(clientCollateralRequest)).build();
-
-        return this.commandsSourceWritePlatformService.logCommandSource(commandWrapper);
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ClientCollateralCreateRequest.class)))
+    @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientCollateralCreateResponse.class)))
+    public ClientCollateralCreateResponse addCollateral(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId,
+            @Parameter(hidden = true) ClientCollateralCreateRequest request) {
+        request.setClientId(clientId);
+        final var command = new ClientCollateralCreateCommand();
+        command.setPayload(request);
+        return dispatcher.<ClientCollateralCreateRequest, ClientCollateralCreateResponse>dispatch(command).get();
     }
 
     @PUT
     @Path("{collateralId}")
-    @Produces({ MediaType.APPLICATION_JSON })
-    @Consumes({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Update New Collateral of a Client", operationId = "updateClientCollateral", description = "Update New Collateral of a Client")
-    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = UpdateClientCollateralRequest.class)))
-    @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientCollateralManagementApiResourceSwagger.PutClientCollateralResponse.class)))
-    public CommandProcessingResult updateCollateral(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId,
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ClientCollateralUpdateRequest.class)))
+    @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientCollateralUpdateResponse.class)))
+    public ClientCollateralUpdateResponse updateCollateral(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId,
             @PathParam("collateralId") @Parameter(description = "collateralId") final Long collateralId,
-            @Parameter(hidden = true) UpdateClientCollateralRequest updateClientCollateralRequest) {
-
-        final CommandWrapper commandWrapper = new CommandWrapperBuilder().updateClientCollateralProduct(clientId, collateralId)
-                .withJson(apiJsonSerializerDataService.serialize(updateClientCollateralRequest)).build();
-
-        return this.commandsSourceWritePlatformService.logCommandSource(commandWrapper);
+            @Parameter(hidden = true) ClientCollateralUpdateRequest request) {
+        request.setClientId(clientId);
+        request.setCollateralId(collateralId);
+        final var command = new ClientCollateralUpdateCommand();
+        command.setPayload(request);
+        return dispatcher.<ClientCollateralUpdateRequest, ClientCollateralUpdateResponse>dispatch(command).get();
     }
 
     @DELETE
     @Path("{collateralId}")
-    @Produces({ MediaType.APPLICATION_JSON })
     @Operation(summary = "Delete Client Collateral", operationId = "deleteClientCollateral", description = "Delete Client Collateral")
-
-    @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientCollateralManagementApiResourceSwagger.DeleteClientCollateralResponse.class)))
-    public CommandProcessingResult deleteCollateral(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId,
+    @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = ClientCollateralDeleteResponse.class)))
+    public ClientCollateralDeleteResponse deleteCollateral(@PathParam("clientId") @Parameter(description = "clientId") final Long clientId,
             @PathParam("collateralId") @Parameter(description = "collateralId") final Long collateralId) {
-        final CommandWrapper commandWrapper = new CommandWrapperBuilder().deleteClientCollateralProduct(collateralId, clientId).build();
-        return this.commandsSourceWritePlatformService.logCommandSource(commandWrapper);
+        final var request = ClientCollateralDeleteRequest.builder().clientId(clientId).collateralId(collateralId).build();
+        final var command = new ClientCollateralDeleteCommand();
+        command.setPayload(request);
+        return dispatcher.<ClientCollateralDeleteRequest, ClientCollateralDeleteResponse>dispatch(command).get();
     }
-
 }
diff --git a/...ract/portfolio/collateralmanagement/api/ClientCollateralManagementApiResourceSwagger.java b/...ract/portfolio/collateralmanagement/api/ClientCollateralManagementApiResourceSwagger.java
diff --git a/...ateralManagementWritePlatformService.java → ...ommand/ClientCollateralCreateCommand.java b/...ateralManagementWritePlatformService.java → ...ommand/ClientCollateralCreateCommand.java
@@ -16,17 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.fineract.portfolio.collateralmanagement.service;
+package org.apache.fineract.portfolio.collateralmanagement.command;
 
-import org.apache.fineract.infrastructure.core.api.JsonCommand;
-import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.fineract.command.core.Command;
+import org.apache.fineract.portfolio.collateralmanagement.data.ClientCollateralCreateRequest;
 
-public interface ClientCollateralManagementWritePlatformService {
-
-    CommandProcessingResult addClientCollateralProduct(JsonCommand command);
-
-    CommandProcessingResult updateClientCollateralProduct(JsonCommand command);
-
-    CommandProcessingResult deleteClientCollateralProduct(Long collateralId);
-
-}
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ClientCollateralCreateCommand extends Command<ClientCollateralCreateRequest> {}
diff --git a/...apache/fineract/portfolio/collateralmanagement/command/ClientCollateralDeleteCommand.java b/...apache/fineract/portfolio/collateralmanagement/command/ClientCollateralDeleteCommand.java
@@ -0,0 +1,28 @@
+/**
+ * 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.collateralmanagement.command;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.fineract.command.core.Command;
+import org.apache.fineract.portfolio.collateralmanagement.data.ClientCollateralDeleteRequest;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ClientCollateralDeleteCommand extends Command<ClientCollateralDeleteRequest> {}
diff --git a/...apache/fineract/portfolio/collateralmanagement/command/ClientCollateralUpdateCommand.java b/...apache/fineract/portfolio/collateralmanagement/command/ClientCollateralUpdateCommand.java
@@ -0,0 +1,28 @@
+/**
+ * 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.collateralmanagement.command;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.fineract.command.core.Command;
+import org.apache.fineract.portfolio.collateralmanagement.data.ClientCollateralUpdateRequest;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ClientCollateralUpdateCommand extends Command<ClientCollateralUpdateRequest> {}