Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-9472

Browse Source 
fixing 500 bug when calling upload endpoint
This commit is contained in:
yhampe 2024-12-12 08:43:46 +01:00
parent b5dbf360a3
commit 577158ea5d
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java vendored
View File

@ -75,16 +75,27 @@ public class RulesController implements RulesResource {
if (ruleEntityOptional.isPresent()) { if (ruleEntityOptional.isPresent()) {
RulesUpdateRequest rulesUpdateRequest = new RulesUpdateRequest(ruleEntityOptional.get().getValue(), rules.getRules()); RulesUpdateRequest rulesUpdateRequest = new RulesUpdateRequest(ruleEntityOptional.get().getValue(), rules.getRules());
try { try {
ResponseEntity mergedRules = ruleBuilderClient.mergeUserUpdateRules(rulesUpdateRequest); ResponseEntity<RulesUploadResponse> mergedRules = ruleBuilderClient.mergeUserUpdateRules(rulesUpdateRequest);
if (mergedRules == null || mergedRules.getBody() == null) {
throw new BadRequestException("Failed to merge rules - received null response from service");
}
if (mergedRules.getStatusCode().equals(HttpStatus.UNPROCESSABLE_ENTITY)) { if (mergedRules.getStatusCode().equals(HttpStatus.UNPROCESSABLE_ENTITY)) {
DroolsValidationResponse mergedRulesValidationResponse = ((RulesUploadResponse) mergedRules.getBody()).getDroolsValidationResponse(); DroolsValidationResponse mergedRulesValidationResponse = mergedRules.getBody().getDroolsValidationResponse();
return new ResponseEntity<>(mergedRulesValidationResponse, !rules.isDryRun() ? HttpStatus.UNPROCESSABLE_ENTITY : HttpStatus.OK); return new ResponseEntity<>(mergedRulesValidationResponse, !rules.isDryRun() ? HttpStatus.UNPROCESSABLE_ENTITY : HttpStatus.OK);
} }
mergedRulesString = ((RulesUploadResponse) mergedRules.getBody()).getRules();
mergedRulesString = mergedRules.getBody().getRules();
if (mergedRulesString == null) {
throw new BadRequestException("Failed to merge rules - merged result is null");
}
} catch (FeignException e) { } catch (FeignException e) {
if (e.status() == HttpStatus.BAD_REQUEST.value()) { if (e.status() == HttpStatus.BAD_REQUEST.value()) {
throw new BadRequestException("The provided rule file is not a valid drools rule file!"); throw new BadRequestException("The provided rule file is not a valid drools rule file!");
} }
throw new BadRequestException("Failed to merge rules: " + e.getMessage());
} }
} }
if (!rules.isDryRun()) { if (!rules.isDryRun()) {