From 02ebb70330dce5de2c0bd95bf11c5dd5679a172a Mon Sep 17 00:00:00 2001 From: Lee Date: Tue, 24 Oct 2023 10:02:39 -0700 Subject: [PATCH] Logging updates --- .../UserProvisioning/Handler/UserProvisioningHandler.cs | 2 +- .../UserAccountCreation/Handler/UserProvisioningHandler.cs | 2 +- .../access/pages/digital-evidence/digital-evidence.page.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/NotificationService/NotificationEvents/UserProvisioning/Handler/UserProvisioningHandler.cs b/backend/NotificationService/NotificationEvents/UserProvisioning/Handler/UserProvisioningHandler.cs index 1fefaa8d..fa649253 100644 --- a/backend/NotificationService/NotificationEvents/UserProvisioning/Handler/UserProvisioningHandler.cs +++ b/backend/NotificationService/NotificationEvents/UserProvisioning/Handler/UserProvisioningHandler.cs @@ -46,7 +46,7 @@ public async Task HandleAsync(string consumerName, string key, Notificatio return Task.CompletedTask; } - Serilog.Log.Information($"Checking if message {key} has already been processed by {consumerName}"); + Serilog.Log.Information($"Checking if message {key} {value.DomainEvent} has already been processed by {consumerName}"); if (await this.context.HasBeenProcessed(key)) { diff --git a/backend/service.edt/ServiceEvents/UserAccountCreation/Handler/UserProvisioningHandler.cs b/backend/service.edt/ServiceEvents/UserAccountCreation/Handler/UserProvisioningHandler.cs index d89cfb08..32f03455 100644 --- a/backend/service.edt/ServiceEvents/UserAccountCreation/Handler/UserProvisioningHandler.cs +++ b/backend/service.edt/ServiceEvents/UserAccountCreation/Handler/UserProvisioningHandler.cs @@ -191,7 +191,7 @@ public async Task HandleAsync(string consumerName, string key, EdtUserProv } else { - Serilog.Log.Information("Publishing EDT user modification event {0} {1}", msgKey, accessRequestModel.Key); + Serilog.Log.Information($"Publishing EDT user modification event {result.eventType} {msgKey} {accessRequestModel.Key}"); publishResultOk = await producer.ProduceAsync(this.configuration.KafkaCluster.UserModificationTopicName, key: msgKey, result); diff --git a/workspace/apps/pidp/src/app/features/access/pages/digital-evidence/digital-evidence.page.ts b/workspace/apps/pidp/src/app/features/access/pages/digital-evidence/digital-evidence.page.ts index d49207a3..2935761e 100644 --- a/workspace/apps/pidp/src/app/features/access/pages/digital-evidence/digital-evidence.page.ts +++ b/workspace/apps/pidp/src/app/features/access/pages/digital-evidence/digital-evidence.page.ts @@ -143,8 +143,8 @@ export class DigitalEvidencePage // todo - remove IDIR if (idp === IdentityProvider.BCPS || idp === IdentityProvider.IDIR) { // if BCPS then get the crown-regions - this.formState.DefenceUniqueId.setValidators([]); - this.formState.DefenceUniqueId.clearValidators(); + this.formState.OOCUniqueIdValid.setValidators([]); + this.formState.OOCUniqueIdValid.clearValidators(); this.userIsBCPS = true; this.userOrgunit