From 4843f79466dad911e2003a775e28e25d42e92dc8 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Fri, 7 Jun 2024 10:32:35 +0200 Subject: [PATCH] RED-9145: remove EXPERIMENTAL role which no user has --- .../DossierTemplateControllerV2.java | 20 +++++++------------ .../v1/processor/roles/ActionRoles.java | 3 --- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DossierTemplateControllerV2.java b/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DossierTemplateControllerV2.java index ae5bb0bdd..465135712 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DossierTemplateControllerV2.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DossierTemplateControllerV2.java @@ -1,6 +1,5 @@ package com.iqser.red.persistence.service.v2.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.EXPERIMENTAL; import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.GET_REPORT_TEMPLATES; import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_DOSSIER_ATTRIBUTES_CONFIG; import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.READ_DOSSIER_STATUS; @@ -115,13 +114,12 @@ public class DossierTemplateControllerV2 implements DossierTemplateResource { } - @PreAuthorize("hasAuthority('" + WRITE_RULES + "') and hasAuthority('" + EXPERIMENTAL + "')") + @PreAuthorize("hasAuthority('" + WRITE_RULES + "')") public ResponseEntity uploadEntityRules(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId, @Schema(type = "string", format = "binary", name = "file") @RequestPart(name = "file") MultipartFile file, @Parameter(name = DRY_RUN_PARAM, description = "If true rules will be only validated not stored.") @RequestParam(value = DRY_RUN_PARAM, required = false, defaultValue = "false") boolean dryRun) { - // Try to get dossier template to return 404 if it does not exist - getDossierTemplate(dossierTemplateId); + dossierTemplatePersistenceService.checkDossierTemplateExistsOrElseThrow404(dossierTemplateId); return uploadRules(dossierTemplateId, RuleFileType.ENTITY, file, dryRun); } @@ -130,20 +128,18 @@ public class DossierTemplateControllerV2 implements DossierTemplateResource { @PreAuthorize("hasAuthority('" + READ_RULES + "')") public ResponseEntity downloadEntityRules(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId) { - // Try to get dossier template to return 404 if it does not exist - getDossierTemplate(dossierTemplateId); + dossierTemplatePersistenceService.checkDossierTemplateExistsOrElseThrow404(dossierTemplateId); return downloadRules(dossierTemplateId, RuleFileType.ENTITY); } - @PreAuthorize("hasAuthority('" + WRITE_RULES + "') and hasAuthority('" + EXPERIMENTAL + "')") + @PreAuthorize("hasAuthority('" + WRITE_RULES + "')") public ResponseEntity uploadComponentRules(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId, @Schema(type = "string", format = "binary", name = "file") @RequestPart(name = "file") MultipartFile file, @Parameter(name = DRY_RUN_PARAM, description = "If true rules will be only validated not stored.") @RequestParam(value = DRY_RUN_PARAM, required = false, defaultValue = "false") boolean dryRun) { - // Try to get dossier template to return 404 if it does not exist - getDossierTemplate(dossierTemplateId); + dossierTemplatePersistenceService.checkDossierTemplateExistsOrElseThrow404(dossierTemplateId); return uploadRules(dossierTemplateId, RuleFileType.COMPONENT, file, dryRun); } @@ -152,8 +148,7 @@ public class DossierTemplateControllerV2 implements DossierTemplateResource { @PreAuthorize("hasAuthority('" + READ_RULES + "')") public ResponseEntity downloadComponentRules(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId) { - // Try to get dossier template to return 404 if it does not exist - getDossierTemplate(dossierTemplateId); + dossierTemplatePersistenceService.checkDossierTemplateExistsOrElseThrow404(dossierTemplateId); return downloadRules(dossierTemplateId, RuleFileType.COMPONENT); } @@ -162,8 +157,7 @@ public class DossierTemplateControllerV2 implements DossierTemplateResource { @PreAuthorize("hasAuthority('" + READ_FILE_ATTRIBUTES_CONFIG + "')") public FileAttributeDefinitionList getFileAttributeDefinitions(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId) { - // Try to get dossier template to return 404 if it does not exist - getDossierTemplate(dossierTemplateId); + dossierTemplatePersistenceService.checkDossierTemplateExistsOrElseThrow404(dossierTemplateId); var fileAttributeConfigs = fileAttributesController.getFileAttributesConfiguration(dossierTemplateId); diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ActionRoles.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ActionRoles.java index 3b3594033..051962562 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ActionRoles.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/roles/ActionRoles.java @@ -2,9 +2,6 @@ package com.iqser.red.service.persistence.management.v1.processor.roles; public final class ActionRoles { - // Experimental - public static final String EXPERIMENTAL = "red-experimental"; - // Audit public static final String SEARCH_AUDIT_LOG = "red-search-audit-log"; -- 2.47.2