From 8fc94de4b7bc8cdb12e480d747b91154996d9117 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Fri, 8 Sep 2023 11:44:22 +0200 Subject: [PATCH] DM-285: fully deprecated RedactionLog, added component rule file * return 404, when component rule file hasn't been created yet --- .../service/persistence/RulesPersistenceService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/RulesPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/RulesPersistenceService.java index ac387b0b9..07ecac650 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/RulesPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/RulesPersistenceService.java @@ -3,6 +3,7 @@ package com.iqser.red.service.persistence.management.v1.processor.service.persis import org.springframework.stereotype.Service; import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.RuleSetEntity; +import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.RuleSetRepository; import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType; @@ -22,11 +23,16 @@ public class RulesPersistenceService { @Transactional public RuleSetEntity getRules(String dossierTemplateId, RuleFileType ruleFileType) { + if (ruleFileType.equals(RuleFileType.ENTITY)) { + + return ruleSetRepository.findByDossierTemplateIdAndRuleFileType(dossierTemplateId, ruleFileType.name()) + .orElseGet(() -> createAndGetDefaultRuleSet(dossierTemplateId, ruleFileType)); + } return ruleSetRepository.findByDossierTemplateIdAndRuleFileType(dossierTemplateId, ruleFileType.name()) - .orElseGet(() -> createAndGetDefaultRuleSet(dossierTemplateId, ruleFileType)); + .orElseThrow(() -> new NotFoundException(String.format("No rule file of type %s found for dossierTemplateId %s", ruleFileType, dossierTemplateId))); } - + private RuleSetEntity createAndGetDefaultRuleSet(String dossierTemplateId, RuleFileType ruleFileType) { RuleSetEntity ruleSet = new RuleSetEntity();