Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

RED-9472: seperation of system rules

Browse Source 
updated controller to return RulesUploadResponse including the droolsvalidationresponse
This commit is contained in:
yhampe 2024-10-22 11:47:18 +02:00
parent 8bf929df92
commit 583f244d45
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java
View File

@ -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);
}