From ad3e518291573f6559c27c8892f7cb88f056385d Mon Sep 17 00:00:00 2001 From: jmarta Date: Fri, 15 Sep 2023 15:06:36 +0200 Subject: [PATCH] FINERACT-1976: Payment type permissions not working --- .../paymenttype/api/PaymentTypeApiResourceConstants.java | 1 - .../portfolio/paymenttype/api/PaymentTypeApiResource.java | 4 ++-- .../portfolio/paymenttype/data/PaymentTypeDataValidator.java | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceConstants.java b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceConstants.java index be7b4f00f..1e28e3a44 100644 --- a/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceConstants.java +++ b/fineract-core/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceConstants.java @@ -31,7 +31,6 @@ public final class PaymentTypeApiResourceConstants { public static final String RESOURCE_NAME = "paymenttype"; public static final String ENTITY_NAME = "PAYMENTTYPE"; - public static final String resourceNameForPermissions = "PAYMENT_TYPE"; public static final String ID = "id"; public static final String NAME = "name"; public static final String DESCRIPTION = "description"; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java index 478893509..944f5364c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResource.java @@ -75,7 +75,7 @@ public class PaymentTypeApiResource { @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = PaymentTypeApiResourceSwagger.GetPaymentTypesResponse.class)))) }) public String getAllPaymentTypes(@Context final UriInfo uriInfo, @QueryParam("onlyWithCode") @Parameter(description = "onlyWithCode") final boolean onlyWithCode) { - this.securityContext.authenticatedUser().validateHasReadPermission(PaymentTypeApiResourceConstants.resourceNameForPermissions); + this.securityContext.authenticatedUser().validateHasReadPermission(PaymentTypeApiResourceConstants.ENTITY_NAME); Collection paymentTypes = null; if (onlyWithCode) { paymentTypes = this.readPlatformService.retrieveAllPaymentTypesWithCode(); @@ -95,7 +95,7 @@ public class PaymentTypeApiResource { @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = PaymentTypeApiResourceSwagger.GetPaymentTypesPaymentTypeIdResponse.class))) }) public String retrieveOnePaymentType(@PathParam("paymentTypeId") @Parameter(description = "paymentTypeId") final Long paymentTypeId, @Context final UriInfo uriInfo) { - this.securityContext.authenticatedUser().validateHasReadPermission(PaymentTypeApiResourceConstants.resourceNameForPermissions); + this.securityContext.authenticatedUser().validateHasReadPermission(PaymentTypeApiResourceConstants.ENTITY_NAME); this.paymentTypeRepositoryWrapper.findOneWithNotFoundDetection(paymentTypeId); final PaymentTypeData paymentTypes = this.readPlatformService.retrieveOne(paymentTypeId); final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters()); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/data/PaymentTypeDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/data/PaymentTypeDataValidator.java index 23a570242..f37c301a0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/data/PaymentTypeDataValidator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/data/PaymentTypeDataValidator.java @@ -69,7 +69,7 @@ public class PaymentTypeDataValidator { final List dataValidationErrors = new ArrayList<>(); final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors) - .resource(PaymentTypeApiResourceConstants.resourceNameForPermissions); + .resource(PaymentTypeApiResourceConstants.ENTITY_NAME); if (this.fromApiJsonHelper.parameterExists(PaymentTypeApiResourceConstants.NAME, element)) { final String name = this.fromApiJsonHelper.extractStringNamed(PaymentTypeApiResourceConstants.NAME, element); @@ -131,7 +131,7 @@ public class PaymentTypeDataValidator { final List dataValidationErrors = new ArrayList<>(); final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors) - .resource(PaymentTypeApiResourceConstants.resourceNameForPermissions); + .resource(PaymentTypeApiResourceConstants.ENTITY_NAME); if (this.fromApiJsonHelper.parameterExists(PaymentTypeApiResourceConstants.NAME, element)) { final String name = this.fromApiJsonHelper.extractStringNamed(PaymentTypeApiResourceConstants.NAME, element);