CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 47 Packages Projects Releases Wiki Activity

Removed duplicate status values to check status parameter validity

Browse Source
This commit is contained in:
Manthan Surkar
2020-08-15 04:58:51 +03:00
committed by Petri Tuomola
parent db232c6088
commit d00d978c46
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java
+3 -6
View File
@@ -92,8 +92,6 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
private final ConfigurationReadPlatformService configurationReadPlatformService; private final ConfigurationReadPlatformService configurationReadPlatformService;
private final EntityDatatableChecksReadService entityDatatableChecksReadService; private final EntityDatatableChecksReadService entityDatatableChecksReadService;
private final ColumnValidator columnValidator; private final ColumnValidator columnValidator;
private final List<String> supportedStatusvalues = new ArrayList<String>(
Arrays.asList("pending", "active", "withdrawn", "closed", "rejected", "transfer_on_hold", "transfer_in_progreess"));
@Autowired @Autowired
public ClientReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, public ClientReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource,
@@ -181,12 +179,11 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
public Page<ClientData> retrieveAll(final SearchParameters searchParameters) { public Page<ClientData> retrieveAll(final SearchParameters searchParameters) {
if (searchParameters != null && searchParameters.getStatus() != null if (searchParameters != null && searchParameters.getStatus() != null
&& !supportedStatusvalues.contains(searchParameters.getStatus())) { && ClientStatus.fromString(searchParameters.getStatus()) == ClientStatus.INVALID) {
final List<ApiParameterError> dataValidationErrors = new ArrayList<>(); final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
final String defaultUserMessage = "The Status value '" + searchParameters.getStatus() final String defaultUserMessage = "The Status value '" + searchParameters.getStatus() + "' is not supported.";
+ "' is not supported. The supported status values are " + supportedStatusvalues.toString();
final ApiParameterError error = ApiParameterError.parameterError("validation.msg.client.status.value.is.not.supported", final ApiParameterError error = ApiParameterError.parameterError("validation.msg.client.status.value.is.not.supported",
defaultUserMessage, "status", searchParameters.getStatus(), supportedStatusvalues.toString()); defaultUserMessage, "status", searchParameters.getStatus());
dataValidationErrors.add(error); dataValidationErrors.add(error);
throw new PlatformApiDataValidationException(dataValidationErrors); throw new PlatformApiDataValidationException(dataValidationErrors);
} }