update error messages into private api; update generals
This commit is contained in:
parent
3ff6b06078
commit
02b559d52c
Binary file not shown.
@ -12,6 +12,9 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
public class RequestValidatorHelper {
|
public class RequestValidatorHelper {
|
||||||
private final RequestValidationConfig config;
|
private final RequestValidationConfig config;
|
||||||
|
|
||||||
|
private static final String REQUIRED_CODE = "VDE01";
|
||||||
|
private static final String VALIDATE_CODE = "VDE02";
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public RequestValidatorHelper(
|
public RequestValidatorHelper(
|
||||||
RequestValidationConfig config
|
RequestValidationConfig config
|
||||||
@ -27,7 +30,6 @@ public class RequestValidatorHelper {
|
|||||||
required(request.getServiceCode(), "servicingOrderProcedureInstanceRecord.serviceOrderDescription");
|
required(request.getServiceCode(), "servicingOrderProcedureInstanceRecord.serviceOrderDescription");
|
||||||
required(request.getServiceType(), "servicingOrderProcedureInstanceRecord.serviceOrderType");
|
required(request.getServiceType(), "servicingOrderProcedureInstanceRecord.serviceOrderType");
|
||||||
required(request.getServiceObserver(), "servicingOrderProcedureInstanceRecord.servicingOrderTask.task");
|
required(request.getServiceObserver(), "servicingOrderProcedureInstanceRecord.servicingOrderTask.task");
|
||||||
//required(request.getChannelCode(), "procedureRequest.instructionPurposeType");
|
|
||||||
required(request.getCustomerReferenceFintechId(), "customerReferenceFintechId");
|
required(request.getCustomerReferenceFintechId(), "customerReferenceFintechId");
|
||||||
required(request.getAppId(), "appId");
|
required(request.getAppId(), "appId");
|
||||||
}
|
}
|
||||||
@ -40,19 +42,17 @@ public class RequestValidatorHelper {
|
|||||||
validate(request.getAccountNumber(), config.accountNumber(), "servicingOrderProcedureInstanceRecord.workProduct.productReference");
|
validate(request.getAccountNumber(), config.accountNumber(), "servicingOrderProcedureInstanceRecord.workProduct.productReference");
|
||||||
validate(request.getServiceCode(), config.serviceCode(), "servicingOrderProcedureInstanceRecord.serviceOrderDescription");
|
validate(request.getServiceCode(), config.serviceCode(), "servicingOrderProcedureInstanceRecord.serviceOrderDescription");
|
||||||
validate(request.getServiceType(), config.serviceType(), "servicingOrderProcedureInstanceRecord.serviceOrderType");
|
validate(request.getServiceType(), config.serviceType(), "servicingOrderProcedureInstanceRecord.serviceOrderType");
|
||||||
validate(request.getServiceObserver(), config.serviceObserver(), "servicingOrderProcedureInstanceRecord.servicingOrderTask.task");
|
validate(request.getServiceObserver(), config.serviceObserver(), "servicingOrderProcedureInstanceRecord.servicingOrderTask.task");}
|
||||||
//validate(request.getChannelCode(), config.channelCode(), "procedureRequest.instructionPurposeType");
|
|
||||||
}
|
|
||||||
|
|
||||||
private void required(String value, String fieldName) {
|
private void required(String value, String fieldName) {
|
||||||
if (value == null || value.trim().isEmpty()) {
|
if (value == null || value.trim().isEmpty()) {
|
||||||
throw HttpStatusCodeException.badRequest("VDE01", fieldName);
|
throw HttpStatusCodeException.badRequest(REQUIRED_CODE, fieldName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void validate(String value, String regex, String fieldName) {
|
private void validate(String value, String regex, String fieldName) {
|
||||||
if (value != null && !value.isEmpty() && !value.matches(regex)) {
|
if (value != null && !value.isEmpty() && !value.matches(regex)) {
|
||||||
throw HttpStatusCodeException.badRequest("VDE02", fieldName);
|
throw HttpStatusCodeException.badRequest(VALIDATE_CODE, fieldName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user