From ee0821df27da4e1dfb2ae37fdf9f4b5b4dfad130 Mon Sep 17 00:00:00 2001 From: "Hanelore.Ianoseck" Date: Thu, 7 Dec 2023 15:58:43 +0200 Subject: [PATCH] Fixes after merge with master --- .../controller/ComponentLogController.java | 34 +++++------ .../controller/RSSComponentLogController.java | 57 +++++-------------- .../api/impl/controller/RSSController.java | 4 +- .../controller/ReportTemplateController.java | 4 +- 4 files changed, 34 insertions(+), 65 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ComponentLogController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ComponentLogController.java index 8060f4db6..ed62eb772 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ComponentLogController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ComponentLogController.java @@ -1,22 +1,8 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.GET_RSS; -import static com.knecon.fforesight.auditor.model.Detail.d; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; - +import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException; import com.iqser.red.service.persistence.management.v1.processor.model.audit.AuditDetail; import com.iqser.red.service.persistence.management.v1.processor.model.audit.AuditDetailAction; -import com.knecon.fforesight.auditor.Auditor; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException; import com.iqser.red.service.persistence.management.v1.processor.service.ComponentLogService; import com.iqser.red.service.persistence.management.v1.processor.service.ComponentOverrideService; import com.iqser.red.service.persistence.service.v1.api.external.resource.ComponentLogResource; @@ -26,10 +12,21 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntryValue; import com.iqser.red.service.persistence.service.v1.api.shared.model.component.ComponentsOverrides; import com.iqser.red.service.persistence.service.v1.api.shared.model.component.RevertOverrideRequest; - +import com.knecon.fforesight.auditor.Auditor; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.GET_RSS; +import static com.knecon.fforesight.auditor.model.Detail.d; @RestController @RequiredArgsConstructor @@ -90,7 +87,7 @@ public class ComponentLogController implements ComponentLogResource { Optional component = allComponentLogEntries.stream().filter(c -> c.getName().equals(componentName)).findFirst(); String value = getValue(component); auditor.audit(AuditCategory.DOCUMENT.name(), "The component is overwritten with value", - d(DOSSIER_ID, dossierId), d(FILE_ID, fileId), + d(AuditDetail.DOSSIER_ID, dossierId), d(AuditDetail.FILE_ID, fileId), d(AuditDetail.COMPONENT_NAME, componentName), d(AuditDetail.ACTION, AuditDetailAction.MODIFY.getID()), d(AuditDetail.VALUE, value)); @@ -101,9 +98,8 @@ public class ComponentLogController implements ComponentLogResource { Optional component = allComponentLogEntries.stream().filter(c -> c.getName().equals(componentNameToRevert)).findFirst(); String originalValue = getOriginalValue(component); - String value = getValue(component); auditor.audit(AuditCategory.DOCUMENT.name(), "The component is overwritten with value", - d(DOSSIER_ID, dossierId), d(FILE_ID, fileId), + d(AuditDetail.DOSSIER_ID, dossierId), d(AuditDetail.FILE_ID, fileId), d(AuditDetail.COMPONENT_NAME, componentNameToRevert), d(AuditDetail.ACTION, AuditDetailAction.REVERT.getID()), d(AuditDetail.VALUE, originalValue)); diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSComponentLogController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSComponentLogController.java index 03d9b4915..e3e4eb8ad 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSComponentLogController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSComponentLogController.java @@ -1,6 +1,7 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller; import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.GET_RSS; +import static com.knecon.fforesight.auditor.model.Detail.d; import java.util.LinkedHashMap; import java.util.List; @@ -10,6 +11,9 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; +import com.iqser.red.service.persistence.management.v1.processor.model.audit.AuditDetail; +import com.iqser.red.service.persistence.management.v1.processor.model.audit.AuditDetailAction; +import com.knecon.fforesight.auditor.Auditor; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.security.access.prepost.PreAuthorize; @@ -20,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController; import com.iqser.red.service.persistence.management.v1.processor.service.ComponentLogService; import com.iqser.red.service.persistence.management.v1.processor.service.ComponentOverrideService; -import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService; import com.iqser.red.service.persistence.service.v1.api.external.resource.RSSResource; import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory; import com.iqser.red.service.persistence.service.v1.api.shared.model.FileStatus; @@ -47,9 +50,9 @@ import lombok.RequiredArgsConstructor; public class RSSComponentLogController implements RSSResource { private final ComponentOverrideService componentOverrideService; - private final AuditPersistenceService auditPersistenceService; private final ComponentLogService componentLogService; private final StatusController statusController; + private final Auditor auditor; @PreAuthorize("hasAuthority('" + GET_RSS + "')") @@ -191,26 +194,11 @@ public class RSSComponentLogController implements RSSResource { Optional component = allComponentLogEntries.stream().filter(c -> c.getName().equals(componentName)).findFirst(); String originalValue = getOriginalValue(component); String value = getValue(component); - auditPersistenceService.audit(AuditRequest.builder() - .userId(KeycloakSecurity.getUserId()) - .objectId(fileId) - .category(AuditCategory.DOCUMENT.name()) - .message("The component is overwritten with value") - .details(Map.of(DOSSIER_ID, - dossierId, - FILE_ID, - fileId, - "ComponentName", - componentName, - "Action", - "MODIFY", - "OriginalValue", - originalValue, - "OldValue", - value, - "NewValue", - overrideValue)) - .build()); + auditor.audit(AuditCategory.DOCUMENT.name(), "The component is overwritten with value", + d(AuditDetail.DOSSIER_ID, dossierId), d(AuditDetail.FILE_ID, fileId), + d(AuditDetail.COMPONENT_NAME, componentName), + d(AuditDetail.ACTION, AuditDetailAction.MODIFY.getID()), + d(AuditDetail.VALUE, value)); } @@ -219,26 +207,11 @@ public class RSSComponentLogController implements RSSResource { Optional component = allComponentLogEntries.stream().filter(c -> c.getName().equals(componentNameToRevert)).findFirst(); String originalValue = getOriginalValue(component); String value = getValue(component); - auditPersistenceService.audit(AuditRequest.builder() - .userId(KeycloakSecurity.getUserId()) - .objectId(fileId) - .category(AuditCategory.DOCUMENT.name()) - .message("The component override for was reverted") - .details(Map.of(DOSSIER_ID, - dossierId, - FILE_ID, - fileId, - "ComponentName", - componentNameToRevert, - "Action", - "REVERT", - "OriginalValue", - originalValue, - "OldValue", - value, - "NewValue", - originalValue)) - .build()); + auditor.audit(AuditCategory.DOCUMENT.name(), "The component is overwritten with value", + d(AuditDetail.DOSSIER_ID, dossierId), d(AuditDetail.FILE_ID, fileId), + d(AuditDetail.COMPONENT_NAME, componentNameToRevert), + d(AuditDetail.ACTION, AuditDetailAction.REVERT.getID()), + d(AuditDetail.VALUE, originalValue)); } diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSController.java index 41236ef56..665c53fb8 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSController.java @@ -72,7 +72,7 @@ public class RSSController implements RSSResource { componentsOverrides.getComponentOverrides() .forEach((key, value) -> auditor.audit(AuditCategory.DOCUMENT.name(), "The component is overwritten with value", - d(DOSSIER_ID, dossierId), d(FILE_ID, fileId), + d(AuditDetail.DOSSIER_ID, dossierId), d(AuditDetail.FILE_ID, fileId), d(AuditDetail.COMPONENT_NAME, key), d(AuditDetail.ACTION, AuditDetailAction.MODIFY.getID()), d(AuditDetail.VALUE, value))); @@ -98,7 +98,7 @@ public class RSSController implements RSSResource { revertOverrideRequest.getComponents() .forEach(component -> auditor.audit(AuditCategory.DOCUMENT.name(), "The component override for was reverted", - d(DOSSIER_ID, dossierId), d(FILE_ID, fileId), + d(AuditDetail.DOSSIER_ID, dossierId), d(AuditDetail.FILE_ID, fileId), d(AuditDetail.COMPONENT_NAME, component), d(AuditDetail.ACTION, AuditDetailAction.REVERT.getID()), d(AuditDetail.VALUE, components.get(component).getOriginalValue()))); diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ReportTemplateController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ReportTemplateController.java index e75dfe1bc..934ff0477 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ReportTemplateController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ReportTemplateController.java @@ -4,6 +4,8 @@ import com.iqser.red.service.persistence.management.v1.processor.client.redactio import com.iqser.red.service.persistence.management.v1.processor.client.redactionreportservice.ReportTemplatePlaceholderClient; import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException; import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; +import com.iqser.red.service.persistence.management.v1.processor.model.audit.AuditCategory; +import com.iqser.red.service.persistence.management.v1.processor.model.audit.AuditDetail; import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService; import com.iqser.red.service.persistence.management.v1.processor.service.ReportTemplateService; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierAttributeConfigPersistenceService; @@ -11,10 +13,8 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist import com.iqser.red.service.persistence.management.v1.processor.service.persistence.ReportTemplatePersistenceService; import com.iqser.red.service.persistence.management.v1.processor.utils.StringEncodingUtils; import com.iqser.red.service.persistence.service.v1.api.external.resource.ReportTemplateResource; -import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditCategory; import com.iqser.red.service.persistence.service.v1.api.shared.model.PlaceholdersResponse; import com.iqser.red.service.persistence.service.v1.api.shared.model.ReportTemplateUpdateRequest; -import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditDetail; import com.iqser.red.service.persistence.service.v1.api.shared.model.common.JSONPrimitive; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.ReportTemplate; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.ReportTemplateUploadRequest;