From 583f244d45bffdd0358d7cdf8d492cde3875c521 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 22 Oct 2024 11:47:18 +0200 Subject: [PATCH] RED-9472: seperation of system rules updated controller to return RulesUploadResponse including the droolsvalidationresponse --- .../v1/server/controller/RuleBuilderController.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java index 27bf88f2..8f3a51dd 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java @@ -10,6 +10,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RuleSyntaxWarningMessage; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest; +import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUploadResponse; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest; import com.iqser.red.service.redaction.v1.model.RuleBuilderModel; import com.iqser.red.service.redaction.v1.model.RuleValidationModel; @@ -54,7 +55,7 @@ public class RuleBuilderController implements RuleBuilderResource { @Override public ResponseEntity mergeUserUpdateRules(RulesUpdateRequest rulesUpdateRequest) { - RulesResponse rulesResponse = new RulesResponse(); + RulesUploadResponse rulesUploadResponse = new RulesUploadResponse(); DroolsValidationResponse droolsValidationResponse; RuleMergingResult mergingResult = ruleBuilderService.mergeUserRulesAndSystemRules(rulesUpdateRequest.getExistingRules(), rulesUpdateRequest.getUpdatedRules()); if (mergingResult.getMergedRules().isEmpty()) { @@ -91,12 +92,14 @@ public class RuleBuilderController implements RuleBuilderResource { if (!droolsValidation.isCompiled()) { return new ResponseEntity<>(droolsValidationResponse, HttpStatus.UNPROCESSABLE_ENTITY); } else { - rulesResponse.setRules(mergingResult.getMergedRules()); + // + rulesUploadResponse.setRules(mergingResult.getMergedRules()); + rulesUploadResponse.setDroolsValidationResponse(droolsValidationResponse); } } catch (Exception e) { throw new RulesValidationException("Could not test rules: " + e.getMessage(), e); } - return new ResponseEntity<>(rulesResponse, HttpStatus.OK); + return new ResponseEntity<>(rulesUploadResponse, HttpStatus.OK); }