From 34e9c9c860033e73df397d31290aca3f8bf76c03 Mon Sep 17 00:00:00 2001 From: Hknots Date: Tue, 14 Jan 2025 14:19:44 +0100 Subject: [PATCH] log username --- .../java/no/fintlabs/provider/event/EventController.java | 2 +- .../provider/event/response/ResponseEventService.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/no/fintlabs/provider/event/EventController.java b/src/main/java/no/fintlabs/provider/event/EventController.java index a2072f7..1d2b854 100644 --- a/src/main/java/no/fintlabs/provider/event/EventController.java +++ b/src/main/java/no/fintlabs/provider/event/EventController.java @@ -46,7 +46,7 @@ public ResponseEntity postEvent( // requestValidator.validateAdapterId(corePrincipal, responseFintEvent.getAdapterId()); // TODO: Skal vi stoppe response hvis adapteret har ikke en kontrakt? Og skal vi sjekke capabilities til kontrakten? - responseEventService.handleEvent(responseFintEvent); + responseEventService.handleEvent(responseFintEvent, corePrincipal); return ResponseEntity.ok().build(); } diff --git a/src/main/java/no/fintlabs/provider/event/response/ResponseEventService.java b/src/main/java/no/fintlabs/provider/event/response/ResponseEventService.java index 7b5df75..7cbebd7 100644 --- a/src/main/java/no/fintlabs/provider/event/response/ResponseEventService.java +++ b/src/main/java/no/fintlabs/provider/event/response/ResponseEventService.java @@ -5,6 +5,7 @@ import no.fintlabs.adapter.models.event.RequestFintEvent; import no.fintlabs.adapter.models.event.ResponseFintEvent; import no.fintlabs.adapter.operation.OperationType; +import no.fintlabs.core.resource.server.security.authentication.CorePrincipal; import no.fintlabs.kafka.entity.topic.EntityTopicNameParameters; import no.fintlabs.provider.datasync.EntityProducerKafka; import no.fintlabs.provider.event.request.RequestEventService; @@ -27,22 +28,22 @@ public class ResponseEventService { private final RequestEventService requestEventService; private final EntityProducerKafka entityProducerKafka; - public void handleEvent(ResponseFintEvent responseFintEvent) throws NoRequestFoundException, InvalidOrgIdException { + public void handleEvent(ResponseFintEvent responseFintEvent, CorePrincipal corePrincipal) throws NoRequestFoundException, InvalidOrgIdException { RequestFintEvent requestEvent = requestEventService.getEvent(responseFintEvent.getCorrId()) .orElseThrow(() -> new NoRequestFoundException(responseFintEvent.getCorrId())); if (Objects.isNull(responseFintEvent.getOperationType())) { - log.error("Recieved event with no OperationType, returning BAD_REQUEST"); + log.error("Recieved event with no OperationType, returning BAD_REQUEST for {}", corePrincipal.getUsername()); throw new InvalidResponseFintEventException("OperationType is required but was not provided."); } if (!responseFintEvent.getOrgId().equals(requestEvent.getOrgId())) { - log.error("Recieved event response, did not match request org-id: {}", responseFintEvent.getOrgId()); + log.error("Recieved event response, did not match request org-id: {} for {}", responseFintEvent.getOrgId(), corePrincipal.getUsername()); throw new InvalidOrgIdException(responseFintEvent.getOrgId()); } if (syncPageEntryIsNullWhenRequired(responseFintEvent)) { - log.error("Recieved a SyncPageEntry that is null"); + log.error("Recieved a SyncPageEntry that is null for {}", corePrincipal.getUsername()); throw new InvalidSyncPageEntryException("SyncPageEntry is null"); }